mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 04:19:55 +00:00
Code Issues Releases Wiki Activity
22006 commits 38 branches 54 tags 122 MiB
Commit graph

16378 commits

Author SHA1 Message Date
Koncord
b5c957c473 [Server] Move PreInit code to preInit method 2018-07-17 00:58:37 +08:00
Koncord
1a9bf253f6 [Server] Simplify getPlayer methods, add isPlayerExists method 2018-07-17 00:29:45 +08:00
Andrei Kortunov
edd5769022 Show magic items count in spells window (feature #4509) 2018-07-16 14:11:03 +04:00
Andrei Kortunov
30716344f2 Fix possible division by zero in the fatigue calculation (bug #4510) 2018-07-16 13:24:12 +04:00
David Cernat
d5d3c0937f [Client] Adjust log level for actor transfers in CellStore 2018-07-16 03:53:09 +03:00
David Cernat
35fdb833df [Client] Verify integrity of credits file 2018-07-16 03:25:01 +03:00
David Cernat
72d286473b [General] Move credits integrity error message to new ErrorMessages file 
Additionally, use correct log level for credit integrity message on server.
 2018-07-16 03:21:14 +03:00
David Cernat
0b5cb15f71 [General] Turn GameWeather into WorldWeather, now a WorldstatePacket 2018-07-16 02:20:43 +03:00
David Cernat
646111d998 [General] Use correct credits checksum and move it to Version.hpp 2018-07-16 01:05:56 +03:00
David Cernat
0f36c3ea24 [Server] Verify integrity of credits file 2018-07-15 22:50:16 +03:00
Andrei Kortunov
6ddf6eb885 Use editor markers for lights and creatures levelled lists 2018-07-15 17:25:18 +04:00
David Cernat
4ac371d292 [Server] Delete duplicate WorldKillCount processor with old filename 2018-07-15 05:49:19 +03:00
David Cernat
3649cf553f [General] Rename PlayerKillCount into WorldKillCount 
This should clarify the real meaning of the packet and its associated event.

The event itself has been renamed from OnPlayerKillCount to OnWorldKillCount.
 2018-07-15 05:34:59 +03:00
David Cernat
18a2d238ab [Client] Don't pop up dialogue screen when an NPC activates another NPC 2018-07-15 04:36:42 +03:00
David Cernat
4ef2aff11e [Client] Remove "Not implemented" message when activating other player 
Serverside scripts can now make lots of different things happen as the result of such activation, which is why the message was no longer current.
 2018-07-15 04:16:40 +03:00
David Cernat
f13705e8be [Client] Improve debug for ObjectActivate and ConsoleCommand 2018-07-15 04:09:19 +03:00
David Cernat
6ebe09375f [General] Implement ObjectActivate packet & associated script functions 2018-07-15 03:16:04 +03:00
David Cernat
81b160cae8 [General] Add placeholder for ObjectActivate packet 2018-07-15 01:08:31 +03:00
David Cernat
61da0d2475 [General] Turn PlayerInteraction into PlayerInput 2018-07-15 00:36:07 +03:00
David Cernat
32b6134fad [General] Add placeholder for CellReplace packet 2018-07-15 00:17:13 +03:00
David Cernat
a471f5e452 [General] Turn CellCreate into a Worldstate packet 2018-07-14 23:51:49 +03:00
David Cernat
6cb5ac6e63 Merge pull request #457 from OpenMW/master while resolving conflicts 
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/main.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwmechanics/character.cpp
	components/CMakeLists.txt
 2018-07-14 03:57:05 +03:00
David Cernat
6d43c8d63d [Client] Send ActorAI with combat when an NPC's fight is set to 100 2018-07-14 02:55:38 +03:00
David Cernat
743933134d [Client] Simplify sending of ActorAI packets for uninitialized actors 2018-07-14 01:00:27 +03:00
David Cernat
5f4ec1331f [Client] Send ActorAI packet when combat is started via a client script 2018-07-14 00:07:15 +03:00
David Cernat
cc9e294cc0 [Client] Send ActorAI packet for new cell after being followed to it 2018-07-13 22:34:36 +03:00
David Cernat
528bd26a3b [General] Allow followers to follow non-authority players through cells 2018-07-13 21:27:29 +03:00
David Cernat
ab5fd0aef8 [Server] Clean up descriptions for Object script functions 2018-07-13 04:55:05 +03:00
David Cernat
6c1173d598 [Client] Rename searchPtrViaRefIndex into searchPtrViaUniqueIndex 2018-07-13 04:33:54 +03:00
David Cernat
09da24f1ea [General] Rename all instances of refNumIndex into refNum 
This creates symmetry with mpNum and should cause less confusion in the future.
 2018-07-13 04:12:03 +03:00
David Cernat
20296859ee [Server] Clarify functions used for getting data in Networking 2018-07-13 02:40:24 +03:00
David Cernat
04dd59e638 [Server] Use clearer names for functions used to get last received data 
Additionally, rename GetObjectChangesSize() into the less confusing GetObjectListSize()
 2018-07-13 02:33:50 +03:00
David Cernat
aeb2e57444 [Server] Bring Actor functions in line with Object functions, part 2 
The ActorPacket-sending functions now have sendToOtherVisitors and skipAttachedPlayer arguments, except for the ones for ActorList and ActorAuthority (because such arguments don't make sense for those).
 2018-07-13 01:25:43 +03:00
David Cernat
837c5369c0 [Server] Add OnActorAI event and remove autosync for ActorAI packets 2018-07-13 01:05:27 +03:00
David Cernat
8f745df055 [Server] Bring Actor functions in line with Object functions, part 1 
The last received ActorList can now be copied into the write-only ActorList that can be sent in packets. Changing the pid of the write-only ActorList can now be done separately from clearing its contents.
 2018-07-13 01:04:41 +03:00
David Cernat
f0d4f1bbe5 [Client] Send ActorAI packets when followed by an NPC 
The packet is sent regardless of whether we are the cell authority or not, so the server can decide what it wants to do with it.
 2018-07-12 23:08:17 +03:00
David Cernat
6316f1e590 [Client] Add ActorList methods for sending ActorAI packets 
Additionally, use consistent capitalization for AI-related methods.
 2018-07-12 20:48:47 +03:00
David Cernat
0fd8f7660b [Client] Replace LocalActor arg with BaseActor in ActorList functions 2018-07-12 20:15:04 +03:00
Andrei Kortunov
3d1daaebab Rework manual spellcasting (e.g. via scripts) 2018-07-12 16:24:25 +04:00
David Cernat
bdf2f03c4f [General] Remove unnecessary MapChanges struct from BaseWorldstate 2018-07-12 05:06:31 +03:00
David Cernat
59a56ca35e [Client] Disallow clients from scaling their associated players 
Additionally, display messages when trying to scale players.
 2018-07-12 03:29:38 +03:00
David Cernat
8ca29dbaac [Client] Fix remaining mistakes in debug for received ActorAI packets 2018-07-11 23:11:37 +03:00
David Cernat
5bb442bbd3 [Server] Add sendToOtherVisitors boolean to SendActorAI() 
Additionally, avoid repetition in functions that send Actor packets.
 2018-07-11 22:17:00 +03:00
David Cernat
25f7a55495 [Client] Improve debug for received ActorAI packets 2018-07-11 19:54:56 +03:00
Bret Curtis
99e4d49e7c
Merge pull request #1787 from akortunov/profilierfont 
Use the DejaVuLGCSansMono.ttf for profiler output
 2018-07-11 16:00:34 +02:00
Andrei Kortunov
70b6d4983d Use the DejaVuLGCSansMono.ttf in profilier output 2018-07-11 14:41:49 +04:00
Marc Zinnschlag
ee759effce Merged pull request #1798 2018-07-11 10:06:30 +02:00
David Cernat
bff6e9e235 [General] Implement ActorAI packet, part 5 
Allow repetition for AiWander package to be turned on and off.
 2018-07-10 23:18:32 +03:00
Andrei Kortunov
c77c50e92b Make Equip console command to bypass most of restrictions (bug #4460) 2018-07-11 00:06:21 +04:00
Capostrophic
5cb9dc9d12 Use SpellTurnLeft/TurnRight animation groups 2018-07-10 22:19:56 +03:00
Bret Curtis
df1576fcf5
Merge branch 'master' into crossbowfix 2018-07-10 19:15:37 +02:00
Bret Curtis
fde46f03b3
Merge pull request #1801 from terabyte25/terabyte25-trainingskill 
Update trainer skill cap based off modified skill instead of based skill
 2018-07-10 16:54:28 +02:00
Andrei Kortunov
1c35e20fcc Use 1h animations as fallback for crossbows 2018-07-10 17:02:51 +04:00
Andrei Kortunov
75dcbea365 Apply weapon reload animations only for upper body 2018-07-10 17:00:48 +04:00
David Cernat
2e31c212c0 [Client] Make any ActorAI packet override an actor's desire to fight 2018-07-10 11:33:07 +03:00
David Cernat
79ee976c95 [Client] Implement ACTIVATE action in DedicatedActor::setAI() 
Additionally, clean up usage of CreatureStats in DedicatedActor.
 2018-07-10 11:31:51 +03:00
David Cernat
0f30e21312 [Client] Add searchPtrViaRefIndex method to World to easily find objects 2018-07-10 11:30:32 +03:00
Andrei Kortunov
27a5da59ba Fix MSVC warnings C4456 2018-07-10 11:29:39 +04:00
David Cernat
c984fc0881 [Client] Allow AiActivate to be used with specific Ptrs, not just refIds 2018-07-10 08:21:24 +03:00
David Cernat
00c13ae96c [General] Implement ActorAI packet, part 4 
The server can now make actors activate players and objects, at least in theory. In practice, OpenMW''s AiActivate package needs to be worked so it allows specific objects as targets instead of just refIds.
 2018-07-10 07:07:37 +03:00
David Cernat
0e13207afe [General] Implement ActorAI packet, part 3 
The server can now cancel actor AI, make actors travel to a location, make actors wander, and make actors get escorted by a player or another actor.
 2018-07-10 05:07:58 +03:00
David Cernat
5baef09f79 [General] Implement ActorAI packet, part 2 
The server can now make actors start combat with players or other actors.
 2018-07-10 02:47:52 +03:00
David Cernat
5628f3b977 [Client] Fix debug for DedicatedActor::setAI() 2018-07-10 02:05:10 +03:00
David Cernat
b86155dc11 [Client] Allow AiFollow package to have infinite distance when desired 2018-07-10 01:40:57 +03:00
David Cernat
864c66d1d4 [Client] Make sure hasAiTarget is set correctly for DedicatedActors 2018-07-10 01:35:38 +03:00
David Cernat
4d4bced929 [Client] Allow singleplayer-only saves in main menu during multiplayer 2018-07-09 22:53:18 +03:00
terrabyte25
48296a7452
Update trainingwindow.cpp 2018-07-09 23:13:52 +04:00
Marc Zinnschlag
0bdd8f7d03 Merged merge request !19 2018-07-09 17:43:22 +02:00
Alexander Stillich
725cc94210 Renamed cc_install to something less cryptic (crashCatcherInstall) 2018-07-09 16:25:55 +02:00
Doc West
467989cdd5 Moved crashcatcher to a component and also use it in CS 
Reworked debugger detection (failed on gdb 7.11), it now uses /proc to detect the debugger
 2018-07-09 16:25:55 +02:00
Alexander Stillich
1177e5ac79 Issue a single dataChanged() when the modified column changes 2018-07-09 16:23:50 +02:00
Doc West
d26b5a13ef Fixed comment 2018-07-09 16:23:50 +02:00
Doc West
01b8ce5f70 Notify views of changes in all columns when updating the ColumnId_Modification column 2018-07-09 16:23:50 +02:00
Doc West
4a6457c346 Changed the way the revert command works: it now clones the changed record and uses the new RecordBase::revert() method to restore the previous value 
Added Flag_Dialogue_Refresh to var type and var value columns so that sub views update properly
 2018-07-09 16:23:50 +02:00
Doc West
143eadb58e Use setData() instead of emtitting dataChanged() which does not work on CI. Also Fixes the remaining issue with subviews not updating due to only the modified flag emitting a change, which prevented the widget mapper from working for updates. 2018-07-09 16:21:53 +02:00
Doc West
4780f1b2bd Notify views of changes of all cells in a row to properly update the row after revert 2018-07-09 16:21:53 +02:00
Capostrophic
d09c327b20 Update changelog 2018-07-09 12:36:19 +03:00
Capostrophic
14d3b213a1
Fix double call of addContainerScripts on player in moveObject (fixes #4490) 2018-07-08 23:08:57 +03:00
David Cernat
6ff7fa525e [Client] Disable autosaving when waiting 2018-07-08 23:04:30 +03:00
David Cernat
04ba324290 [Client] Disable clientside disabling and enabling of objects 2018-07-08 03:31:48 +03:00
David Cernat
5043fb4246 [Client] Disable clientside disarming of traps 2018-07-08 02:38:10 +03:00
David Cernat
cbb9817913 [Server] Add missing descriptions for PlayAnimation() and PlaySpeech() 2018-07-08 02:03:33 +03:00
David Cernat
6ba9b1742b [Server] Remove unused default parameters for script functions 2018-07-08 01:05:54 +03:00
David Cernat
acdaf1a282 [Client] Disable clientside deletion of objects through console/scripts 
Unfortunately, disabling clientside deletion of summons and items that can be picked up requires extra work on actors and inventories respectively, to avoid buggy situations.
 2018-07-08 00:39:07 +03:00
David Cernat
8d9fde810e [Client] Disable clientside scaling of objects 2018-07-08 00:28:31 +03:00
David Cernat
f3892d697b [Client] Disable clientside locking and unlocking of objects 2018-07-08 00:06:01 +03:00
David Cernat
563269d359 [Server] Bring comments up-to-date for packet-sending script functions 2018-07-07 20:16:36 +03:00
David Cernat
2f1ef049d2 [Server] Turn sendToAttachedPlayer into skipAttachedPlayer 
Unfortunately, default values set in the C++ code for our script function parameters don't actually seem to work, and they always default to false because they receive a nil value from Lua. As a result, to not break compatibility with previous scripts, I've decided to use a skipAttachedPlayer argument instead so it can default to false while still providing the same benefits that sendToAttachedPlayer provided.
 2018-07-07 20:08:59 +03:00
David Cernat
141e404ed9 [Server] Move server administration functions to ServerFunctions class 2018-07-07 19:40:22 +03:00
David Cernat
6041425122 [Server] Move Chat functions to new ChatFunctions class 2018-07-07 19:20:25 +03:00
David Cernat
6a3fbf4e98 [Server] Use consistent arguments for script functions that send packets 
Previously, there was a confusing separation between script functions that had a "broadcast" argument and script functions that had a "toOthers" argument.

Those with broadcast sent the packet to all players on the server when broadcast was true. Those with toOthers sent the packet to all players other than the packet's attached player.

The former was based on the pattern of the original SendMessage() script function. The latter more closely resembled RakNet's own broadcast argument as seen here:

https://github.com/TES3MP/CrabNet/blob/master/include/raknet/RakPeer.h#L219

This commit makes it so all sending functions have a sendToOtherPlayers argument that is false by default and a sendToAttachedPlayer that is true by default. This should simultaneously allow sending to be more intuitive, while not breaking previous existing scripts to a significant degree.

Additionally, this commit also reduces some code repetition for all instances of packet-fetching in script functions.
 2018-07-07 18:29:31 +03:00
David Cernat
14e4f64296 [Server] Add GetVideoFilename() and SendVideoPlay() script functions 2018-07-07 17:09:57 +03:00
David Cernat
3ed9d89280 [General] Use separate variables for video & music filenames in packets 2018-07-07 14:40:35 +03:00
David Cernat
509882b5f6 [Client] Rework MechanicsHelper::getTarget() to avoid crashes 2018-07-07 11:43:57 +03:00
David Cernat
7f0549fc4f [Server] Remove hardcoded sync for VideoPlay and add OnVideoPlay event 2018-07-06 23:37:57 +03:00
David Cernat
ae8b5a0709 [Server] Remove hardcoded sync for Place, Spawn & other Object packets 2018-07-06 23:36:28 +03:00
David Cernat
e3e1cfc549 [Client] Add forgotten comparison in crimeTime and deathTime check 2018-07-06 20:49:08 +03:00
Capostrophic
bded697f07
Make Goodbye block using hyperlinks 2018-07-06 19:38:36 +03:00
David Cernat
4eb72eecb1 [Client] Fix crash for invalid CellRefs in MechanicsHelper::getTarget() 2018-07-06 18:39:14 +03:00
David Cernat
4b30a44816 [Client] Compare crimeTime and deathTime when NPCs forgive player crimes 
Previously, all crime witnesses stopped being hostile to a respawning player for as long as the player's diedSinceArrestAttempt was true. That meant that, in an area with no guards to arrest the player, crime witnesses did not enage in combat with the player at all ever again until diedSinceArrestAttempt became false.

This commit makes it so the time of the last crime is recorded for each witness, and that is then compared with the time of the LocalPlayer's last death for a one-time crime forgiveness during that player's current life.

This is essentially a gameplay adjustment for "singleplayer with respawns," and will have to be reworked to make sense for every player in multiplayer, though that requires reworking the crime system as a whole and is thus on hold.
 2018-07-06 14:17:54 +03:00
Marc Zinnschlag
d9de8ccb5b Merged pull request #1781 2018-07-06 11:55:45 +02:00
Marc Zinnschlag
dd08194c75 Merged merge request !18 2018-07-06 11:37:15 +02:00
Marc Zinnschlag
7ba512b389 Merged merge request !17 2018-07-06 11:27:35 +02:00
David Cernat
c23fc3446f [Client] Avoid sending map tiles for Wilderness cells 2018-07-06 03:54:34 +03:00
David Cernat
17c234d9ca [Client] Use initial values for LocalPlayer and LocalActor killers 2018-07-06 02:07:55 +03:00
David Cernat
97cd3effa7 [Client] Make actor debug consistent with object debug 2018-07-06 00:32:45 +03:00
Capostrophic
9abfabb065
Ensure forward-compatibility of death animations in old saves (fixes #4274) 2018-07-05 22:49:40 +03:00
David Cernat
b0bd12f9dd Merge branch '0.6.3' of https://github.com/TES3MP/openmw-tes3mp into 0.6.3 2018-07-05 22:28:40 +03:00
David Cernat
c075496748 [General] Replace deathReason in death packets with a killer variable 
Add serverside script functions for determining the killers of both players and actors.

Use unsigned ints for script functions returning an object or actor's refNumIndex or mpNum.

Remove updateDeadState() from LocalPlayer and make its code part of updateStatsDynamic() for simplicity.
 2018-07-05 22:24:51 +03:00
David Cernat
934e592bdb [Server] Make spacing in CharClass consistent with other categories 2018-07-05 20:27:42 +03:00
David Cernat
e8ce009521 [Server] Use regular int as return value for GetObjectSummonerPid() 
Additionally, clarify descriptions of script functions for getting information about summoners.
 2018-07-05 20:26:23 +03:00
David Cernat
f02492a593 [General] Temporarily include target names in mwmp::Target 
These will be removed once the server can get the names matching refIds by reading content files.
 2018-07-05 19:40:28 +03:00
Doc West
f9b565a46e Removed QDebug include, moved updateUndoRedoAction to an anonymous namespace 2018-07-05 17:29:58 +02:00
Doc West
61109d70b1 Removed invalid / unused signal / slot connection 2018-07-05 17:21:32 +02:00
David Cernat
691b332d03 [Client] Use MechanicsHelper::getTarget() for summoners in ObjectList 2018-07-05 16:38:03 +03:00
David Cernat
130a32ebb0 [Client] Add new methods for handling mwmp::Target in MechanicsHelper 2018-07-05 16:36:52 +03:00
Koncord
470ea50b54 [General] Use LuaJit instead default Lua 2018-07-05 19:21:53 +08:00
David Cernat
7010575075 [Server] Return -1 in GetObjectSummonerPid() when the player is invalid 2018-07-05 02:05:10 +03:00
Capostrophic
faf3e9ba5a Make spellcasting stance transition more smooth (fixes #4358) 
If a movement animation was identical to the previous one that was played, restart it from the point the previous animation ended
 2018-07-05 01:57:34 +03:00
David Cernat
76731f5def [Client] Don't remove SummonKeys with actorIds of -1 
This prevents summon duplication caused by a SummonKey sometimes being deleted immediately after being created, before the server can send back an ObjectSpawn packet spawning a creature that can be attached to the SummonKey.
 2018-07-05 01:11:45 +03:00
Doc West
baf21362e1 Fixed undo / redo actions losing their shortcuts 2018-07-04 21:47:16 +02:00
Doc West
414f626309 Implemented search case sensitivity 2018-07-04 21:03:54 +02:00
David Cernat
c2411982d2 [Client] Log object refNumIndexes and mpNums in a consistent way 2018-07-04 21:54:11 +03:00
David Cernat
7775780ad7 [Cllient] Update multiplayer code for handling quick keys 2018-07-04 05:56:10 +03:00
David Cernat
3438061b55 [Server] Add script function for getting a summoner's pid 
Additionally, fix typos in the comments for other script functions relating to summoners.
 2018-07-04 04:26:44 +03:00
David Cernat
8a23a96da4 [Client] Update initialization of AiFollow packages in multiplayer code 2018-07-04 04:00:12 +03:00
David Cernat
a236ffc4be Merge pull request #456 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	README.md
#	apps/openmw/mwgui/quickkeysmenu.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/combat.cpp
 2018-07-04 01:52:29 +03:00
Koncord
1f4e6e9114 [General] Add integrity checks to Handshake packet 2018-07-03 18:41:03 +08:00
Koncord
fa2bf0663e [General] Simplify vectorContains 2018-07-03 18:41:03 +08:00
Marc Zinnschlag
908af3720f Merged pull request #1791 2018-07-03 09:37:51 +02:00
Marc Zinnschlag
e50c3657b3 Merged merge request !16 2018-07-03 09:05:59 +02:00
Doc West
e9cc697b60 Sort EnumDelegate values by name 2018-07-03 00:52:23 +02:00
David Cernat
3aa125ceda [Server] Add script functions for getting a summoner's refId and indexes 2018-07-03 00:54:08 +03:00
Koncord
53346e2663 [Client] Return 0 if effect not found 2018-07-03 03:43:38 +08:00
Koncord
c5c1a160b2 [Client] Comment out an unused variable 2018-07-03 03:35:48 +08:00
Koncord
895634cd16 [General] Change type of MpNum to "unsigned int" 2018-07-03 03:25:54 +08:00
Koncord
d999cc0d55 [General] Add packetValid flag to packets 2018-07-03 02:06:52 +08:00
David Cernat
f9ebe400f7 [Server] Add script function for checking if object's summoner is player 2018-07-02 18:32:42 +03:00
Koncord
d162f6fd3a [General] Explicitly use limitations of the master server 2018-07-02 23:29:07 +08:00
Koncord
62877f38b7 [General] Remove Terra support 
Use LuaJIT instead.
 2018-07-02 23:07:09 +08:00
Koncord
685a80887b Remove Pawn support 2018-07-02 23:00:35 +08:00
Andrei Kortunov
f4330cf057 Editor: limit FPS in 3D preview windows (feature #3641) 2018-07-02 12:20:34 +04:00
Thunderforge
7cbc4eeb49 Adding missing override keywords 
Prevents compiler warnings such as this:

```
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:65:22: warning: 'onOpen' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual void onOpen();
                     ^
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:38:22: note: overridden virtual function is here
        virtual void onOpen() {}
                     ^
```
 2018-07-01 19:17:50 -05:00
David Cernat
bef53749ed [General] Replace BaseObject's hasMaster variable with isSummon 
Additionally, add a GetObjectSummonState() script function to the server.
 2018-07-02 02:25:06 +03:00
David Cernat
8ce225b1cc [Client] Use the casters of damage-dealing spells as death reasons 2018-07-02 00:42:32 +03:00
Finbar Crago
5d9035c6b2 [Fixes #4482] Missing HandToHand on key quick key 0 (introduced in MR !11 for issue #4480) 
because apparently i can't count to ten...
 2018-07-01 13:46:23 +10:00
David Cernat
958b220835 [General] Send summon duration to server in ObjectSpawn packets 2018-07-01 00:43:29 +03:00
Marc Zinnschlag
2ea85d0bb6 Merge remote-tracking branch 'gl_finbar-crago/fix_quickkey_segfalt' 2018-06-30 10:17:05 +02:00
Finbar Crago
09c9bd34c3 cleanup more unnecessary struct keywords... 2018-06-30 12:43:50 +10:00
Capostrophic
6e9c08083d
Add missing empty attacker checks 2018-06-29 20:35:45 +03:00
Capostrophic
bccba24c40 Make unarmed creature attacks not affect armor condition (fixes #2455) 2018-06-29 20:18:28 +03:00
Finbar Crago
69cd7031e7 Merge branch 'master' into fix_quickkey_segfalt 2018-06-29 23:46:36 +10:00
Finbar Crago
596be205c1 cleanup unnecessary struct keywords... 2018-06-29 23:43:51 +10:00
Finbar Crago
2722ca50fb fix QuickKeysMenu crash on reopening window after item drop + pickup [see: !11#note_85086570] 2018-06-29 23:32:05 +10:00
Finbar Crago
7ae388086b Merge branch 'master' into fix_quickkey_segfalt 2018-06-29 12:34:53 +10:00
Thunderforge
72f6b1a693 Separating "Game" Advanced Settings into "Game Mechanics" and "User Interface" 2018-06-28 20:13:18 -05:00
Finbar Crago
ed71656ea6 fix updateActivatedQuickKey() crash 
keyboard numbers don't start at zero...
 2018-06-29 01:58:57 +10:00
Finbar Crago
24d5fb09da fix crash on simultaneous key presses 2018-06-28 22:55:02 +10:00
Bret Curtis
f07d50e5bf
Merge pull request #1785 from akortunov/warnfix 
Fix some GCC warnings
 2018-06-28 10:33:51 +02:00
Finbar Crago
d790a27060 Merge branch 'master' into fix_quickkey_segfalt 2018-06-28 18:16:00 +10:00
Andrei Kortunov
d9a1de0ec7 Do not use deprecated function 2018-06-28 11:13:32 +04:00
Andrei Kortunov
5455490ad2 Avoid fall-through in spell selection 2018-06-28 11:12:48 +04:00
Finbar Crago
80a3f0a0d4 switch mSelectedIndex/mActivatedIndex int to mSelected/mActivated keyData pointers 2018-06-28 17:02:25 +10:00
Finbar Crago
335e2c5897 add keyData struct + general cleanup 2018-06-28 13:27:08 +10:00
David Cernat
9102df7fde [General] Make WorldCollisionOverride also work with specific refIds 
For now, this only makes it possible to enforce collision for specific refIds for placed objects.
 2018-06-28 04:53:00 +03:00
David Cernat
84af9d9999 [Server] Reorder world map script functions 2018-06-28 03:48:16 +03:00
David Cernat
b81ca18316 [Client] Don't clear container Ptrs when disposing of corpses 
The reason for this is that only the server should be determine whether a corpse can be disposed of or not.
 2018-06-28 01:45:15 +03:00
Nikolay Kasyanov
5fcb091127 Replace FIXME with a detailed explanation of the issue 2018-06-27 22:40:09 +02:00
Nikolay Kasyanov
9c78364c45 Revert "Merge pull request #1771 from Xenkhan/master" 
This reverts commit 9667dd051c, reversing
changes made to f52e06fc19.
 2018-06-27 22:19:09 +02:00
David Cernat
7ffdb18bf9 [General] Implement ActorDeath packet, part 1 
ActorDeath packets are sent for dead actors before their StatsDynamic packets. They contain the actor's deathReason in a manner similar to that of PlayerDeath packets.

A future commit will replace the deathReason with a variable named killer which will be an mwmp::Target.
 2018-06-27 21:47:55 +03:00
Andrei Kortunov
ec73011617 Clean temporary storage if we assign new AI package (bug #4464) 2018-06-27 12:52:43 +04:00
Andrei Kortunov
ee45f54b53 Refactor AiTemporaryStorage usage 2018-06-27 12:48:34 +04:00
Andrei Kortunov
3c7ab976c3 Ignore movement from scripted animations (bug #4475) 2018-06-27 08:22:45 +04:00
Finbar Crago
cac6d59140 Merge branch 'master' into fix_quickkey_segfalt 2018-06-27 12:58:43 +10:00
David Cernat
15bfa30070 [Server] Make it possible to resend received worldstates 2018-06-27 02:00:16 +03:00
David Cernat
7060ff59c5 [Client] Enforce the default global map cell size in multiplayer 2018-06-27 01:23:48 +03:00
David Cernat
fec500c4b0 [Client] Reduce container debug spam by requiring VERBOSE logging for it 2018-06-26 23:40:19 +03:00
David Cernat
914b79fcc9 [General] Make it possible to check which placed objects have containers 2018-06-26 16:56:08 +03:00
Finbar Crago
43c9fd4cec check MWWorld::Ptr != NULL for MWGui ItemPtr tooltips 2018-06-26 13:41:53 +10:00
Finbar Crago
186ec8c50f rm ContainerStore/refItem 2018-06-26 13:35:04 +10:00
Marc Zinnschlag
705b2dca0e Merged pull request #1777 2018-06-25 11:58:12 +02:00
Marc Zinnschlag
baeaff2309 Merged pull request #1778 2018-06-25 11:57:45 +02:00
Andrei Kortunov
97d8cc0efe Check if the local was not found, just for sure 2018-06-25 11:21:00 +04:00
Andrei Kortunov
7dff8d8fe2 Check cell for null 2018-06-25 10:26:58 +04:00
Finbar Crago
46c6abcf54 add string vectors for name/id in QuickKeysMenu for item lookups 2018-06-25 16:02:28 +10:00
Andrei Kortunov
441463327c Validate map size 2018-06-25 09:57:40 +04:00
Andrei Kortunov
359e748c28 Initialize some missing fields in constructors 2018-06-25 09:35:42 +04:00
David Cernat
deda6ec071 [Client] Don't send WorldMap packets for already explored map tiles 2018-06-25 02:34:11 +03:00
Capostrophic
ecafcefae9
Fall back to regular head when getVampireHead fails 2018-06-24 14:39:48 +03:00
Capostrophic
35b0546737 Consider <p> tag when discarding post-EOL tag text (regression #4473) 2018-06-23 14:27:40 +03:00
Finbar Crago
da4c55d5ad prevent segfalt in QuickKeysMenu when item has been removed from player inventory 
added a MWWorld::ContainerStore to hold item copies which are then used to find
real items with findReplacement().

(storing the RefId could be a better solution but would probably leave tooltips broken...)
 2018-06-23 17:51:32 +10:00
David Cernat
5bb2ba1e9e [General] Limit maximum imageData size in WorldMap packets 2018-06-23 02:33:34 +03:00
Bret Curtis
a55583a395
Merge branch 'master' into master 2018-06-21 22:22:01 +02:00
David Cernat
7e90d1f2a4 [Client] Fix interior-to-exterior and v.v. cell transitions for actors 
Make sure only players who are cell authorities can get actors to teleport across cells for them, and display a message box for players who are not cell authorities.
 2018-06-21 16:44:49 +03:00
Xenkhan
405a0caf29
Remove unneeded whitespace 2018-06-20 13:56:00 -05:00
Xenkhan
5a4817c147
Get rid of reinterpret_cast<> 2018-06-20 13:33:59 -05:00
Marc Zinnschlag
22eb037c18 Merged pull request #1773 2018-06-20 19:08:50 +02:00
Bret Curtis
6655b7e512
Merge pull request #1740 from nikolaykasyanov/software-cursor-decompression 
Decompress cursors using SDL software renderer on Mac or if OSG >= 3.5.8 or if OPENMW_DECOMPRESS_TEXTURES is set
 2018-06-20 17:19:48 +02:00
Marc Zinnschlag
6315848620 Merged merge request !2 2018-06-20 16:02:54 +02:00
Bret Curtis
b619c0de2d
Merge pull request #1772 from akortunov/deathanim 
Fast-forward death animation to end if death animation was finished earlier
 2018-06-20 13:28:36 +02:00