Commit Graph

267 Commits

Author SHA1 Message Date
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
hikerstk
bced8cdb9f Merged with trunk, part 1 (due to previous failures I am splitting this
patch).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14605 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 04:27:55 +00:00
hilnius
5f4270acc6 adding some comments and fixing the kart selection screen bug
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13688 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-15 09:45:22 +00:00
hilnius
e3261775e3 forgottent commit on former computer
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13531 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-21 13:54:50 +00:00
hilnius
057c8f46be adding things in order to be able to leave the world at the end of a network race
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13397 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 01:03:07 +00:00
hilnius
ea2b52a663 merging hilnius's branch
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13394 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-31 18:03:11 +00:00
unitraxx
8656a12d12 Undoing last commit which was not what I wanted after all.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13391 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-30 22:05:06 +00:00
unitraxx
75e286932f An attempt to merge with hilnius' branch
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13390 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-30 21:39:27 +00:00
hilnius
66b4724a76 fix a bug that appeared when starting a normal race
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13317 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-22 09:38:04 +00:00
hilnius
75e75c43ee adding a workaround to be able to start a network client from a server (with --no-graphics option)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13262 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-16 22:27:28 +00:00
hilnius
9e712c87b7 finally when a game starts online the online player karts are set-up successfully
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13258 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-16 12:50:59 +00:00
hilnius
0625379706 slight modification in the synchronization protocol to handle correctly multiple clients on the server (token management was not working).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13257 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 23:28:20 +00:00
hilnius
ec65fb96aa synchronization protocol double/int conversion error fix
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13251 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 15:44:21 +00:00
hilnius
83d64e6fc2 adding log
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13247 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 14:50:28 +00:00
hilnius
13aa1d52c8 fix a blocking infinite while
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13243 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 13:44:17 +00:00
hilnius
12107053c0 adding log to better understand what is happening
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13236 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 12:51:02 +00:00
hilnius
b36e089ff9 can now start a game after a server requested it. synchronization does not work for now
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13233 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 12:27:32 +00:00
hilnius
4bde8a9337 adding a countdown feature to the synchronization protocol
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13230 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 11:10:51 +00:00
hilnius
c50a24a25d adding a protocol to start a game, added features in the synchronization protocol
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13215 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 21:19:22 +00:00
hilnius
ed6e4ebfb4 correcting the ai kart bug due to the former networking removal
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13088 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-05 12:01:29 +00:00
hilnius
253a3ec1e8 cleaning destructors, using log:: instead of printf or std::cout, cleaning more paths, removed useless fnctions
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13076 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 16:59:30 +00:00
hilnius
613e97d0d6 breaking everything that was working. cannot even start a race now, need to rewrite the network manager and part of the race startup sequence
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13032 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-29 22:57:18 +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
unitraxx
ad3bf48b0d Small change to the checking of a saved GP. (First commit, don't shoot me if I did anything wrong.)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12788 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-26 00:31:22 +00:00
hikerstk
b3e7a7ebbf Applied Unitraxx's patch to save GP. At this stage no GUI support
was added.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12782 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-24 23:38:26 +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
hikerstk
a693eb7eb5 Added reverse-sorting of addons (#916). Thanks to ingridmorstrad for the patch.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12673 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-18 22:44:18 +00:00
hikerstk
9a9ff77812 iAdded new 'best' AI difficulty. ATM this is not locked yet, and
art work (icon) is still missing. Also we have to find what
to call it (atm 'Iron Man').


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12637 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-11 06:17:46 +00:00
hikerstk
820ebd2673 Refactoring: removed code duplication in some init() and restartRace()
functions of game modes (caused by restartRace only called in case of
a restart, not the first time a race is started). The function restartRace()
was renamed to reset(), which is now called always before a race is started
or restarted.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12591 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-03 06:05:34 +00:00
funto66
07c74c41b5 Merge soccer mode back into trunk - but still WIP, can be disabled via a #define in race_setup_screen.cpp
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12475 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-11 22:30:50 +00:00
funto66
6fa3ae7642 Some work on soccer setup screen + cleanup
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12423 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-26 12:54:31 +00:00
auria
996c563f9c First version of tutorial. Far from finished but you can take a quick look if you wish; the text is currently at the bottom
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12350 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-14 00:35:44 +00:00
funto66
5fedffcb75 Fix soccer mode crash
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12297 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-21 21:26:53 +00:00
hikerstk
29be45b198 Added preliminary easter-egg mode. It still needs a icon (battle mode
used atm), and a better easter egg model (atm bunny from snow mountain,
... whith turns out has lost the black nose). One track has easter eggs
added (math class).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12281 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-17 00:33:47 +00:00
hikerstk
6ebf8b6565 Added Fort Magma to last Grand Prix once the game
is completely unlocked (before only 4 tracks will
be in the last GP).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12095 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-11-27 12:09:16 +00:00
hikerstk
7d33125f54 Mostly cosmetic change: renamed RD_EASY etc to
DIFFICULTY_EASY to make it easier to understand;and
removed separate DIFFICULTY_COUNT constant and
replaced it with an entry in the enum (this means
one less change if a difficulty is added). 
Changed layout to be closer to our style in race_manager.hpp.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11733 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-10-21 23:06:33 +00:00
auria
bfc1a5e14c Give nolok some special powers in the last fight against him. Changing the swatter and bubble gum to different models might help make it more dramatic of course
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11538 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-09-04 00:39:14 +00:00
hikerstk
35c7cf0848 Added first version of item avoidance to the AI.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11537 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-09-03 22:49:30 +00:00
auria
20382c0f15 Allow a challenge to specify which AI kart to use, and use it for the final race against Nolok challenge
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11536 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-09-03 20:18:48 +00:00
wardje
0efce01b24 Fix bug #655 (crash when going into story mode)
Make sure the list of AI karts gets cleared by making sure
that computeRandomKartList gets executed.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11342 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-06-28 04:00:40 +00:00
auria
dae00f0828 Add first version on intro cutscene. Still incomplete but goes somewhere :) Ask me for the menu patch if you want to look at it
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11276 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-06-05 00:27:34 +00:00
auria
553385fe9d Start work to allow showing worlds without kart, for cutscenes. Does not work yet but getting closer
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11266 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-31 01:32:27 +00:00
hikerstk
5963f31079 Removed physics.hpp #include from world.hpp.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11213 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-08 07:07:15 +00:00
hikerstk
c15528f903 First version of demo mode. Use --demo-mode T to start
a demo after T seconds of idle time, --demo-tracks a,b,c
to specify a list of tracks to use for demo mode, --demo-karts
to specify the number of karts.
This is WIP, esp. it crashes if ESC is pressed during a race
(other keys will successfully return to main menu).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11189 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-07 00:10:33 +00:00
auria
b83202439c When returning to overworld, bring back player to approximately where they were upon leaving
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11067 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-01 17:17:36 +00:00
auria
6f58350098 Return to overworld when exiting a race if race was started from overworld
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11065 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-01 15:42:44 +00:00
wardje
cb890d4f32 Add reverse track functionality for GPs.
Fixes part of #503 (and #599 completely).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11019 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-03-25 22:15:20 +00:00
wardje
a40462594c GP start order option to user's config + add option to have players always last
In light of #28, the GP start order option is probably more at home in a user's
configuration. While at it, also add an option to keep the player always last.
This is more of a challenge for the player than just reverse mode since your
direct opponents _will_ be at the forefront while you have to play catch up.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11017 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-03-25 16:39:32 +00:00
hikerstk
ebbc1a71d8 Introduced an 'abstract kart' class, which is used to
de-couple kart implementation and its interface. This
significantly reduces compile time when changing kart.hpp,
but is at this stage still work in progress.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10997 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-03-19 20:21:11 +00:00
hikerstk
629f9a27e2 Removed dependencies on controller.hpp from kart.hpp (to
reduce compile time on controller changes).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10952 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-03-08 22:56:33 +00:00
hikerstk
579715a8d8 Merged trunk with this branch. ATM the track screenshot does not work -
I am going to fix this next.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/reverse_mode@10862 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-16 04:57:49 +00:00
auria
da25bc6105 Fix entering garage in a cleaner way
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10817 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-07 01:25:56 +00:00
hikerstk
59c5537fe5 Fixed crash in case of using -N without --reverse on the command line.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/reverse_mode@10812 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-06 21:12:10 +00:00
hikerstk
648eb17e0a Added command line option for reversing tracks.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/reverse_mode@10808 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-05 20:56:45 +00:00
hikerstk
a993cebca0 Applied first part of MCMic's patch to allow driving a track in reverse.
It adds a flag to the track.xml files, a (currently unnamed) checkbox
in the track selection screen, but doesn't do any actualy reversing (see
forum http://forum.freegamedev.net/viewtopic.php?f=18&t=2661 for
details).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/reverse_mode@10767 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-30 23:35:46 +00:00
hikerstk
87865b7dec Removed unnecessary include of kart.hpp from world.hpp.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10572 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-04 05:32:19 +00:00
auria
92b077a250 Create new world type for overworld for customized behavior. Hide overworld in track seelciton screen. Launch overworld when clicking on story mode button.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10443 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-19 02:26:07 +00:00
hikerstk
f33cdb2d17 Final fix for #528 (see also r10404): don't test
for locked karts when using --ai.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10405 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-12 03:49:33 +00:00
auria
92eb0ebd2a Ran a small bash script to remove all of those annoying strings. The only thing they gave us were the need to rebuild after committing
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10363 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-06 18:43:36 +00:00
auria
0455efd20d Massive refactor in challenge code to allow having more than 1 progression
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10349 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-05 22:00:42 +00:00
auria
5b3b087a03 Fixed compilation with GCC
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9382 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-29 01:40:46 +00:00
hikerstk
83680f4637 Added --ai=a,b,... command line option to allow specification
of which AI karts to use.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9381 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-28 22:56:49 +00:00
auria
d8815794b9 Fixed a lot of old logging code left from before the log level was a bit mask. We don't have too many log bits so atm they are classified a lot in 'misc'
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9276 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-15 23:39:09 +00:00
auria
7572725120 Improve a bit kart selection screen bug found by KroArtem
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8890 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-06-12 17:35:13 +00:00
hikerstk
9dbb3bad94 Removed debug print.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8022 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-03-22 12:31:08 +00:00
hikerstk
28aaaf4f5b Added --ftl-debug command line option, to print some debug information for
FTL (esp. GP) races.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8018 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-03-21 06:15:39 +00:00
hikerstk
9c2be44869 Fixed GP sorting problem - stupid typo.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7844 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-03-08 01:20:53 +00:00
hikerstk
4d8b8e5dea Renamed ptr_vector to PtrVector so that is follows
our naming convention, also changed contentsVector
to m_contents_vector, and removed unused add method
(which is using an iterator, which would not work
when using aligned_arrays on windows anyway).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7602 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-02-03 22:20:53 +00:00
hikerstk
6676723574 Fixed compilation problems on non-windows platforms.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7581 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-02-02 22:26:01 +00:00
hikerstk
4ab6331ff4 Update to bullet-2.77.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7579 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-02-02 22:04:13 +00:00
auria
fa8b2a8ed6 Improve documentation of race manager; this is one huge class so having good doxygen docs is important. Also clarify difference between setNumPlayers and setNumLocalPlayers; replace many calls to setNumPlayers with calls to setNumLocalPlayers, since setNumPlayers is called by the network manager already and as such calls to setNumPlayers had no effect (the same method was called again later) and were just confusing
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7236 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-01-03 20:17:44 +00:00
auria
9c3f46521e Move some code from GUI screens to RaceManager, where it makes more sense to find the said code, and correcting 2 FIXMEs
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7235 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-01-03 19:25:56 +00:00
auria
7a6fbbde51 Nitro target line remains on restart. Important everyone : if you find a sequence of events that causes the nitro line to remain when it shouldn't, tell me, it's hard to think of every possible case
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7201 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-12-31 02:24:44 +00:00
hikerstk
fd3895b45f Fixed severals problems with FTL GP: GP rank od the leader must be -1
(some GP ranks were not set at all).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7098 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-12-20 01:16:03 +00:00
auria
7f97094b87 Fixed numerous leaks, especially audio leaks + add debug functions to be able to easily check for audio leaks
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6903 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-12-08 22:18:55 +00:00
auria
08b33dc2fe Fixed crash when random kart was last used and then trying to play challenges + move error messages to where they belong, no error message should be printed when doing a valid check if a kart exists
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6858 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-12-05 16:12:35 +00:00
auria
f367170752 Always 3 karts on GP podium screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6368 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-10-29 01:39:27 +00:00
hikerstk
66259c59f6 Fixed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6104 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-21 10:28:30 +00:00
hikerstk
a973e8b84f Renamed all instanced of RandomKart in the race_manager to
AIKart (e.g. m_random_kart_list -> m_ai_kart_list) - since this
describes what the lists and function actually are (in network
the name is not entirely correct, but since this will be 
re-implemented anyway, we leave the proper naming till later).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6103 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-21 07:37:42 +00:00
hikerstk
1b1224b244 Added assert to catch inconsistent setting of number of karts.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6101 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-21 04:07:28 +00:00
auria
1c4e3f8492 Fixed crash when starting challenges. @Joerg: please read the fixme I added in RaceManager. There is some confusing design to fix there =)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6085 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-20 17:09:25 +00:00
hikerstk
92d18a7a25 Definitions for GP points is now independent of the maximum number of karts.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6021 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-16 02:31:20 +00:00
hikerstk
1ddb083b0e Fixed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5818 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-30 00:21:04 +00:00
auria
9dfa90beed Decide smarter who won and who lost in a GP, depending on number of players
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5730 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-08 01:02:26 +00:00
hikerstk
0b35249b43 Improved new race result gui - it now consists of two parts: first
the results of the just finished race, then an animated display
of the GP standings (to test this please change the #undef
USE_NEW_RACE_RESULT in race_result_gui.cpp).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5710 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-07-29 23:03:20 +00:00
hikerstk
ebc4754717 Update to new race result GUI: it now handles GP and non-GP,
and 'animates' increasing the points.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5705 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-07-22 22:51:14 +00:00
auria
992115a9d9 Started performing API changes to support multiple GP losers eventually
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5690 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-07-17 18:17:15 +00:00
auria
d26a2daa68 Actually show the GP lost scene when losing a GP
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5460 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-05-30 23:20:32 +00:00
auria
1bdca718cb Added GP lose animation (not yet shown when actually playing, for now click on the 'network' button to see it as usual)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5454 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-05-30 15:45:44 +00:00
hikerstk
939caf1981 1) Added -v X verbosity command line option, so that debug output is only printed
if an appropriat ehigh verbosity is selected. For now most debug statements 
   that are always printed (i.e. independent of user actions) is only printed
   if verbosity is >=5,  debug statement which are a reaction of a user action
   with verbosity >=4.
2) track- and gamepad-debug flags are not saved in config files anymore, made
   disabled reverse_look_threshold as default.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5063 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-03-24 23:52:41 +00:00
hikerstk
b6637277ab Started re-design of stk-config file.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5002 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-03-15 23:00:34 +00:00
auria
0623cce462 Fixed crash at the end of a GP if there is a challenge associated to it. Also, it is now detected properly when you unlock a feature by winnign a GP (however the chest scene doesn't yet apepar)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4954 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-03-07 18:42:04 +00:00
auria
d27e3d90c5 Show 'feature unlocked' screen when unlocking a feature. It's not yet complete : it doesn't really show what you unlocked, and you can't leave the screen properly (game crashes or hangs)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4889 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-03-01 20:17:31 +00:00
auria
5a32323c61 Modified 'setup new race' to skip kart selection (what use is this feature otherwise...)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4864 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-26 20:10:43 +00:00
auria
f0b59c19b7 Added a 'loading' screen, so that the game does not seem unresponsive when loading a big track
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4810 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-23 01:00:21 +00:00
auria
5298b54770 Fixed a couple glitches in GP end screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4790 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-21 23:35:01 +00:00
auria
bbd0cf2f79 Initial work on end-of-GP
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4787 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-21 23:10:24 +00:00
auria
a148a2f46b No more crash on end of GP (nothing useful show yet)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4784 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-21 02:22:05 +00:00
hikerstk
be7b7d4b3c Bugfix: world was not deleted after a GP race.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4781 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-21 00:39:23 +00:00
auria
b868909efe Some cleanups with ActivePlayer. Moved it to StateManager, because that's where active players are created and stored - this will be less confusing than hiding it inside a configuration class. More work is still to be done if we want to make this code really clean, though.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4764 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-18 21:28:32 +00:00
hikerstk
31e3806fd0 Refactor end of race handling so that more functions are done in a base class only
(esp. code that was previously duplicated in the battle mode and standard race).
There is now time for an end animation, even if the player should finish last
(in which case the previous end camera would not be shown). This mostly in 
preparation for end animations.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4750 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-17 11:59:51 +00:00
hikerstk
da3de6d131 Big code refactoring: instead of having auto_kart, player_kart, the karts
now use a 'controller' object which is responsible for its steering, e.g.
a default_ai_controller, player_controller etc. This makes it easier to
switch a player kart to use a end-of-race computer controller to drive
the kart once the race is finished (though that's not implemented yet).
I expect some bugs with restarting race, and perhaps end of race
behaviour at this stage.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4714 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 00:54:28 +00:00
hikerstk
328373289a 1) Moved access to world object from race_manager to static functions in
world.
2) Removed more dujplicated/unnecessary functions from race_manager
   (getPlayerKart, getTrack).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4682 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-11 07:11:52 +00:00
hikerstk
c6bf95a64c Started to remove the various kart lists in various objects.
1) Removed getKart from RaceManager.
2) Renamged RaceManager::getNumKarts() to getNumberOfKarts.
   This function should only be called when the world
   does not exist (or is not yet initialised). 	In all
   other cases world::getNumKarts() should be called.
3) Improved several 'const' functions.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4676 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-10 11:40:33 +00:00
auria
f78001c7b2 Misc nitpicking
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4675 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-10 02:11:56 +00:00
hikerstk
4e36fc1f78 Moved WorldStatus enums into WorldStatus class.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4673 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-09 09:24:45 +00:00
auria
7d1c82d73c Fixed a lot of translation crap related to XML, hacky challenge files, no GUI, etc...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4342 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-22 21:57:15 +00:00
auria
e20f805e61 In multiplayer mode, players other than the game master should not be able to select stuff in race setup menus
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4265 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-06 19:22:57 +00:00