ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,002 Commits 9 Branches 28 Tags
Commit Graph

67 Commits

Author SHA1 Message Date
hiker
a81366c414 Removed rescue-code duplication in battle mode and soccer mode. 2015-07-31 16:27:52 +10:00
Marianne Gagnon
77fac34e41 More cleanup to remove hardcoded things in favor of scripting, and start work to allow for more action trigger shapes (work in progress) 2015-07-13 20:27:16 -04:00
hiker
8d07d26c25 Updated (c) year to include 2015. 2015-03-30 11:42:50 +11:00
hiker
eb37092643 Moved all remaining music commands to be handled by sfx thread. 2015-02-04 17:08:22 +11:00
hiker
ec908d85c6 Split GamepadDevice and KeyboarDevice from input_device into their 
own files. Renamed InputManager::getDeviceList() to getDeviceManager().
 2014-10-25 23:09:00 +11:00
hiker
ad20635cce Applied patch for #600 (support 64 bit compilation on windows). 2014-09-23 14:41:32 +10:00
Marianne Gagnon
7a0afd9321 Fix crash when changing kart from overworld 2014-07-08 20:10:54 -04:00
Flakebi
be39fc4f96 Reset speed when porting to a challenge 2014-06-04 19:06:45 +02:00
hiker
e39f2164b5 Removed OnlineProfile from ActivePlayer, since it was not used at all. 2014-05-31 10:26:02 +10: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 65e2dcf2f09e979b39f8d115da7d17dabac0b957.
 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
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
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
8d1591b260 Removed all references to current user/slot from unlock manager. 2014-02-10 08:57:16 +11:00
KroArtem
c0b13b01ff clean src/modes from printf/cout/cerr 2014-02-07 02:17:49 +04:00
Marianne Gagnon
3e253be31e Misc code improvements 2014-01-29 19:20:57 -05:00
deveee
0be4825ef2 Minor correction in garage action 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14960 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-07 08:17:22 +00:00
hikerstk
7cdca13d7b Fixed all(?) warnings about signed and unsigned comparisons. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14950 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-07 00:09:19 +00:00
deveee
4dd0c066df Fixed problem with distance in my previous commit 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14816 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 22:02:52 +00:00
deveee
27e397d2c7 Fixed #1086 - Popup message was displayed constantly when you were in garage in overworld. 
TODO: Compare distance between garage and kart with for example length
of the kart or distance of object defined in scene.xml.
Currently (m_garage_pos-m_kart_pos).length2_2d() gives much higher values than
getKart(0)->getKartModel()->getLength() and I must look at this closer.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14804 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 02:12:16 +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
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
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
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
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
auria
6147636454 Add tutorial to overworld 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12487 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-02-16 00:52:28 +00:00
hikerstk
9c0e002f0a Fixed 'No newline at end of file' warnings. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12362 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-01-15 06:28:41 +00:00
auria
2ce395ba0d Don't hardcode player ID 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12220 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-12-09 22:14:27 +00:00
hikerstk
02b730b3e5 Fixed engine sfx in overworld. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12217 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-12-09 12:36:37 +00:00
hikerstk
36a15015d8 Fixed #806: clicking on challenges in overworld did not 
teleport karts anymore.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12068 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-11-25 11:50:24 +00:00
auria
570546e5cb Don't pause music on overworld when opening challenge dialog 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12046 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-11-22 01:07:09 +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
a8adde409d Overworld : honor music disabled flag 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11674 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-10-12 23:01:59 +00:00
auria
dab73fa8cf Make overworld play its music 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11672 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-10-11 21:47:50 +00:00
hikerstk
a526fef588 Made m_phase and m_auxiliary_timer private, and added 
setPhase. Removed usage of auxiliary timer in overworld
(instead set phase to race_phase) - as a result there
is no mpre 'Go!' being displayed (which I think is
actually better for the overworld).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11225 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-05-10 12:57:45 +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
auria
8a919816e1 Fixed returning reference to temporary 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11145 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-04-23 23:41:51 +00:00
auria
db2cd01922 Allow going to a challenge in the overworld by clicking on the minimap 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11143 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-04-23 19:23:21 +00:00
auria
9e3ba88f98 Don't allow starting a race from overworld while being rescued 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11091 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-04-05 02:28:21 +00:00