Commit Graph

179 Commits

Author SHA1 Message Date
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
Csaba Molnar
249635f01a onLapEnd() fix 2014-03-17 22:30:17 +01:00
Csaba Molnar
60f1d8ae20 Achievement reset-after-lap beta 2014-03-17 22:07:55 +01:00
hiker
4d6b110e56 Removed unnecessary #include of user_config.hpp in other hpp files
(to reduce the amount of recompilation when user_config.hpp is changed).
2014-02-26 12:52:16 +11:00
KroArtem
c0b13b01ff clean src/modes from printf/cout/cerr 2014-02-07 02:17:49 +04: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
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
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
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
2a0a9a3617 merging uni's and hilnius's branches in networking
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13077 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 17:24:20 +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
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
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
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
f4b121feff Fixed incorrect arrival time estimation (#903 and #859).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12601 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 21:17:39 +00:00
hikerstk
8fe1875db1 Removed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12594 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 00:41:34 +00:00
hikerstk
9429beef79 Simplified more code, fixed some coding style.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12593 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-03 21:15:13 +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
hikerstk
20bb783219 Fixed rescue (which I broke in r12281 - sorry).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12325 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-02 11:37:29 +00:00
funto66
e16c03edf2 Added a special type of tracks for soccer arenas
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12300 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-22 22:33:15 +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
d77471b446 Refactored information exchange between modes and race GUIs:
instead of each mode maintaining an array of data for each kart
which is used by the race GUI, use one array in race_gui_base,
which is then filled by the game mode.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12186 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-05 04:04:01 +00:00
hikerstk
60529bca5c Fixed #812 - two karts given the same position, which happens in
0-lap races. Fixed by letting overall_distance be negative at start
(which should have no other impact - time estimation function is
improved to handle this).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12104 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-11-29 11:59:33 +00:00
hikerstk
db0303146d Added additional debug output.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12089 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-11-26 10:14:53 +00:00
hikerstk
e8900f69e6 Fixed #796 (**:**:** as time), which happens if the race is aborted
before a kart has moved (due to a division by zero). Now 99:59:00
is displayed instead, but in case that there should be other 
circumstances that trigger this problem, use 99:59:99 instead of
**:**:**.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12055 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-11-23 13:13:38 +00:00
hikerstk
8fa7b8a0d0 Avoid crash in case of problems with sound.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11952 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-11-15 02:04:03 +00:00
hikerstk
68711524bf Fixed compiler warnings and comments.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11732 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-10-21 23:03:08 +00:00
hikerstk
ebfd22b480 Added files missing in previous commit.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11683 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-10-14 22:23:07 +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
eca5b3e570 Refactored handling of kart animations: instead of
using a fixed object in the kart, now each animation
(rescue, explosion, canon) has its own object and 
implementation using a common interface. This
simplifies AbstractKartInterface, and makes it
easier to add new functionailty. 
Instead of using: kart->rescue(...),  or kart->explode(...)
you use new ExplosionAnimation(kart, ...) etc. Memory
handling is done by the object (and abstract kart).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11070 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-01 22:57:41 +00:00
auria
74ab49b1ac Hide lap messages in overworld
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11066 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-04-01 15:45:10 +00:00
hikerstk
e3de48350d Removed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11024 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-03-25 23:56:25 +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
4f1961044c Avoid crash in case of a kart-track collision while during resetAllKarts (which
apparently happens in doing-the-dishes with 20 karts).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10903 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-28 03:36:18 +00:00
hikerstk
94be2cfec2 Automatically switch to camera 0 when the lap line is crossed. This
improved handling of end cameras for reverse mode (otherwise one
additional end camera would need to be defined to be used just
when the lap line is crossed).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/reverse_mode@10850 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-15 05:23:21 +00:00
hikerstk
e13a7078d8 Fixed warnings being printed at race start when using 0 lap races.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/reverse_mode@10845 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-14 23:25:43 +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
23af52985f Removed unnecessary parameters kart and track from
TrackSector::update.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9997 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-10-16 12:29:37 +00:00
auria
5e905e4322 Added support for the gettext context feature
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9862 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-18 18:07:59 +00:00
hikerstk
3185c5fcc9 Cleaned up world.hpp:
- sorted declarations so that all virtual functions
  are together.
- Renamed *_IDENT variables to IDENT_* so that the
  naming is consistent
- Using std::string& for IDENT_* instead of char*
- Use pointer for out variables in getDefaultCollectibles.
- Moved m_fastest_lap variable from world to LinearWorld.
- Many many cosmetic changes to follow our style guide.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9852 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-16 01:49:38 +00:00
auria
2311b11b90 Added new smart rescue
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9807 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-11 23:59:49 +00:00
auria
ee7b178dce Started adding code to assign a checkline to each quad (currently disabled). See #398
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9805 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-11 19:46:51 +00:00
auria
68b56d0c05 Remove unused parameter for race GUI message, plus use title font for the WRONG WAY message instead of this ugly pink font that was there before
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9731 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-03 20:23:55 +00:00