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

20805 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Kyle Cooley
7248a5d037 Remove some duplication, standardize sol2 header inclusion 2018-01-05 20:25:57 -05:00
Kyle Cooley
ba4d2bd5fe Merge remote-tracking branch 'origin/master' into LibIssues 2018-01-05 17:35:47 -05:00
David Cernat
b6a7377692 Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try 
Conflicts:
	apps/openmw-mp/Networking.cpp
	apps/openmw-mp/Script/Functions/Miscellaneous.cpp
	apps/openmw-mp/Script/Functions/Miscellaneous.hpp
	apps/openmw/mwmp/GUI/GUIChat.cpp
 2018-01-05 21:24:14 +02:00
Kyle Cooley
fcd4d8b842 Fix build for gcc-5.4.0 2018-01-04 21:41:00 -05:00
Kyle Cooley
e2103d0bea Clean up find file for LuaJit, add one for Sol2 2018-01-04 21:40:17 -05:00
Koncord
35922e4898 [General] Change "enum ACTOR_ACTION" to "enum class Action" 2018-01-05 09:40:11 +08:00
Koncord
ef0384b296 [General] Simplify ProxyMasterPacket 2018-01-05 09:06:24 +08:00
Koncord
5b8f4f3e92 [Browser] Stop PingHelper on refresh 2018-01-05 08:38:40 +08:00
Koncord
647661daf9 [General] Minor fixes in Master packets 2018-01-05 08:38:40 +08:00
David Cernat
a639d3494a [Client] Fix use of DedicatedPlayers as targets for ConsoleCommand 2018-01-05 01:24:15 +02:00
David Cernat
502df7d9c1 [Client] Clean up GUIChat slightly 2018-01-05 00:03:05 +02:00
David Cernat
a818140c14
Merge pull request #365 from OpenMW/master 
Add OpenMW commits up to 2 Jan 2017
 2018-01-04 12:12:18 +02:00
David Cernat
2f6e3b4cda [Documentation] Clarify status of version 0.7 2018-01-04 10:54:40 +02:00
Thunderforge
bd072b131b Moving controller file out of the controllers subdirectory 2018-01-02 20:58:43 -06:00
David Cernat
1cf2f35a28 [Server] Add script functions to set & get plugin enforcement state 2018-01-02 16:33:18 +02:00
Andrei Kortunov
b277b83810 Display the 'Screenshot saved' message after the screenshot saving (bug #4191) 2018-01-02 14:52:42 +04:00
Bret Curtis
b86118f76f
Merge pull request #1593 from psi29a/fix_mips_builds 
fix building on mips machines
 2018-01-02 11:45:42 +01:00
Bret Curtis
c3c3fbc68e overriden -> overridden 2018-01-02 11:42:08 +01:00
David Cernat
65d978a3cb
Merge pull request #364 from OpenMW/master 
Add OpenMW commits up to 1 Jan 2017
 2018-01-02 07:50:37 +02:00
David Cernat
bca9c55046 [Client] Reinstate "Merge pull request #1529 from drummyfish/animfix" 
This reverts commit 2f4cd6b713 and adds back the changes made by 45993d3da2 because the OpenMW issue at https://bugs.openmw.org/issues/4250 has been fixed by 57257d057f
 2018-01-02 07:47:27 +02:00
Koncord
c4949ac5d9 [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
Thunderforge
096e734df6 Adding gamecontrollerdb.txt file that got left behind due to being on .gitignore 2018-01-01 22:42:45 -06:00
Thunderforge
3f7143556a Providing different mappings depending on the version of SDL installed 2018-01-01 22:16:54 -06:00
Thunderforge
a5e4f95ed4 Updating controller mappings to latest version 2018-01-01 22:16:54 -06:00
Koncord
8f5d31cb03 [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00