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 e355dca4dd Merge pull request #409 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/CMakeLists.txt
	apps/openmw-mp/Script/Functions/GUI.cpp
	apps/openmw-mp/Script/Functions/GUI.hpp
	apps/openmw-mp/Script/Functions/Items.hpp
	apps/openmw-mp/Script/Functions/Mechanics.cpp
	apps/openmw-mp/Script/Functions/Mechanics.hpp
	apps/openmw-mp/Script/Functions/Stats.cpp
	apps/openmw-mp/Script/Functions/Stats.hpp
	apps/openmw-mp/Script/ScriptFunctions.cpp
	apps/openmw-mp/Script/ScriptFunctions.hpp
7 years ago
..
mwbase Merge pull request #400 from OpenMW/master while resolving conflicts 7 years ago
mwclass [General] Add sync for ranged weapon & projectile strike enchantments 7 years ago
mwdialogue Merge pull request #389 from OpenMW/master 7 years ago
mwgui Merge pull request #409 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 #409 from TES3MP/0.6.3 while resolving conflicts 7 years ago
mwmp Merge pull request #409 from TES3MP/0.6.3 while resolving conflicts 7 years ago
mwphysics Merge pull request #395 from OpenMW/master while resolving conflicts 7 years ago
mwrender Merge pull request #1473 7 years ago
mwscript Merge pull request #408 from OpenMW/master 7 years ago
mwsound http to https for supported urls (#1625) 7 years ago
mwstate [Fix] Some PVS-Studio and cppcheck fixes 7 years ago
mwworld Merge pull request #409 from TES3MP/0.6.3 while resolving conflicts 7 years ago
CMakeLists.txt Merge pull request #406 from TES3MP/0.6.3 while resolving conflicts 7 years ago
android_commandLine.cpp Fix tab indentations in apps/ and components/ 9 years ago
android_commandLine.h Remove empty line at the beginning of files 10 years ago
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