1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 23:53:52 +00:00
Commit graph

25260 commits

Author SHA1 Message Date
David Cernat
271dc3df87 [General] Rename unused ObjectCollision into ObjectSound 2020-01-26 13:30:28 +02:00
David Cernat
fcebd9f4ae [General] Rename unused ActorInteraction into ActorSpellsActive 2020-01-26 12:47:49 +02:00
David Cernat
a1142a8fb5 [General] Renamed unused PlayerActiveSkills into PlayerSpellsActive 2020-01-26 10:58:22 +02:00
David Cernat
038c5b8231 [Client] Rename ObjectList's addObject() into addBaseObject() 2020-01-23 16:40:04 +02:00
David Cernat
296c04af71 [Client] Combine ObjectList's getBaseObject() and getObjectFromPtr() 2020-01-23 16:18:49 +02:00
David Cernat
975797c09b [General] Implement ObjectRestock packet
Restocking object containers via trading now requires the server to send back an ObjectRestock packet before it can happen.

The unused packet ID ID_SCRIPT_GLOBAL_FLOAT has been replaced with ID_OBJECT_RESTOCK.
2020-01-23 12:50:34 +02:00
David Cernat
59a38164ea [Client] Add generic objects to ObjectList using addObjectGeneric() 2020-01-23 09:03:40 +02:00
David Cernat
989188c171 [Client] Remove ObjectList's confusing addObjectDelete() function 2020-01-22 14:35:51 +02:00
David Cernat
27b9357478 [Client] Send Container packets when buying or selling items at merchant 2020-01-20 01:40:44 +02:00
David Cernat
a378b254f8 [Client] Include necessary headers in ContainerItemModel 2020-01-19 17:20:17 +02:00
David Cernat
8b14c007f3 [Client] Send ObjectDelete for purchased objects removed from world 2020-01-19 16:45:24 +02:00
David Cernat
8e5859b466 [General] Add RESTOCK to enum of Container subactions 2020-01-16 14:03:29 +02:00
David Cernat
32b5529e18 [Client] Use check with clearer logic in ObjectList::editContainers() 2020-01-16 14:02:27 +02:00
David Cernat
d2ba4a12d9 [Client] Simplify container sending with new addContainerItem() methods 2020-01-16 14:00:30 +02:00
David Cernat
51f0acbaf5 [Client] Improve logging for Container packets 2020-01-16 10:32:48 +02:00
David Cernat
b0b51dc4d5 [Client] Don't print sending of console command packets 2020-01-16 09:15:53 +02:00
David Cernat
60b6f92fa3 Add OpenMW commits up to 13 Jan 2020
# Conflicts:
#	apps/openmw/mwmechanics/actors.cpp
2020-01-15 07:49:26 +02:00
Andrei Kortunov
8bfca9830f
Merge pull request #2666 from Capostrophic/keybindings
Editor: Add a reset to defaults button to keybindings (feature #4068)
2020-01-13 10:28:38 +04:00
Alexei Dobrohotov
be85159095
Merge pull request #2664 from akortunov/greeting
Rework greeting timeouts
2020-01-13 02:46:45 +03:00
Capostrophic
7659370992 Editor: Add a reset to defaults button to keybindings (feature #4068) 2020-01-13 02:26:01 +03:00
Andrei Kortunov
a384104f73 Rework greeting timeouts (bug #5249) 2020-01-11 21:47:08 +04:00
Bret Curtis
95f9e4f4c9
Merge pull request #2649 from Capostrophic/nifstreamline
Yet more NIF adjustments
2020-01-10 22:07:25 +01:00
Andrei Kortunov
7d394dd97d
Merge pull request #2663 from akortunov/master
Add missing changelog entry
2020-01-10 15:53:05 +04:00
Andrei Kortunov
a1c0a480ce Add missing changelog entry 2020-01-10 15:50:25 +04:00
Alexei Dobrohotov
2615913494
Merge pull request #2661 from akortunov/guifixes
Settings menu tweaks
2020-01-10 14:24:36 +03:00
Andrei Kortunov
b298a4a281
Merge pull request #2662 from Capostrophic/shield
Use shield body part model for creatures (bug #5250)
2020-01-10 15:24:04 +04:00
capostrophic
bbe5adb860 Use shield body part model for creatures (bug #5250) 2020-01-10 14:18:40 +03:00
Andrei Kortunov
4d4663e0ad Make 'Toggle HUD' hotkey configurable 2020-01-10 14:31:25 +04:00
Andrei Kortunov
2b8e976c6a Adjust settings menu 2020-01-10 14:07:53 +04:00
Andrei Kortunov
2bed25a5e8
Merge pull request #2659 from Capostrophic/aitravel
Handle out-of-range actors' travel packages (bug #5212)
2020-01-10 13:32:51 +04:00
capostrophic
fc0f813dcb Add and use 'always active' AI package flag
Update documentation
2020-01-10 12:07:57 +03:00
Andrei Kortunov
70f6e1c81d
Merge pull request #2655 from Capostrophic/spellcasting
Fix reported spellcasting discrepancies
2020-01-10 09:23:39 +04:00
capostrophic
1251b32f0f Slightly reduce code duplication 2020-01-09 22:17:01 +03:00
capostrophic
af2ea477d5 Don't use loops to detect absorb effects 2020-01-09 22:17:01 +03:00
capostrophic
42cc27194b Fix reported spellcasting discrepancies
Make ExplodeSpell behavior closer to Cast behavior (#5242)
Nullify on-self absorb spells in a different way (#5241)
Allow casting permanent spells through Cast/ExplodeSpell
2020-01-09 22:17:01 +03:00
Alexei Dobrohotov
7a4caaf5bf
Merge pull request #2660 from akortunov/boost
Additional de-boosting
2020-01-09 22:14:32 +03:00
Alexei Dobrohotov
ff2739b8a3
Merge pull request #2651 from akortunov/encoding
Unify streams usage to support non-ASCII paths
2020-01-09 22:12:55 +03:00
Andrei Kortunov
a250a405b4 An attempt to fix the MSVC2017 build 2020-01-09 20:42:06 +04:00
Andrei Kortunov
1cdd33b434 Implement additional stringops to avoid Boost functions 2020-01-09 19:40:22 +04:00
Andrei Kortunov
cb1a8ec518 Do not link the Boost threads library 2020-01-09 19:40:22 +04:00
capostrophic
2d87d287ba Handle out-of-range actors' travel packages (#5212) 2020-01-09 14:17:54 +03:00
Andrei Kortunov
22a0549e73
Merge pull request #2656 from Capostrophic/sneak
Don't combine sneak idle with scripted/wander idles (bug #4284)
2020-01-07 11:26:59 +04:00
Alexei Dobrohotov
87f9b85e21
Merge pull request #2653 from akortunov/log
Improve BetaComment handling
2020-01-06 17:34:09 +03:00
Andrei Kortunov
a42396254b Use ISO format to print datetime 2020-01-06 11:27:11 +04:00
Andrei Kortunov
23a5da37ef
Merge pull request #2658 from Capostrophic/shield
[Regression] Make creatures autoequip shields properly (bug #5243)
2020-01-06 10:20:57 +04:00
capostrophic
9b28420875 [Regression] Make creatures autoequip shields properly again 2020-01-05 23:49:19 +03:00
capostrophic
29c6a8975a Don't combine sneak idle with scripted/wander idles (bug #4284) 2020-01-05 15:09:02 +03:00
David Cernat
e6c626f127 [General] Move handling of client globals to ClientScriptGlobal packet
ClientScriptGlobal is a new Worldstate packet that handles short, long and float values for global variables in clientside scripts.

Previously, short values were handled by the ScriptGlobalShort packet, while a partially implemented ScriptGlobalFloat packet also existed, but both of those packets were Object packets because they were added near the end of 2016 when only Player and Object packets existed (with the latter actually being called WorldEvent packets at the time). Both ScriptGlobalShort and ScriptGlobalFloat have now been removed.

The serverside script functions previously used to interact with ScriptGlobalShort have, however, been kept so they can be adjusted to work with local variables in clientside scripts instead in a future commit.
2020-01-04 09:56:37 +02:00
Andrei Kortunov
af36b652aa Simplify datetime formatting 2020-01-04 10:45:11 +04:00
Andrei Kortunov
3278ca0b33
Merge pull request #2654 from Capostrophic/scvr
Avoid heap corruption while reading SCVR (bug #4680)
2020-01-04 10:25:11 +04:00