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

632 Commits

Author SHA1 Message Date
auria
96f7be1598 New method WorldWithRank::updateTrack(dt); was used by LinearWorld, but adding it to Overworld was forgotten, causing track objects to not work properly 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14379 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-03 02:28:23 +00:00
auria
6139f6ef77 Improve what happens when you lose FTL. Should now be pretty clear 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14338 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-29 01:20:59 +00:00
hikerstk
b4ce78b339 Fixed compiler warnings. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14256 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-14 21:00:31 +00:00
deveee
c452bf9d97 Tabs into spaces 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14255 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-14 20:25:30 +00:00
yasin-ghannam
1d1b5c20c5 Soccer fixes. Icon fetching and placement. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14251 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-14 13:27:42 +00:00
yasin-ghannam
70ef7966e1 Modified Soccer Mode results screen. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14249 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-14 00:23:20 +00:00
deveee
d7d29dd2b8 Fixed #934. Wait before ready phase if sounds are disabled. 
Jingle is actually sound rather than music. Before change it was disabled in preferences by both - music and sfx.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14199 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-03 13:49:56 +00:00
deveee
dbd36f47dd Little change in previous commit 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14152 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-24 18:04:14 +00:00
deveee
ee61e8f52a Fixed displaying time in race gui and race result - soccer mode 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14151 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-24 17:57:13 +00:00
deveee
ec02f2990b Arrow position should depend on height of the kart rather than position of the hat. 
Not every kart have/should have a hat (puffy?). A lot of add-on karts probably never will have
defined hat offset. Also hats position is now broken a little.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14128 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-22 08:44:42 +00:00
deveee
4c7fdb0ccb Goal text was drawing twice. Leave only global text in race gui. 
Also add possibility to translate it. Previously was added only string from soccer_world.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14121 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-21 17:50:12 +00:00
deveee
1e6425a1cc Reset clock mode when game is restarted. 
This solves problem with missing thunderbird.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14117 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-20 21:38:59 +00:00
deveee
42fd3a2343 Reset position of soccer ball when game is restarted 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14116 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-20 21:25:26 +00:00
deveee
d0be1fc0a2 Convert tabs to spaces 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13681 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-14 19:19:40 +00:00
deveee
07a3c4f3d5 Minor changes in soccer mode 
- scoring points correctly
 - goal text only on the center of screen, not everywhere
 - soccer mode enabled only in multiplayer
 - disable rotating after player confirmation - should look the same as in kart selection
 - restore master-player-only after back to race setup

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13680 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-14 12:08:22 +00:00
deveee
c4f85ccbdb Tutorial cannot be played in reverse mode. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13661 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-11 13:08:54 +00:00
curaga
efe3b59bc5 Rename Time to StkTime, X11 has a type called Time 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13604 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-30 12:24:12 +00:00
curaga
f83a30db47 Some more header cleanup 
Now it only takes 38s to build after touching irr_driver.hpp, vs prev 1m 10s.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13602 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-30 12:13:23 +00:00
curaga
a7b990a49f The soccer files were CRLF. Mark as native. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13601 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-30 12:12:23 +00:00
hikerstk
ebea0a49f9 Merged soccer branch with trunk, fixed (at least some) tabs 
usage.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13543 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-22 03:54:52 +00:00
hikerstk
05c47f83ca Fixed compiler warnings, layout, and removed tabs. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13481 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-15 05:57:48 +00:00
auria
b72f0bf625 A few small tweaks to soccer mode, show message when a goal is made, resize down soccer ball a little 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13452 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-10 00:23:51 +00:00
auria
d3e6569a54 merge soccer branch 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13450 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-09 23:48:13 +00:00
yasin-ghannam
a908f4d3f9 Game ends when goal target is reached. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13344 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-25 01:25:35 +00:00
yasin-ghannam
b53e0c4fe3 Slight modification to score display. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13322 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-22 23:07:45 +00:00
yasin-ghannam
88b6b4b5c4 Kart positions fixed. Karts on the same team appear on the same side. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13318 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-22 17:50:39 +00:00
yasin-ghannam
d314ee2d0d Team indicators added. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13299 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-20 20:34:37 +00:00
yasin-ghannam
a701cccc02 Team Identifiers(Needs adding hatOffsets to kart models) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13178 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-11 01:17:39 +00:00
auria
e546794ad9 Fix GCC build 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13172 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-10 23:36:50 +00:00
yasin-ghannam
d16a5a0552 Team indicators added. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13167 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-10 22:49:51 +00:00
hikerstk
b20cebfee0 Refactored handling of rescue: this removed a lot of 
duplicated code, and also allows non-race mode rescue
positions to be tested in track-debug mode.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13165 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-10 22:47:12 +00:00
yasin-ghannam
c22941d354 Initial Score display. (Using only the first two karts) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13142 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-09 04:26:23 +00:00
auria
af09c253a7 Return to overworld after tutorial if it was started from there 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13085 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-04 23:56:24 +00:00
auria
eecf0b67f6 merge minimal race GUI into normal race GUI. Slight changes but in the same spirit 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13072 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-04 01:38:13 +00:00
hikerstk
4616338fd6 Started to fix rescue problem - more code cleanup will follow later. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13022 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-28 23:45:48 +00:00
curaga
9ddeac772a Likewise for userconfigparams 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12986 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-26 13:32:02 +00:00
curaga
ead8c059cb Remove some unused irr_driver includes 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12985 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-26 13:31:38 +00:00
auria
2f18766b09 As was suggested some time ago, in nitro challenges, replace 'Go' with 'Collect nitro', since not everyone reads the dialog to know what they have to do before launching the challenge ;) and this causes much confusion 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12898 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-20 00:40:03 +00:00
auria
485551aa89 Apply patch by KroArtem to fix minor issues : unused variables and other minor warnings from cppcheck, crash when launching from terminal with AI karts in a mode where AI is not supported 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12857 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-09 20:04:07 +00:00
hikerstk
a529a07c99 Fix #981: karts are sometimes rescued when restarting, or facing the 
wrong direction. Reason was an incorrect rotation in the projection
code. Instead of fixing it, I let the kart fall a little bit, so the
code is now correct, much easier to understand, and the bounce after
a reset fits the game imho.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12852 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-06 23:08:52 +00:00
curaga
5b330aa0e4 On modern hw, you do want to always clear at the start of frame. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12842 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-02 10:34:32 +00:00
curaga
a6a2ec66d4 Make fatal fatal 
Removes a lot of duplicated code.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12827 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-31 14:09:39 +00:00
curaga
57c3cbae3e Space cleanup pass on the headers 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12817 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-30 19:47:39 +00:00
curaga
b56bf4dc53 Remove trailing space, git doesn't like it 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12797 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-29 22:04:35 +00:00
hikerstk
7460418153 Code cleanup: renamed kinetic to 'is_dynamic' in order to follow the categorization of 
different rigid bodies in bullet. Some layout fixes, removed unused or unnecessary
functions and constructors.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12779 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-19 22:02:34 +00:00
hikerstk
7ab65aee16 Fixed #879: avoid too many basket balls at the same time by introducing 
a minimum amount of time (atm 15 seconds) before the next basket ball
can be found. Thanks to nixt for the patch.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12722 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-03 06:48:47 +00:00
hikerstk
3854da8189 Fixed crash in Easter mode when highest AI is selected (#926). 
Thanks to hired777.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12687 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-22 07:09:29 +00:00
hikerstk
9d5c41f4ad Replaced many printf with log (see #937). Thanks to 
unitraxx.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12674 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-19 06:53:17 +00:00
auria
f050eb418a Apply patch by Uni_ to change prints into logging 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12671 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-18 00:45:46 +00:00
auria
1883136948 Apply patch by Yasin to fix remembering last position on overworld, thanks\! 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12670 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-04-18 00:11:35 +00:00