AnyOldName3 759e6fb804 Merge remote-tracking branch 'refs/remotes/upstream/master'		2018-05-27 15:41:42 +01:00
..
mwbase	Revert "Merged pull request #1573"	2018-05-26 11:39:30 +00:00
mwclass	Merged pull request #4413	2018-05-23 13:45:35 +02:00
mwdialogue	Only display "new journal entry" message in dialogue if there *is* a new entry	2018-02-18 16:01:50 +03:00
mwgui	Capitalize enchanted items names again in spells window	2018-05-24 13:03:47 +04:00
mwinput	Don't move the player if opposite direction keys are held down at the same time (Fixes #4233)	2018-03-25 12:20:48 +03:00
mwmechanics	Revert "Merged pull request #1573"	2018-05-26 11:39:30 +00:00
mwphysics	Revert "Merge pull request #1701 from akortunov/standfix"	2018-05-26 11:35:48 +00:00
mwrender	Revert "Merged pull request #1573"	2018-05-26 11:39:30 +00:00
mwscript	Revert "Merged pull request #1573"	2018-05-26 11:39:30 +00:00
mwsound	Merge pull request #1708 from akortunov/refidfix	2018-05-16 15:59:31 +02:00
mwstate	Revert "Merge pull request #1701 from akortunov/standfix"	2018-05-26 11:35:48 +00:00
mwworld	Revert "Merged pull request #1573"	2018-05-26 11:39:30 +00:00
android_commandLine.cpp
android_commandLine.h
android_main.c	android: Update for sdl 2.0.8	2018-03-30 12:44:38 -04:00
CMakeLists.txt	Merge upstream.	2018-05-11 19:15:04 +01:00
crashcatcher.cpp
doc.hpp
engine.cpp	Revert "Merge pull request #1595"	2018-01-09 13:47:57 +00:00
engine.hpp	Don't increase simulationTime while the game is minimized (Fixes #4211)	2017-11-16 18:48:49 +00:00
main.cpp	Update android port.	2018-01-16 00:11:27 -05:00