You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
openmw-tes3coop/apps/openmw
David Cernat 8b482e19ec Merge pull request #453 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/Script/Functions/Objects.cpp
	apps/openmw-mp/Script/Functions/Objects.hpp
	apps/openmw-mp/Script/Functions/Worldstate.cpp
	apps/openmw-mp/Script/Functions/Worldstate.hpp
7 years ago
..
mwbase Merge pull request #447 from OpenMW/master while resolving conflicts 7 years ago
mwclass [General] Implement WorldCollisionOverride packet 7 years ago
mwdialogue Merge pull request #389 from OpenMW/master 7 years ago
mwgui Merge pull request #451 from TES3MP/0.6.3 while resolving conflicts 7 years ago
mwinput Merge pull request #400 from OpenMW/master while resolving conflicts 7 years ago
mwmechanics Merge pull request #448 from TES3MP/0.6.3 7 years ago
mwmp Merge pull request #453 from TES3MP/0.6.3 while resolving conflicts 7 years ago
mwphysics Merge pull request #440 from OpenMW/master 7 years ago
mwrender [Client] Enforce the default global map cell size in multiplayer 7 years ago
mwscript Merge pull request #447 from OpenMW/master while resolving conflicts 7 years ago
mwsound Merge pull request #1708 from akortunov/refidfix 7 years ago
mwstate Revert "Merge pull request #1701 from akortunov/standfix" 7 years ago
mwworld Merge pull request #451 from TES3MP/0.6.3 while resolving conflicts 7 years ago
CMakeLists.txt Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 7 years ago
android_commandLine.cpp
android_commandLine.h
android_main.c android: Update for sdl 2.0.8 7 years ago
crashcatcher.cpp crashcatcher: complain when launching gdb fails 8 years ago
doc.hpp Fixed more spelling mistakes 8 years ago
engine.cpp Merge pull request #370 from TES3MP/0.6.2 7 years ago
engine.hpp Don't increase simulationTime while the game is minimized (Fixes #4211) 7 years ago
main.cpp Merge pull request #376 from TES3MP/0.6.3 while resolving conflicts 7 years ago