1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 20:49:56 +00:00
Commit graph

14445 commits

Author SHA1 Message Date
Allofich
315ad54b29 Don't make NPCs or player speak while underwater
(Fixes #3851)
2017-05-08 19:55:54 +09:00
Andrei Kortunov
de14e9811d Fixed Travis CI build 2017-05-08 11:16:03 +04:00
David Cernat
5bd95628ce [Client] Send an ObjectDelete packet when disposing of corpses 2017-05-08 08:44:43 +03:00
PlutonicOverkill
f30d1a3075 Revert everything 2017-05-08 17:24:28 +12:00
David Cernat
26087a182d Merge pull request #213 from OpenMW/master
Add OpenMW commits up to 8 May 2017
2017-05-08 01:03:19 +03:00
Koncord
31adb5d715 [Server] Allow timers callbacks to restart timers 2017-05-08 05:48:04 +08:00
scrawl
48c764a580 Update test 2017-05-07 23:31:06 +02:00
scrawl
813af876f6 Use a partial binary search in isReservedName (Fixes #3835) 2017-05-07 23:28:56 +02:00
scrawl
109bc3cb59 Merge pull request #1281 from akortunov/purgefix
Make InventoryStore::purgeEffect() purge all effects with argument ID instead only first
2017-05-07 21:08:30 +02:00
scrawl
796d2c59ca Merge pull request #1282 from MiroslavR/noenv_player_vo
Do not apply underwater effects to player's voice
2017-05-07 21:07:19 +02:00
Koncord
d82ed7d0ad [Client] Register ProcessorGameTime 2017-05-08 02:46:02 +08:00
Koncord
6c45b6dc5b [Client] Fix ProcessorGameTime ID 2017-05-08 02:45:44 +08:00
David Cernat
3fb0bbb58c [Client] Make it possible to turn off console again 2017-05-07 20:13:49 +03:00
PlutonicOverkill
a9760ec805 Fix indenting 2017-05-07 17:07:58 +12:00
PlutonicOverkill
d8a711f89f Fix tabs 2017-05-07 17:05:50 +12:00
PlutonicOverkill
477af73ad6 Missed another one 2017-05-07 17:00:26 +12:00
PlutonicOverkill
418aeb65f1 Remove unneeded dependencies 2017-05-07 16:58:15 +12:00
PlutonicOverkill
5fca37d0c8 Forgot to remove debugging code 2017-05-07 16:54:38 +12:00
PlutonicOverkill
dff3828710 Keep the settings page in sync with the real settings 2017-05-07 16:51:11 +12:00
David Cernat
34f0a5e076 [Client] Disable leveled creatures from their class instead of scene.cpp 2017-05-07 03:18:15 +03:00
David Cernat
aaaed8ab8b [Client] Fix potential object duplication in WorldEvent::placeObjects()
Also clean up the debug messages in WorldEvent so they don't take up multiple lines.
2017-05-07 03:17:19 +03:00
David Cernat
de49f5f175 [General] Add and use isActor bool for WorldObject 2017-05-07 03:07:09 +03:00
David Cernat
9d2c5c3502 [General] Simplify structure of BaseEvent 2017-05-06 21:57:29 +03:00
Koncord
250c199188 [Server] Fill query information about plugins 2017-05-07 02:52:28 +08:00
Koncord
87c172186e [Server] Add and implement PushPlugin method to MasterClient 2017-05-07 02:51:57 +08:00
Koncord
873da495b1 [Server] Trigger 'update' when added new rules in MasterClient 2017-05-07 02:51:25 +08:00
Koncord
f2b8a939ef [Server] Add postInit method and move getPluginListSample in to it 2017-05-07 02:49:58 +08:00
Koncord
3f34d328b8 [Browser] use range-based 'for' instead regular 'for' 2017-05-07 02:21:52 +08:00
Koncord
96212e96f4 [Browser] Fix rules list 2017-05-07 02:17:15 +08:00
Koncord
26445355e6 [Server] Fix initialization of mclient 2017-05-07 02:17:15 +08:00
Koncord
a4a77ddeff [Server] Add SetRuleString and SetRuleValue to script API 2017-05-07 02:17:15 +08:00
Koncord
a0b71eda23 [Server] FIx deadlock 2017-05-07 02:17:15 +08:00
Koncord
c2ce2f2ce7 [Server] Use MasterServer update rate from config 2017-05-07 02:17:15 +08:00
David Cernat
dcc61a095a [Client] Allow multiple WorldObjects to be added to a WorldEvent 2017-05-06 20:44:39 +03:00
Koncord
32284787de [Server] Add OnServerPostInit callback 2017-05-07 01:42:01 +08:00
Koncord
9992058942 [Browser] Use constant instead magic value in PingRakNetServer 2017-05-07 01:06:39 +08:00
Koncord
b7e45f269b [Browser] Detach ping from GUI thread 2017-05-07 00:56:50 +08:00
Koncord
db16e45e76 [Browser] Add PingUpdater & PingHelper classes for detached ping 2017-05-07 00:56:50 +08:00
Koncord
42eaa7a8fd [Browser] Optimize PingRakNetServer() function 2017-05-07 00:56:50 +08:00
PlutonicOverkill
64879c03e4 Add option to reset settings to default 2017-05-06 20:18:31 +12:00
David Cernat
bdc8b7f863 [Client] Send level creatures in ObjectPlace reply to ActorList request 2017-05-06 08:40:36 +03:00
David Cernat
9eef867928 [Client] Disable regular spawning of leveled creatures 2017-05-06 08:37:51 +03:00
David Cernat
3def111ca1 [Client] Fix graphical glitches related to DedicatedActor initialization 2017-05-06 04:49:49 +03:00
David Cernat
62aa6ed7ea [Client] Send PlayerPosition packets based on a timeout 2017-05-06 00:59:54 +03:00
David Cernat
ef12a37d59 [Client] Send ActorPosition packets based on a timeout 2017-05-06 00:33:48 +03:00
David Cernat
db3859565b [Client] Send ActorStatsDynamic packets only when stats change enough 2017-05-05 23:17:15 +03:00
David Cernat
4d81455020 [General] Rework and simplify death reasons so they work with NPCs 2017-05-05 22:16:31 +03:00
David Cernat
b745a33f18 [Client] Resurrect DedicatedActors that aren't supposed to be dead 2017-05-05 20:38:28 +03:00
David Cernat
8b4e167efe [Client] Prevent NPC subtitles from being added to open Dialogue window 2017-05-05 20:16:20 +03:00
David Cernat
bcdbecf608 [Client] Initialize Cell before moving DedicatedActor to it 2017-05-05 19:54:20 +03:00
David Cernat
60cf623455 [Client] Make DedicatedActors transition into LocalActors when eligible 2017-05-05 07:37:09 +03:00
David Cernat
06f3c07116 [Server] Only read Actor packets from players who are still authorities 2017-05-05 06:13:34 +03:00
David Cernat
206c9cc357 [Client] Use CellController pointers to make code easier to read 2017-05-05 04:58:44 +03:00
David Cernat
e05adbfe65 [Client] Add better debug for Actor cell changes 2017-05-05 04:46:40 +03:00
David Cernat
950a8eae3d [Client] Move Actors to Cells rather than reinitialize them from scratch 2017-05-05 03:52:41 +03:00
David Cernat
8b8d55e8d3 [Client] Set a very high processing range for AI for the time being 2017-05-05 03:17:28 +03:00
David Cernat
8d41a0c53b [Client] Make LocalActor initialization include newly spawned Actors 2017-05-05 02:46:16 +03:00
David Cernat
79691254a4 Merge pull request #210 from OpenMW/master
Add OpenMW commits up to 3 May 2017
2017-05-03 17:44:08 +03:00
Marc Zinnschlag
a2e863e7dd Merge remote-tracking branch 'origin/master' 2017-05-03 14:31:21 +02:00
Andrei Kortunov
4d927439ca Spell priority: item wearing check when disintegrate weapon/armor 2017-05-03 11:13:35 +04:00
Koncord
93edd67681 [Client] Use boolean var instead requestQuit or throwing runtime_error 2017-05-03 14:52:32 +08:00
Koncord
e0139c33b3 [Client] Remove destructor in Cell 2017-05-03 14:46:25 +08:00
Koncord
4eb02af8fb [Client] Use __WINDOWS define 2017-05-03 14:44:38 +08:00
Koncord
47e6820f97 [General] Move printWithWidth and intToHexStr to components 2017-05-03 14:38:44 +08:00
Andrei Kortunov
d598809ac6 Spell priority: check spell resistance, check if actor is already has a non-magnitude effect 2017-05-03 10:35:56 +04:00
David Cernat
34e77c5dae [Client] Initialize Actors based on the guid of an ActorAuthority packet 2017-05-03 04:47:04 +03:00
David Cernat
e01cadad23 [Server] Send ActorAuthority packets to all players who loaded the cell 2017-05-03 04:45:55 +03:00
David Cernat
63dd2d9246 [General] Remove code related to ActorAuthority packets that is not used 2017-05-03 04:43:59 +03:00
David Cernat
0b40cb8919 [Client] When there are more client than server plugins, print them all 2017-05-03 03:14:11 +03:00
David Cernat
92e277d75d [Client] Prevent application hang on Windows when plugins don't match 2017-05-03 02:17:19 +03:00
David Cernat
0284f18876 [Client] Replace plugin load order message with a clearer one at the top 2017-05-03 02:15:14 +03:00
David Cernat
1dbe9f0eaa [Client] Print plugin comparison in a better-looking way on Windows 2017-05-03 01:51:47 +03:00
David Cernat
f80a16b897 [Client] Don't use try/catch when printing missing plugins
Also move load order note to bottom where it fits better.
2017-05-03 00:15:43 +03:00
David Cernat
4294508082 [Client] Don't print null for missing plugins when comparing with server 2017-05-02 23:22:37 +03:00
David Cernat
c3c04bbfc3 [General] Make coding style consistent 2017-05-02 22:47:58 +03:00
Koncord
afcf5a7fc8 [Client] Fix segmentation fault 2017-05-03 02:43:58 +08:00
Koncord
ccae9590cc [Client] Fix comparison between signed and unsigned integer expressions 2017-05-03 02:43:00 +08:00
Koncord
01bdbfecfb [Client] Fix wrong checksum collection 2017-05-03 02:41:36 +08:00
Koncord
7bee82cedb [Client] Add notification about strict order 2017-05-02 23:50:36 +08:00
Koncord
f6bea7a114 [Client] Read answer about ID_GAME_PREINIT from server 2017-05-02 23:37:18 +08:00
Koncord
bda9a76d29 [Server] Send server plugin list to client 2017-05-02 23:33:50 +08:00
Koncord
f00c4dc107 [Server] Improve preload logic for parsing plugin lists 2017-05-02 20:21:08 +08:00
Koncord
5ddad6a4c6 [Server] Implement getPluginListSample() 2017-05-02 20:21:08 +08:00
Koncord
b223d0fa1e [Server] Register new callback 2017-05-02 20:21:08 +08:00
PlutonicOverkill
829560719e Make name highlighting more consistent and only for variable names 2017-05-02 17:28:42 +12:00
David Cernat
377aa9b6c9 [Server] Refresh cellActorList's count after removing Actors from it 2017-05-02 03:39:00 +03:00
David Cernat
cad3eb8968 [Client] Iterate through CellStore's mergedRefs when initializing Actors 2017-05-02 03:31:40 +03:00
David Cernat
ebf9df3fe2 [Client] Add getMergedRefs() method to CellStore 2017-05-02 03:29:52 +03:00
David Cernat
f59609fcd7 [Client] Fix actor memory leaks, part 2 2017-05-02 02:45:18 +03:00
David Cernat
9b58973929 [Client] Remove variable added by tes3mp to CellStore that is not used 2017-05-02 02:42:37 +03:00
David Cernat
83ba4b62b1 [Server] Remove Actors from a Cell's ActorList when they change cells 2017-05-02 01:39:08 +03:00
David Cernat
a77bd6652f [Client] Read ActorPosition packets sent from Lua script cell loads 2017-05-01 21:55:50 +03:00
David Cernat
4c35c328a9 [Server] Add SendActorPosition() script function 2017-05-01 20:58:40 +03:00
David Cernat
e5e888ac21 [Server] Add script functions for checking what data an Actor has 2017-05-01 20:55:36 +03:00
David Cernat
fafed96bf4 [Server] Store data from ActorPosition in the ActorLists of Cells 2017-05-01 20:42:54 +03:00
David Cernat
730df061b3 [General] Add hasPositionData and hasStatsDynamicData bools to BaseActor 2017-05-01 19:44:23 +03:00
Koncord
5517d871c6 [Server] Handle ID_CONNECTION_ATTEMPT_FAILED in MasterClient
And fix log message
2017-05-02 00:24:24 +08:00
Koncord
1ce8c0f9ec [Server] Fix id in log message for ID_PLAYER_CELL_STATE processor 2017-05-02 00:16:54 +08:00
David Cernat
48b773bfcb [Client] Use float scale for WorldEvent::sendObjectScale() 2017-05-01 19:09:44 +03:00
Koncord
60f4a1d9e5 [Client] Fix issues when changing npc model to creature 2017-05-01 22:54:43 +08:00