krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
20909 commits 35 branches 0 tags 65 MiB
Commit graph

11422 commits

Author SHA1 Message Date
David Cernat
ac374a8ef9 Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 
Conflicts:
 	apps/openmw-mp/Player.cpp
	apps/openmw-mp/Script/Functions/Mechanics.cpp
	apps/openmw-mp/Script/Functions/Mechanics.hpp
	apps/openmw-mp/Script/Functions/Quests.cpp
	apps/openmw-mp/Script/Functions/Quests.hpp
	apps/openmw-mp/Script/ScriptFunctions.hpp
	apps/openmw-mp/processors/player/ProcessorRecordDynamic.hpp
	apps/openmw/mwmp/LocalPlayer.hpp
	apps/openmw/mwmp/WorldEvent.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/openmw-mp/Base/BasePlayer.hpp
 2018-02-12 06:50:52 +02:00
David Cernat
a7e3261b0b
Merge pull request #383 from OpenMW/master 
Add OpenMW commits up to 11 Feb 2018
 2018-02-11 06:57:54 +02:00
scrawl
5bb7d76913
Merge pull request #1605 2018-02-10 23:15:26 +00:00
scrawl
899d464b0d
Cap the rain emitter's frame time (Fixes #4314) 2018-02-10 23:14:41 +00:00
scrawl
f28024b541
Don't use Activate and Move keys for GUI navigation if bound to mouse buttons (Fixes #4225, Fixes #4320) 2018-02-10 23:11:03 +00:00
Andrei Kortunov
f626a7fcc7 Take in account PC rank during disposition calculation (bug #4322) 2018-02-10 17:58:30 +04:00
David Cernat
74765b3ace [General] Implement selected spell sync as part of PlayerMiscellaneous 2018-02-06 06:36:46 +02:00
David Cernat
029dfc56ba [General] Implement player scale as part of PlayerShapeshift 2018-02-01 02:11:45 +02:00
David Cernat
aa448523f8 [Client] Clean up WorldEvent::runConsoleCommands() slightly 2018-01-31 23:23:52 +02:00
David Cernat
ce5670e57e [Client] Ignore invalid object refIds from ObjectPlace packets 2018-01-31 18:51:53 +02:00
David Cernat
4496625154
Merge pull request #381 from OpenMW/master 
Add OpenMW commits up to 31 Jan 2018
 2018-01-31 05:03:28 +02:00
David Cernat
66078bfea7 [General] Implement Mark location sync as part of PlayerMiscellaneous 2018-01-31 04:50:29 +02:00
scrawl
b1b8e31562
Use unique_ptr over new/delete (Fixes #4305) 2018-01-30 22:05:16 +00:00
David Cernat
989f6e6b51 [General] Implement PlayerReputation packet 2018-01-30 22:55:29 +02:00
David Cernat
bdafa8e9ab
Merge pull request #380 from TES3MP/0.6.3 
Add 0.6.3 commits up to 30 Jan 2018
 2018-01-30 16:05:24 +02:00
David Cernat
3d80e2db62 [General] Add placeholders for new packet types, part 2 2018-01-30 16:01:33 +02:00
David Cernat
f1ba9253b0 [Client] Fix build 2018-01-30 14:06:07 +02:00
David Cernat
5858e05362 Merge pull request #378 from TES3MP/0.6.3 while resolving conflicts 
Conflicts:
	apps/openmw-mp/CMakeLists.txt
	apps/openmw-mp/Script/ScriptFunctions.hpp
	components/CMakeLists.txt
 2018-01-30 00:54:56 +02:00
David Cernat
02af7f6ba1 [General] Add placeholders for new packet types 2018-01-29 22:32:51 +02:00
David Cernat
1a8a518897 Merge pull request #376 from TES3MP/0.6.3 while resolving conflicts 
Conflicts:
	README.md
	apps/openmw-mp/Script/Functions/World.cpp
	apps/openmw/mwmp/LocalPlayer.cpp
	apps/openmw/mwmp/LocalPlayer.hpp
	apps/openmw/mwworld/scene.cpp
	components/openmw-mp/Version.hpp
 2018-01-29 02:57:48 +02:00
David Cernat
78df8c5ebe
Merge pull request #375 from OpenMW/master 
Add OpenMW commits up to 29 Jan 2018
 2018-01-29 02:36:48 +02:00
scrawl
89c6b59c30
Merge pull request #1602 2018-01-28 22:35:47 +00:00
David Cernat
ce11a1dfa9 [Client] Fix potential invalid pointer when storing cell unloads 
Notably, builds of the client done with Clang were crashing on startup before this.
 2018-01-29 00:14:26 +02:00
David Cernat
420dab10e1 [General] Track objects directly placed by players in ObjectPlace 
This allows the OnPCDrop variable to get set correctly even when object placements have to go through the server first in order to gain a unique multiplayer index (mpNum).

Among other things, this makes it possible to roll marijuana joints in the popular mod "Tribunal Code Patch".
 2018-01-28 17:46:51 +02:00
David Cernat
595bc5a152 [Client] Only send ObjectScale packets when scale actually changes 2018-01-28 05:58:56 +02:00
David Cernat
5d4b97645d Merge pull request #374 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/CMakeLists.txt
 2018-01-27 22:52:59 +02:00
David Cernat
569911121d [Client] Fix build 2018-01-27 22:03:21 +02:00
David Cernat
5cf71a4e67 Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp 2018-01-27 21:14:33 +02:00
David Cernat
d70b93e095 Merge pull request #373 from TES3MP/0.6.2 while resolving conflicts 
# Conflicts:
#	apps/openmw/mwmp/DedicatedActor.cpp
#	apps/openmw/mwmp/processors/player/ProcessorPlayerResurrect.hpp
 2018-01-27 21:14:24 +02:00
David Cernat
d7e29f1f61 [Client] Unequip items with constant effect damage when resurrected 2018-01-27 20:19:39 +02:00
David Cernat
d19d8b0a34 [Client] Add and use enchantmentType argument for unequipItemsByEffect() 2018-01-27 19:37:16 +02:00
David Cernat
6c4bb8c423 [Client] Move resurrection code for local player to LocalPlayer 2018-01-27 19:09:55 +02:00
David Cernat
6b75a82777 [Client] Ignore equipment items for DedicatedActors with count below 0 2018-01-27 18:08:45 +02:00
David Cernat
e3bc11d9eb [Client] Fix ListBox overlap crashes by removing ListBoxes properly 2018-01-27 15:41:11 +02:00
David Cernat
c6a85ee8f9 [Client] Add doesEffectListContainEffect() method to MechanicsHelper 2018-01-26 03:18:01 +02:00
David Cernat
aa392ebf20 [Client] Unequip items if necessary when attr/skill modifier is set to 0 2018-01-26 00:45:39 +02:00
David Cernat
ace825b99c [Client] Ignore invalid player class IDs from packets 
Additionally, clean up variables names in related code.
 2018-01-24 02:47:56 +02:00
David Cernat
c6874509b6 [Client] Ignore invalid faction IDs from packets 2018-01-24 02:25:44 +02:00
Koncord
0e97b769f9 [General] Change type of Object::enchantmentCharge 2018-01-20 20:07:29 +08:00
Koncord
7e5b929ea2 [General] Rework PacketPlayerFaction 2018-01-20 19:45:24 +08:00
Koncord
29ba07fe8c [General] Rework PacketPlayerInventory 
Save the Action for each item. Now you can add or remove multiple items
 2018-01-20 18:40:23 +08:00
Koncord
de0bb3cdab [General] Change type of Item::enchantmentCharge to float 2018-01-20 18:32:26 +08:00
Koncord
1f1cbf53f9 [Client] Mark trivial destructor as default, remove "virtual" keyword 
Mark constructor as explicit
 2018-01-19 15:56:01 +08:00
Koncord
b63bf258ff [Client] Remove "virtual" keyword for getLocalActor & getDedicatedActor 2018-01-19 15:52:05 +08:00
Koncord
c2578918f2 [Client] Do not copy strings in getLocalActor and getDedicatedActor 2018-01-19 15:50:44 +08:00
Koncord
e2e197d84a [Client] Fix getting element of shared_ptr by reference 2018-01-19 15:45:20 +08:00
Koncord
f1e2bc01f6 [General] Use floats instead of doubles for enchantmentCharge 2018-01-19 15:41:29 +08:00
Ilya Zhuravlev
8d44d3124e Android: Add callbacks for basic cursor handling. 2018-01-18 21:18:31 -05:00
David Cernat
a037193e79 Merge pull request #372 from TES3MP/0.6.2 while resolving conflicts 
Conflicts:
	apps/openmw-mp/Script/Functions/Actors.cpp
	apps/openmw-mp/Script/Functions/Actors.hpp
	apps/openmw-mp/Script/Functions/Items.cpp
	apps/openmw-mp/Script/Functions/Items.hpp
	apps/openmw-mp/Script/Functions/World.cpp
	apps/openmw-mp/Script/Functions/World.hpp
	apps/openmw/mwmp/WorldEvent.cpp
	components/openmw-mp/Packets/Player/PacketPlayerEquipment.cpp
	components/openmw-mp/Version.hpp
 2018-01-18 13:40:13 +02:00
Ilya Zhuravlev
455f718394 Android: register a virtual controller definition 2018-01-17 23:14:23 -05:00