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

299 Commits

Author SHA1 Message Date
Flakebi
5858c05e74 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-05 22:46:17 +02:00
hiker
709583ead5 Removed Random GP dialog. 2014-09-03 17:01:36 +10:00
hiker
0a0609d91f Added GrandPrixData::isRandomGP. 2014-09-03 08:24:11 +10:00
hiker
ae01eaf595 Use track->isRaceTrack(). 2014-09-03 08:16:52 +10:00
hiker
ccdc90f029 Removed while loop with a 'random' abort condition - while it works 
it could result in STK hanging if a broken random generator should be
used.
 2014-09-03 08:08:41 +10:00
hiker
c8724632e8 Bugfix: only allow races (i.e. no arenas, or cut scenes) in an 
'all tracks' random GP.
 2014-09-02 16:40:26 +10:00
Flakebi
a31ec772ff Replace accidently placed tabs 2014-09-02 03:57:48 +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
hiker
76767141f7 Removed old track info dialog, fixed crashes in track info screen 
(caused when making some spinners etc. visible).
 2014-08-25 22:20:42 +10:00
konstin
a2d76dd098 Merge branch 'master' of https://github.com/supertuxkart/stk-code into save_gp 2014-07-31 10:57:11 +02:00
hiker
a81f21a27a Applied konstin's bugfix for an editor crash. 2014-07-31 09:28:42 +10:00
konstin
e7d3ab4be2 fix compilation 2014-07-30 16:17:40 +02:00
konstin
5a43fecdd0 Merge branch 'master' of https://github.com/supertuxkart/stk-code into save_gp 2014-07-30 13:59:41 +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
hiker
fbf5bf4166 Changed default number of laps to be 3 (and not the number of laps 
used last time), which seems to be a better default. Some minor
cosmetic changes.
 2014-07-24 17:43:11 +10:00
hiker
9267e2d304 Merge branch 'lapnumber' of https://github.com/konstin/stk-code into konstin-lapnumber 2014-07-24 16:48:03 +10:00
konstin
eae71b3df9 remove C++11 2014-07-24 08:41:45 +02:00
konstin
eb5e148aa7 resolve conflict 2014-07-23 21:52:53 +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
Flakebi
4fe34007cd Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-07-23 15:18:46 +02:00
Flakebi
0195d95bad Adding basic gui for per-player difficulties 2014-07-23 15:18:40 +02:00
Flakebi
55090a0566 Unify log output 2014-07-22 12:54:11 +02:00
konstin
ea56f66d83 Revert "unify separators" 
This reverts commit ad641eff67.
 2014-07-16 15:46:52 +02:00
konstin
0ec2cd6dc1 Merge branch 'master' of https://github.com/supertuxkart/stk-code into asdf 2014-07-16 15:16:11 +02:00
hiker
649848cac2 Mostly cosmetic changes (renamed variables, added comments). Changed 
'random' constructor of GrandPrixData into a function so that there
is no need to create a new GPData objects and then copy it.
 2014-07-16 08:11:09 +10:00
konstin
ad641eff67 unify separators 2014-07-15 17:15:42 +02:00
konstin
a7c6eb3853 close #1263 2014-07-15 15:57:33 +02:00
konstin
02f2488502 add default_number_of_laps 2014-07-15 15:46:17 +02:00
hiker
ab57903f9f Try to convert m_gp from a GPData pointer to a GP object, compiles, but 
crashes.
 2014-07-14 23:08:46 +10:00
hiker
f24a000f78 Merge branch 'm_random_gp' of https://github.com/konstin/stk-code into konstin-m_random_gp 2014-07-14 14:54:59 +10:00
konstin
eb0120fb77 fix #1395 2014-07-08 18:37:02 +02:00
konstin
240f0ec6b7 remove m_random_gp 2014-07-08 18:34:54 +02:00
konstin
8cac64f39f check if reverse is available; fix #1396 2014-07-08 16:47:56 +02:00
hiker
7ec2bae8e7 Minor style changes. 2014-07-08 14:41:59 +10: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
hiker
cab0b2d833 Fixed compiler warning. 2014-07-07 16:53:42 +10:00
konstin
3679bf4617 adding a comment; fix #930 2014-06-05 18:59:16 +02:00
konstin
ce661a4dd4 add a reverse spinner 2014-06-02 16:56:59 +02:00
konstin
03768db82a avoid duplicate tracks 2014-05-31 22:32:55 +02:00
konstin
6521e3d496 fix crash due to a dangling pointer 2014-05-31 17:28:20 +02:00
konstin
b7b116634d solving merge conflicts with upstream 2014-05-31 15:28:52 +02:00
konstin
2534abeed2 trying to merge upstream 2014-05-31 15:11:05 +02:00
konstin
02677b38c2 Refactoring, renaming and cleaning-up 2014-05-30 20:26:44 +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
feeab733e4 more intellegent track adding and removing 2014-05-27 20:49:02 +02:00