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 a037193e79 Merge pull request #372 from TES3MP/0.6.2 while resolving conflicts 
Conflicts:
	apps/openmw-mp/Script/Functions/Actors.cpp
	apps/openmw-mp/Script/Functions/Actors.hpp
	apps/openmw-mp/Script/Functions/Items.cpp
	apps/openmw-mp/Script/Functions/Items.hpp
	apps/openmw-mp/Script/Functions/World.cpp
	apps/openmw-mp/Script/Functions/World.hpp
	apps/openmw/mwmp/WorldEvent.cpp
	components/openmw-mp/Packets/Player/PacketPlayerEquipment.cpp
	components/openmw-mp/Version.hpp
2018-01-18 13:40:13 +02:00
..
mwbase [Client] Use new code to set the console's Ptrs from server scripts 2017-12-26 15:04:28 +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 #372 from TES3MP/0.6.2 while resolving conflicts 2018-01-18 13:40:13 +02:00
mwinput Merge pull request #369 from OpenMW/master 2018-01-10 03:49:53 +02:00
mwmechanics Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try 2018-01-05 21:24:14 +02:00
mwmp Merge pull request #372 from TES3MP/0.6.2 while resolving conflicts 2018-01-18 13:40:13 +02:00
mwphysics overriden -> overridden 2018-01-02 11:42:08 +01:00
mwrender Use the correct priority of animation sources in getStartTime (Fixes #4263) 2017-12-21 14:49:09 +00:00
mwscript Merge pull request #361 from OpenMW/master while resolving conflicts 2017-12-25 07:37:54 +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 #370 from TES3MP/0.6.2 2018-01-10 03:51:07 +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 enable opengl es1 2015-12-02 22:40:04 +03:00
CMakeLists.txt Merge pull request #370 from TES3MP/0.6.2 2018-01-10 03:51:07 +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 [General] Move getFilenameTimestamp() to Utils 2017-11-07 05:33:10 +08:00