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 ac374a8ef9 Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
 	apps/openmw-mp/Player.cpp
	apps/openmw-mp/Script/Functions/Mechanics.cpp
	apps/openmw-mp/Script/Functions/Mechanics.hpp
	apps/openmw-mp/Script/Functions/Quests.cpp
	apps/openmw-mp/Script/Functions/Quests.hpp
	apps/openmw-mp/Script/ScriptFunctions.hpp
	apps/openmw-mp/processors/player/ProcessorRecordDynamic.hpp
	apps/openmw/mwmp/LocalPlayer.hpp
	apps/openmw/mwmp/WorldEvent.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/openmw-mp/Base/BasePlayer.hpp
7 years ago
..
mwbase [General] Track objects directly placed by players in ObjectPlace 7 years ago
mwclass Merge pull request #359 from OpenMW/master while resolving conflicts 7 years ago
mwdialogue Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts 7 years ago
mwgui Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 7 years ago
mwinput Merge pull request #383 from OpenMW/master 7 years ago
mwmechanics Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 7 years ago
mwmp Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 7 years ago
mwphysics overriden -> overridden 7 years ago
mwrender Cap the rain emitter's frame time (Fixes #4314) 7 years ago
mwscript [General] Implement player scale as part of PlayerShapeshift 7 years ago
mwsound Restore exception throwing to the decoder 7 years ago
mwstate Fade screen in on a new game start 8 years ago
mwworld Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 7 years ago
CMakeLists.txt Merge pull request #380 from TES3MP/0.6.3 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: Add callbacks for basic cursor handling. 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