1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 22:23:50 +00:00
openmw-tes3mp/apps/openmw
David Cernat f50637bdd4 Merge pull request #401 from TES3MP/0.6.3 while resolving conflicts
# Conflicts:
#	apps/openmw-mp/processors/world/ProcessorContainer.hpp
#	apps/openmw/mwmp/WorldEvent.cpp
2018-04-03 02:17:12 +03:00
..
mwbase Merge pull request #400 from OpenMW/master while resolving conflicts 2018-04-03 01:25:17 +03:00
mwclass [Client] Make it possible to check whether a class has a ContainerStore 2018-04-01 09:33:07 +03:00
mwdialogue Merge pull request #389 from OpenMW/master 2018-02-25 22:05:32 +02:00
mwgui Merge pull request #399 from TES3MP/0.6.3 while resolving conflicts 2018-04-01 11:34:04 +03:00
mwinput Merge pull request #400 from OpenMW/master while resolving conflicts 2018-04-03 01:25:17 +03:00
mwmechanics Merge pull request #401 from TES3MP/0.6.3 while resolving conflicts 2018-04-03 02:17:12 +03:00
mwmp Merge pull request #401 from TES3MP/0.6.3 while resolving conflicts 2018-04-03 02:17:12 +03:00
mwphysics Merge pull request #395 from OpenMW/master while resolving conflicts 2018-03-29 07:28:30 +03:00
mwrender remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb 2018-03-27 20:20:40 +02:00
mwscript Merge pull request #393 from OpenMW/master 2018-03-10 18:37:51 +02:00
mwsound http to https for supported urls (#1625) 2018-03-08 21:23:24 +01:00
mwstate Remove numeric quicksave slot IDs 2018-02-13 21:01:15 -05:00
mwworld Merge pull request #401 from TES3MP/0.6.3 while resolving conflicts 2018-04-03 02:17:12 +03:00
android_commandLine.cpp Fix tab indentations in apps/ and components/ 2015-09-16 20:45:37 +02:00
android_commandLine.h
android_main.c android: Update for sdl 2.0.8 2018-03-30 12:44:38 -04:00
CMakeLists.txt Merge pull request #394 from TES3MP/0.6.3 while resolving conflicts 2018-03-10 20:03:03 +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