stk-code_catmod/src
Marianne Gagnon 139f20b39d Merge remote-tracking branch 'sachith/ScriptEngine'
Conflicts:
	CMakeLists.txt
	sources.cmake
	src/io/file_manager.cpp
	src/io/file_manager.hpp
	src/modes/world.hpp
	src/tracks/track.hpp
	src/tracks/track_object_presentation.cpp
2014-10-27 18:43:09 -04:00
..
achievements Removed unused files. 2014-10-24 10:22:27 +11:00
addons Fix $1569 (allow adjusting of polling interval from server via news.xml 2014-09-25 17:04:36 +10:00
animations changed back to working version 2014-08-14 15:57:25 +05:30
audio Fix #1631 (SFX can not be enabled in in-race game menu). 2014-10-22 17:16:39 +11:00
challenges Turn sfx_manager into a singleton. 2014-09-17 21:38:21 +10:00
config Replaced irrXML usage with out XMLNode. 2014-10-24 21:47:50 +11:00
graphics Add debug name to meshes and mesh buffers, helps debugging 2014-10-24 19:25:24 -04:00
guiengine Add debug name to meshes and mesh buffers, helps debugging 2014-10-24 19:25:24 -04:00
input Replaced irrXML usage with out XMLNode. 2014-10-24 21:47:50 +11:00
io Merge remote-tracking branch 'sachith/ScriptEngine' 2014-10-27 18:43:09 -04:00
items Add debug name to meshes and mesh buffers, helps debugging 2014-10-24 19:25:24 -04:00
karts Add debug name to meshes and mesh buffers, helps debugging 2014-10-24 19:25:24 -04:00
modes Merge remote-tracking branch 'sachith/ScriptEngine' 2014-10-27 18:43:09 -04:00
network Merge pull request #1606 from Flakebi/fix 2014-10-08 18:18:37 -04:00
online Removed unused files. 2014-10-24 10:22:27 +11:00
physics Merge remote-tracking branch 'sachith/ScriptEngine' 2014-10-27 18:43:09 -04:00
race Remove saved GP when we start new race. 2014-10-20 23:46:25 +02:00
replay Unify log output 2014-07-22 12:54:11 +02:00
scriptengine Merge remote-tracking branch 'sachith/ScriptEngine' 2014-10-27 18:43:09 -04:00
states_screens Add debug name to meshes and mesh buffers, helps debugging 2014-10-24 19:25:24 -04:00
tinygettext Applied patch for #600 (support 64 bit compilation on windows). 2014-09-23 14:41:32 +10:00
tracks Merge remote-tracking branch 'sachith/ScriptEngine' 2014-10-27 18:43:09 -04:00
utils Use template defined SetTexture argument sets instead of vector 2014-10-22 21:51:11 +02:00
windows_installer Add icon to exe file as resource. 2014-08-21 21:38:59 +02:00
Doxyfile Merged with trunk, part 1 (due to previous failures I am splitting this 2013-12-02 04:27:55 +00:00
Doxyfile_Win Merged with trunk, part 1 (due to previous failures I am splitting this 2013-12-02 04:27:55 +00:00
main_loop.cpp Moved sfx thread update to happen after graphics code is finished. 2014-10-16 17:11:15 +11:00
main_loop.hpp Improve profiler a bit 2014-01-24 18:38:47 -05:00
main.cpp Added Yes/No dialog box, and used it for the 'allow STK to connect 2014-10-22 09:15:42 +11:00