stk-code_catmod/src
hiker 3d5fbaa92f Merge branch 'master' of https://github.com/gupascal/stk-code into gupascal-master
Fixed some merging issues.
Conflicts:
	data/achievements.xml
	src/achievements/achievement_info.hpp
2014-03-18 10:44:11 +11:00
..
achievements Merge branch 'master' of https://github.com/gupascal/stk-code into gupascal-master 2014-03-18 10:44:11 +11:00
addons Removed unnecessary #include of user_config.hpp in other hpp files 2014-02-26 12:52:16 +11:00
animations Fixed typo. 2014-03-03 09:17:45 +11:00
audio Fixed music starting in menu, also corrected using the startRightNow parameter in MusicManager::startMusic() 2014-01-16 19:13:23 -08:00
challenges Post-merge tidying up 2014-03-06 19:19:39 -05:00
config Bugfix: onRaceEnd was not called for achievements (resulting in 2014-03-12 22:40:43 +11:00
graphics Fix terminal warning flood, and improve error detection. Thanks to vlj for help 2014-03-15 14:39:27 -04:00
guiengine Merge pull request #1236 from divvy81/downstream 2014-03-08 19:11:14 -05:00
input Removed unnecessary #include of user_config.hpp in other hpp files 2014-02-26 12:52:16 +11:00
io Fxed support for searching for data and assets based on the executable location. 2014-03-07 07:53:35 +11:00
items Changed lower and upper bound (at lower speed less speed should be 2014-02-28 23:57:49 +11:00
karts Revert "Now IA don't fire a cake if the kart is driving too slow. Also correct some comments." 2014-03-17 08:10:21 +01:00
modes Clean up some minor coding style issues 2014-03-17 08:21:49 +01:00
network Renamed Profile to OnlineProfile to better distinguish the various profiles we use. 2014-03-07 11:02:07 +11:00
online Fixed crash in UserInfoDialog if an invalid response is received (friend id 2014-03-15 11:54:04 +11:00
physics Added support for different types of achievement checking: besides 2014-02-25 17:20:24 +11:00
race Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-07 16:05:17 +11:00
replay Start to support 'externa' data directories. Most directories 2013-12-17 23:48:47 +00:00
states_screens Fixed potential crash if RelationInfo should not exist, which I saw 2014-03-18 07:48:52 +11:00
tinygettext Change pt-BR name to be more accurate 2013-12-28 02:09:08 +00:00
tracks Bring back minimap. 2014-03-15 20:05:04 +01:00
utils Remove passwords and tokens from Log:: output. 2014-03-05 10:34:28 +11:00
windows_installer Merged with trunk, part 1 (due to previous failures I am splitting this 2013-12-02 04:27:55 +00: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 Minor profiler updates 2014-01-24 19:13:53 -05:00
main_loop.hpp Improve profiler a bit 2014-01-24 18:38:47 -05:00
main.cpp Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-07 16:05:17 +11:00