mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 19:19:56 +00:00
Code Issues Releases Wiki Activity
openmw-tes3mp/apps/openmw
History
David Cernat 6cb5ac6e63 Merge pull request #457 from OpenMW/master while resolving conflicts 
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/main.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwmechanics/character.cpp
	components/CMakeLists.txt
2018-07-14 03:57:05 +03:00
..
mwbase Merge pull request #457 from OpenMW/master while resolving conflicts 2018-07-14 03:57:05 +03:00
mwclass Merge pull request #457 from OpenMW/master while resolving conflicts 2018-07-14 03:57:05 +03:00
mwdialogue Merge pull request #456 from OpenMW/master while resolving conflicts 2018-07-04 01:52:29 +03:00
mwgui Merge pull request #457 from OpenMW/master while resolving conflicts 2018-07-14 03:57:05 +03:00
mwinput Merge pull request #456 from OpenMW/master while resolving conflicts 2018-07-04 01:52:29 +03:00
mwmechanics Merge pull request #457 from OpenMW/master while resolving conflicts 2018-07-14 03:57:05 +03:00
mwmp [Client] Simplify sending of ActorAI packets for uninitialized actors 2018-07-14 01:00:27 +03:00
mwphysics Merge pull request #456 from OpenMW/master while resolving conflicts 2018-07-04 01:52:29 +03:00
mwrender [Client] Avoid sending map tiles for Wilderness cells 2018-07-06 03:54:34 +03:00
mwscript Merge pull request #457 from OpenMW/master while resolving conflicts 2018-07-14 03:57:05 +03:00
mwsound Initialize some missing fields in constructors 2018-06-25 09:35:42 +04:00
mwstate Revert "Merge pull request #1701 from akortunov/standfix" 2018-05-26 11:35:48 +00:00
mwworld Merge pull request #457 from OpenMW/master while resolving conflicts 2018-07-14 03:57:05 +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 #457 from OpenMW/master while resolving conflicts 2018-07-14 03:57:05 +03:00
doc.hpp Fixed more spelling mistakes 2016-12-15 13:09:40 +01:00
engine.cpp Merge pull request #457 from OpenMW/master while resolving conflicts 2018-07-14 03:57:05 +03:00
engine.hpp Merge branch 'master' into screenshot360 2018-02-25 11:25:19 +01:00
main.cpp Merge pull request #457 from OpenMW/master while resolving conflicts 2018-07-14 03:57:05 +03:00