krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
openmw-tes3coop/apps/openmw
History
David Cernat 176aa62b15 Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 
Conflicts:
	apps/openmw-mp/Script/Functions/Cells.cpp
	apps/openmw-mp/Script/Functions/Cells.hpp
	apps/openmw-mp/Script/Functions/Worldstate.cpp
	apps/openmw-mp/Script/Functions/Worldstate.hpp
	apps/openmw-mp/Script/ScriptFunctions.hpp
	apps/openmw-mp/processors/player/ProcessorPlayerMap.hpp
	apps/openmw/mwmp/processors/player/ProcessorPlayerMap.hpp
	components/openmw-mp/Base/BasePlayer.hpp
	components/openmw-mp/Packets/Player/PacketPlayerMap.hpp
	components/openmw-mp/Packets/Worldstate/PacketWorldMap.cpp
2018-06-07 23:23:19 +03:00
..
mwbase Merge pull request #440 from OpenMW/master 2018-05-27 16:10:16 +03:00
mwclass [General] Implement WorldCollisionOverride packet 2018-05-27 16:05:40 +03:00
mwdialogue Merge pull request #389 from OpenMW/master 2018-02-25 22:05:32 +02:00
mwgui Merge pull request #441 from TES3MP/0.6.3 while resolving conflicts 2018-05-28 05:11:34 +03:00
mwinput Merge pull request #400 from OpenMW/master while resolving conflicts 2018-04-03 01:25:17 +03:00
mwmechanics Merge pull request #444 from TES3MP/0.6.3 while resolving conflicts 2018-06-06 08:26:14 +03:00
mwmp Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 2018-06-07 23:23:19 +03:00
mwphysics Merge pull request #440 from OpenMW/master 2018-05-27 16:10:16 +03:00
mwrender Merge pull request #445 from OpenMW/master 2018-06-07 13:41:04 +03:00
mwscript Merge pull request #440 from OpenMW/master 2018-05-27 16:10:16 +03:00
mwsound Merge pull request #1708 from akortunov/refidfix 2018-05-16 15:59:31 +02:00
mwstate Revert "Merge pull request #1701 from akortunov/standfix" 2018-05-26 11:35:48 +00:00
mwworld Merge pull request #444 from TES3MP/0.6.3 while resolving conflicts 2018-06-06 08:26:14 +03:00
android_commandLine.cpp Fix tab indentations in apps/ and components/ 2015-09-16 20:45:37 +02:00
android_commandLine.h Remove empty line at the beginning of files 2015-08-18 23:06:12 +02:00
android_main.c android: Update for sdl 2.0.8 2018-03-30 12:44:38 -04:00
CMakeLists.txt Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 2018-06-07 23:23:19 +03:00
crashcatcher.cpp crashcatcher: complain when launching gdb fails 2017-02-23 23:28:49 +01:00
doc.hpp Fixed more spelling mistakes 2016-12-15 13:09:40 +01:00
engine.cpp Merge pull request #370 from TES3MP/0.6.2 2018-01-10 03:51:07 +02:00
engine.hpp Don't increase simulationTime while the game is minimized (Fixes #4211) 2017-11-16 18:48:49 +00:00
main.cpp Merge pull request #376 from TES3MP/0.6.3 while resolving conflicts 2018-01-29 02:57:48 +02:00