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 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
2018-02-12 06:50:52 +02:00
..
mwbase [General] Track objects directly placed by players in ObjectPlace 2018-01-28 17:46:51 +02:00
mwclass Merge pull request #359 from OpenMW/master while resolving conflicts 2017-12-25 02:03:02 +02:00
mwdialogue Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts 2017-12-25 02:25:01 +02:00
mwgui Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 2018-02-12 06:50:52 +02:00
mwinput Merge pull request #383 from OpenMW/master 2018-02-11 06:57:54 +02:00
mwmechanics Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 2018-02-12 06:50:52 +02:00
mwmp Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 2018-02-12 06:50:52 +02:00
mwphysics overriden -> overridden 2018-01-02 11:42:08 +01:00
mwrender Cap the rain emitter's frame time (Fixes #4314) 2018-02-10 23:14:41 +00:00
mwscript [General] Implement player scale as part of PlayerShapeshift 2018-02-01 02:11:45 +02:00
mwsound Restore exception throwing to the decoder 2017-12-09 11:00:56 -08:00
mwstate Fade screen in on a new game start 2017-07-23 11:04:58 +04:00
mwworld Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 2018-02-12 06:50:52 +02: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: Add callbacks for basic cursor handling. 2018-01-18 21:18:31 -05:00
CMakeLists.txt Merge pull request #380 from TES3MP/0.6.3 2018-01-30 16:05:24 +02: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