teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
20830 commits 34 branches 0 tags 66 MiB
Commit graph

20830 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
6197636fac [General] Fix "using after move" warning 2018-01-20 21:02:41 +08:00
Koncord
edd883853d [Server] Add sendConsoleCommand function to lua api 2018-01-20 20:46:14 +08:00
Koncord
0e97b769f9 [General] Change type of Object::enchantmentCharge 2018-01-20 20:07:29 +08:00
Koncord
4cfb04aa7f [Server] Fix setBedRestAllowed 2018-01-20 20:06:41 +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
cb86557aca [Server] Init Player::inUpdateQueue 2018-01-20 15:46:25 +08:00
Koncord
0780329a59 [General] Fix typo 2018-01-19 19:32:51 +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
Koncord
1e25a122c9 [General] Use RELIABLE_ORDERED only when jumping 2018-01-19 15:36:57 +08: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
David Cernat
5894ffae7d [Client] Ignore dynamic object placements or spawns in packets 2018-01-17 11:01:31 +02:00
David Cernat
28f47c4f81 [General] Update version to 0.6.2-hotfixed 2018-01-17 08:10:49 +02:00
David Cernat
9935f56d46 [General] Use doubles instead of ints for enchantmentCharge 
Additionally, include enchantmentCharges for items  in PlayerEquipment packets.
 2018-01-17 08:10:49 +02:00
David Cernat
f746958afa [Client] Send enchantmentCharge for items added or removed in containers 2018-01-17 08:10:49 +02:00
David Cernat
bce3d0eb4c [Client] Use more descriptive message for version mismatch 2018-01-17 08:10:49 +02:00
Koncord
05fac2f67d [Browser] Disable connect button by default 2018-01-11 20:35:37 +08:00
Koncord
043eb224e2 [Browser] Cast QStrings to UTF-8 instead Latin1 2018-01-11 20:35:13 +08:00
Koncord
35b771b19e [Browser] Rework Connect window 2018-01-11 20:34:17 +08:00
David Cernat
92060bd6b6
Merge pull request #370 from TES3MP/0.6.2 
Add 0.6.2 commits up to 10 Jan 2018
 2018-01-10 03:51:07 +02:00
David Cernat
14ef2fa791
Merge pull request #369 from OpenMW/master 
Add OpenMW commits up to 9 Jan 2018
 2018-01-10 03:49:53 +02:00
scrawl
c7f60a6dc8
Merge pull request #1595 2018-01-09 13:48:07 +00:00
scrawl
f6ca7295a6
Revert "Merge pull request #1595" 
This reverts commit 7ef7b1a7b1, reversing
changes made to 9e7e4de0ab.
 2018-01-09 13:47:57 +00:00
scrawl
7ef7b1a7b1
Merge pull request #1595 2018-01-09 00:42:27 +00:00
scrawl
9e7e4de0ab
Merge pull request #1594 2018-01-09 00:42:20 +00:00
Andrei Kortunov
dba071f881 Remove the 'Screenshot saved' message (bug #4191) 2018-01-08 13:12:12 +04:00
Koncord
1de9f30449 [Server] Fix iterating killed timers when kill() called in the callback 
Instance new timers before new tick
 2018-01-08 12:24:36 +08:00
David Cernat
8316ec0fa7 [Client] Update tes3mp change comment for object rescaling 2018-01-08 02:19:05 +02:00
David Cernat
09548d05f7 [Client] Ignore cell changes that move actors to where they already are 2018-01-08 01:37:01 +02:00
David Cernat
4a9a628a0f [Client] When getting an actor, make sure their cell is initialized 2018-01-07 02:35:30 +02:00
David Cernat
45d3b24c17
Merge pull request #367 from Aesylwinn/LibIssues 
Refine CMake scripts and fix g++ 5 build
 2018-01-07 00:48:35 +02:00
David Cernat
4caf7ca30a [Client] Add temporary fix for crashes caused by custom GUI elements 2018-01-06 20:16:32 +02:00
David Cernat
0cc86c04d1 [Client] Print plugin discrepancies, not just plugin lists side by side 2018-01-06 05:39:25 +02:00