ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,622 Commits 9 Branches 28 Tags 433 MiB
bcd9654a86
Commit Graph

174 Commits

Author SHA1 Message Date
Deve
57ab9e5ac5 Remove saved GPs only in offline mode during starting new race 2015-01-07 21:19:04 +01:00
Deve
2d9e38f7f6 Display continue button only if next track isn't first available in GP. 
Fixed a crash.
 2015-01-07 21:15:53 +01:00
Deve
b726b59427 Remove all saved data for specified GP during start new race. 
Generally it shouldn't happen because the rule is one save per one GP, but it is possible with old config.xml files.
 2015-01-07 18:41:52 +01:00
Deve
cd9bd36520 Don't create new GP save when it's already created 2015-01-07 18:32:32 +01:00
hiker
006a7f95c9 Cherrypicked pull request #1743 (cppcheck performance fixes). 2014-12-01 15:14:27 +11:00
Marianne Gagnon
229a43a692 Preserve "startedFromOverworld" flag value properly. Fixes #1683 2014-11-17 19:07:37 -05:00
Flakebi
9dd86c8332 Don't handicap AIs 2014-11-04 23:57:33 +01:00
Flakebi
46f3fa5f74 Merge branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	data/gui/options_ui.stkgui
	src/graphics/stkmesh.cpp
	src/states_screens/options_screen_ui.cpp
 2014-10-26 17:47:29 +01:00
Flakebi
690e632e1b Move handicap to ui options and to the player name spinner 2014-10-26 16:56:50 +01:00
Deve
321f0e7078 Remove saved GP when we start new race. 
Avoid a crash. Saved GP was deleted, but was not NULL. And in other place we have if(m_saved_gp != NULL) check, which was true for deleted object.
 2014-10-20 23:46:25 +02:00
konstin
4647a50acb Save GP on abort 2014-10-20 23:46:25 +02:00
konstin
f65ad8f84f Save GP reverse Type; close #1137 2014-10-20 23:46:25 +02:00
konstin
035fc599ee fix ordering of the karts and maybe some more 2014-10-20 23:46:25 +02:00
konstin
ae24c6b40f only one saved GP per GP-ident 
Conflicts:
	src/graphics/glwrap.cpp
 2014-10-20 23:46:25 +02:00
Flakebi
57afd1d585 Merge remote-tracking branch 'origin/master' into perPlayerDifficulties, this time the right branch... 
Conflicts:
	data/gui/user_screen.stkgui
	data/gui/user_screen_tab.stkgui
	src/graphics/glwrap.cpp
	src/graphics/weather.cpp
	src/states_screens/user_screen.cpp
 2014-10-20 22:36:54 +02:00
Flakebi
069853b11f Fix #1153 Cleanup logging code 2014-10-07 20:54:54 +02:00
Flakebi
47da30dd24 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-30 19:22:18 +02:00
hiker
dfc3756f5d Fixed compiler warning. 2014-09-27 19:25:45 +10:00
Flakebi
2cf9707294 Merge branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	src/states_screens/kart_selection.cpp
I hope I got everything
 2014-09-24 17:58:12 +02:00
hiker
aa64f31f83 Added Screen::push() function to shorten the calls to pushScreen(). 2014-09-23 16:43:50 +10:00
hiker
c28728d903 Removed more compiler warnings for 64 bit windows compilation. 2014-09-23 16:23:22 +10:00
hiker
ad20635cce Applied patch for #600 (support 64 bit compilation on windows). 2014-09-23 14:41:32 +10:00
Flakebi
5858c05e74 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-05 22:46:17 +02:00
hiker
7dbfc151bf Added random GP functionality into gp_info screen. Changed GPData 
in GPInfoScreen from a pointer to be an object, while this adds
some coping of this object, it removes potential memory leaks.
 2014-09-02 09:32:12 +10:00
Flakebi
e2089fcea6 Switch per player difficulty to player config 2014-09-02 01:18:58 +02:00
Flakebi
dc4a30202f Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-01 11:31:26 +02:00
Flakebi
a84094e55e Add difficulty to karts 2014-07-29 22:54:42 +02:00
Flakebi
71f8766cb1 Add per-player difficulty 2014-07-28 18:32:39 +02:00
konstin
eae71b3df9 remove C++11 2014-07-24 08:41:45 +02:00
konstin
7978c25fc5 more improvements 2014-07-23 21:49:53 +02:00
konstin
02d21053fc begining with grand_prix_cutscene.cpp (first compiling prototype) 2014-07-23 15:28:57 +02:00
hiker
32707b8f88 Changed m_grand_prix of RaceManager to be an object (and not a pointer to 
an object) anymore, which fixes a memory leak (and I also reverted my quick
fix from last night de7ceb0c2d to fix a crash,
which now not necessary anymore.
 2014-07-08 13:20:53 +10:00
hiker
de7ceb0c2d Quick fix to avoid crash at end of race, full fix to follow later ;) 2014-07-07 23:31:43 +10:00
konstin
b7b116634d solving merge conflicts with upstream 2014-05-31 15:28:52 +02:00
hiker
b18d7e75ac Rewrote insertionSort to only require operator< (no >), 
and removed the unnecessary operators.
 2014-05-28 21:41:07 +10:00
konstin
0fdfe16a93 first try for a Random GP generator 2014-05-18 15:27:57 +02:00
Marianne Gagnon
4ff8b813fa Create RTTs only when loading a track 2014-05-16 19:30:39 -04:00
Marianne Gagnon
5acb763ac8 Work on cutscenes 2014-05-04 18:54:37 -04:00
Marianne Gagnon
bee4dcf36c Work on new GPWin screen. Seems to work well now 2014-05-03 20:21:34 -04:00
Marc Coll Carrillo
82cc7af4f6 Avoid the use of the new GP editor as a cheating aid 2014-04-13 21:34:28 +02:00
hiker
43593d6312 Made getCurrentUser() a static function. 2014-04-08 08:06:52 +10:00
konstin
7cc83e1475 running whitespaces.py update 1 2014-03-29 11:33:43 +01:00
konstin
663fffdebb Revert "Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces" 
This reverts commit 65e2dcf2f0.
 2014-03-29 11:32:04 +01:00
konstin
65e2dcf2f0 Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces 2014-03-28 20:08:39 +01:00
hiker
1ccac0db7c Fix #1232 (GP causes crash). 2014-03-07 16:04:10 +11:00
hiker
8b7754cd4f Merge remote-tracking branch 'upstream/master' into new_login 
Conflicts:
	src/challenges/game_slot.cpp
	src/states_screens/kart_selection.cpp
	src/tracks/track.cpp
 2014-02-10 21:37:04 +11:00
hiker
97be85777d Started to move current player info from unlock manager into 
player_manager.
 2014-02-09 23:22:45 +11:00
KroArtem
8a731691fd more coverity fixes, get rid of printf 2014-02-01 03:54:34 +04:00
deveee
ae2a41f2d0 Fixed problem with karts which were assigned to wrong team in soccer mode. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14740 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-20 00:29:37 +00:00
deveee
ec13bcf802 Merge branch 'hilnius' 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14638 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-05 17:28:55 +00:00