Commit Graph

15640 Commits (043eb224e29ca7b41a738eb598e16131ccfedd1a)

Author SHA1 Message Date
Koncord 043eb224e2 [Browser] Cast QStrings to UTF-8 instead Latin1 7 years ago
Koncord 35b771b19e [Browser] Rework Connect window 7 years ago
David Cernat 92060bd6b6
Merge pull request #370 from TES3MP/0.6.2
Add 0.6.2 commits up to 10 Jan 2018
7 years ago
David Cernat 14ef2fa791
Merge pull request #369 from OpenMW/master
Add OpenMW commits up to 9 Jan 2018
7 years ago
scrawl c7f60a6dc8
Merge pull request #1595 7 years ago
scrawl f6ca7295a6
Revert "Merge pull request #1595"
This reverts commit 7ef7b1a7b1, reversing
changes made to 9e7e4de0ab.
7 years ago
scrawl 7ef7b1a7b1
Merge pull request #1595 7 years ago
scrawl 9e7e4de0ab
Merge pull request #1594 7 years ago
Andrei Kortunov dba071f881 Remove the 'Screenshot saved' message (bug #4191) 7 years ago
Koncord 1de9f30449 [Server] Fix iterating killed timers when kill() called in the callback
Instance new timers before new tick
7 years ago
David Cernat 8316ec0fa7 [Client] Update tes3mp change comment for object rescaling 7 years ago
David Cernat 09548d05f7 [Client] Ignore cell changes that move actors to where they already are 7 years ago
David Cernat 4a9a628a0f [Client] When getting an actor, make sure their cell is initialized 7 years ago
David Cernat 4caf7ca30a [Client] Add temporary fix for crashes caused by custom GUI elements 7 years ago
David Cernat 0cc86c04d1 [Client] Print plugin discrepancies, not just plugin lists side by side 7 years ago
Kyle Cooley 7248a5d037 Remove some duplication, standardize sol2 header inclusion 7 years ago
Kyle Cooley ba4d2bd5fe Merge remote-tracking branch 'origin/master' into LibIssues 7 years ago
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
7 years ago
Kyle Cooley fcd4d8b842 Fix build for gcc-5.4.0 7 years ago
Kyle Cooley e2103d0bea Clean up find file for LuaJit, add one for Sol2 7 years ago
Koncord 35922e4898 [General] Change "enum ACTOR_ACTION" to "enum class Action" 7 years ago
Koncord 5b8f4f3e92 [Browser] Stop PingHelper on refresh 7 years ago
David Cernat a639d3494a [Client] Fix use of DedicatedPlayers as targets for ConsoleCommand 7 years ago
David Cernat 502df7d9c1 [Client] Clean up GUIChat slightly 7 years ago
David Cernat a818140c14
Merge pull request #365 from OpenMW/master
Add OpenMW commits up to 2 Jan 2017
7 years ago
Thunderforge bd072b131b Moving controller file out of the controllers subdirectory 7 years ago
David Cernat 1cf2f35a28 [Server] Add script functions to set & get plugin enforcement state 7 years ago
Andrei Kortunov b277b83810 Display the 'Screenshot saved' message after the screenshot saving (bug #4191) 7 years ago
Bret Curtis c3c3fbc68e overriden -> overridden 7 years ago
David Cernat 65d978a3cb
Merge pull request #364 from OpenMW/master
Add OpenMW commits up to 1 Jan 2017
7 years ago
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
7 years ago
Koncord c4949ac5d9 [General] Change regular enums to enum class 7 years ago
Thunderforge 3f7143556a Providing different mappings depending on the version of SDL installed 7 years ago
Koncord 8f5d31cb03 [Server] Iterate only through updated players on each frame 7 years ago
Koncord 4ab338bbb1 [Server] Register ON_PLAYER_QUICKKEYS event 7 years ago
Koncord 5777759aae [General] Change enum QuickKey::QUICKKEY_TYPE to enum class 7 years ago
Koncord 2019128d92 [Server] Change signature of TimerController::kill, validate callback 7 years ago
David Cernat 51a92bcf8f [Client] Fix build 7 years ago
David Cernat 09958681cd Merge pull request #363 from TES3MP/0.6.2 while resolving conflicts, 2nd try 7 years ago
scrawl 57257d057f
Remove unintended jump cooldown (Fixes #4250) 7 years ago
David Cernat 47a3dc9ff2 [Server] Add broadcast argument to functions for sending WorldPackets 7 years ago
David Cernat 1e2517698d [Server] Send player speech and animation packets only to nearby players 7 years ago
David Cernat 2f4cd6b713 [Client] Revert "Merge pull request #1529 from drummyfish/animfix"
This reverts commit 45993d3da2, reversing
changes made to 3d347730dc.

That commit made players have to wait around 1.5 seconds after each jump before doing a new one.

It will be reinstated once its accompanying OpenMW issue at https://bugs.openmw.org/issues/4250 is fixed.
7 years ago
David Cernat db0e0d376e [Client] Use new code to set the console's Ptrs from server scripts
Previously, reusing the console's object selection code made it so using the same Ptr twice in a row was akin to clicking on the same object twice in the console window, i.e. the object was deselected the second time around. Additionally, that same code was setting key focus to the hidden console window, preventing players from moving until they activated another window (such as their inventory or chat window).
7 years ago
David Cernat dddd2f1cc7 Merge pull request #361 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
7 years ago
David Cernat 5fd9079b26 [Client] Stop drag and drop when setting player inventory 7 years ago
David Cernat 40e70ebf9c [Client] Fix key focus for chat window 7 years ago
David Cernat bed96e5a3d [Client] Remove check of GM_RestBed GUI mode that no longer exists 7 years ago
David Cernat cac2c6c1e8 Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts 7 years ago
David Cernat ecb0ad0d77 Merge pull request #359 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
7 years ago