Commit Graph

1090 Commits

Author SHA1 Message Date
hiker
eb37092643 Moved all remaining music commands to be handled by sfx thread. 2015-02-04 17:08:22 +11:00
hiker
b9a7c11dab Removed unnecessary #includes. 2015-02-03 14:30:18 +11:00
Vincent Lejeune
8798eda41b Remove hardware skinning files 2015-01-11 00:59:09 +01:00
Flakebi
fbba008a1a Restore ancient behaviour 2014-12-22 23:12:20 +01:00
Flakebi
57958aba36 Merge branch 'upstream/master' into fixes 2014-12-19 23:02:41 +01:00
hiker
3c6204732e Switch to fast music immediatley on lastp lap, and not only
when 30 seconds are left.
2014-12-10 17:02:39 +11:00
Flakebi
abc8394801 Fix two little glitches in intro and outro scenes 2014-11-27 15:20:12 +01:00
Marianne Gagnon
229a43a692 Preserve "startedFromOverworld" flag value properly. Fixes #1683 2014-11-17 19:07:37 -05:00
Flakebi
be999895b4 Remove some unused code 2014-11-17 00:08:47 +01:00
Vincent Lejeune
d5330a8f39 Fix VS2013 "dereferencing null ptr" static analysis error 2014-11-16 04:40:19 +01:00
Flakebi
abf7bacfea Merge branch 'upstream/master' into perPlayerDifficulties
Conflicts:
	src/graphics/stkmesh.cpp
	src/states_screens/kart_selection.cpp
2014-10-31 16:47:34 +01:00
hiker
f7d767e57b Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-28 09:47:28 +11:00
Marianne Gagnon
139f20b39d Merge remote-tracking branch 'sachith/ScriptEngine'
Conflicts:
	CMakeLists.txt
	sources.cmake
	src/io/file_manager.cpp
	src/io/file_manager.hpp
	src/modes/world.hpp
	src/tracks/track.hpp
	src/tracks/track_object_presentation.cpp
2014-10-27 18:43:09 -04:00
hiker
9e9ce47a2b Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-28 09:02:35 +11:00
Marianne Gagnon
32c5d79e26 World : do not self-destruct until everything completely done 2014-10-26 19:05:07 -04:00
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
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
Marianne Gagnon
047c6fc760 Add debug name to meshes and mesh buffers, helps debugging 2014-10-24 19:25:24 -04: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
hiker
9dff5a7990 Fix potential memory overwrite in soccer mode when using one player
only (artist debug mode).
2014-10-20 23:01:31 +11:00
hiker
e4e0724cb9 Removed unnecessary stop of music (music will stop anyway once the
buffer is finished, but if music is completely threaded it might
just keep on playing).
2014-10-16 17:03:13 +11:00
hiker
bba7156aff Handle the setting of the listener position in the sfx thread. 2014-10-15 23:42:59 +11:00
hiker
665f146923 Moved SFXStatus enum to SFXBase. 2014-10-14 08:05:04 +11:00
hiker
bfe84612fa Let all SFX commands be handled by the sfx manager thread (otherwise
events could be handled in the wrong order, e.g. a delete from the
main thread before the play in the manager thread, resulting in a crash).
Should fix #1511 and #1604.
2014-10-13 08:26:45 +11:00
Flakebi
dc78c35b50 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
Conflicts:
	data/gui/user_screen.stkgui
	data/gui/user_screen_tab.stkgui
	src/karts/kart.cpp
2014-10-05 12:10:39 +02:00
Vincent Lejeune
b56901bacd Fix minimap halo second time it is rendered. 2014-10-04 01:42:25 +02:00
Flakebi
47da30dd24 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-30 19:22:18 +02:00
Deve
d0e30c15a5 Reset counter when game is restarted 2014-09-29 21:56:32 +02:00
Deve
1c97476369 Display wrong way message after a delay. 2014-09-29 20:21:05 +02: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
hiker
86b351fbf4 Turn sfx_manager into a singleton. 2014-09-17 21:38:21 +10:00
Flakebi
9bcc76127f Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-17 13:20:09 +02:00
Marianne Gagnon
3536e13c49 Tweak fade-in/fade-out times in cutscenes and remove hardcoded values 2014-09-14 19:06:19 -04:00
Vincent Lejeune
349a64ae8d Revert "Use a parallel loop for IA"
This reverts commit 8e333afa99.
2014-09-13 01:32:40 +02:00
Vincent Lejeune
d480c52f8c Revert "Try to put IA in its own thread"
This reverts commit 2a60a84155.
2014-09-12 23:22:54 +02:00
Vincent Lejeune
2a60a84155 Try to put IA in its own thread 2014-09-12 23:04:40 +02:00
Vincent Lejeune
8e333afa99 Use a parallel loop for IA
It sighltly helps decreasing stuttering in some area of chocolate.
2014-09-12 19:10:22 +02:00
Sachith Hasaranga Seneviratne
b6a9e5be9c Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-09-10 17:15:01 +05:30
Flakebi
9c911a2891 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-09 12:07:34 +02:00
Marianne Gagnon
5ac75b915a Find better names for markers 2014-09-07 18:56:21 -04:00
Marianne Gagnon
01d114329f Add profiler markers in race update 2014-09-07 18:54:36 -04:00
Sachith Hasaranga Seneviratne
118db58a02 Merged Master 2014-09-07 11:28:15 +05:30
Flakebi
a31ec772ff Replace accidently placed tabs 2014-09-02 03:57:48 +02:00
Flakebi
48323d4456 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-02 03:57:21 +02:00
Deve
57240124ba Rename rain class to weather 2014-09-01 20:18:06 +02:00
Deve
7d0dec5c49 Handle lightning and sound in weather property 2014-09-01 20:18:06 +02:00
Flakebi
dc4a30202f Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-01 11:31:26 +02:00
Deve
47b46558f2 A bit better formatting in world status 2014-08-30 18:37:57 +02:00
Deve
507d9566a0 Don't start rain sound too early 2014-08-30 18:37:57 +02:00
Deve
d8f61e336e Move creating rain to world class because now it doesn't depend on cameras. 2014-08-30 18:37:57 +02:00
hiker
84e78d884a Merge remote-tracking branch 'origin/master' into no_floating
Conflicts:
	src/karts/kart.cpp
2014-08-22 12:23:55 +10:00
Marianne Gagnon
c8b50c67ef Fix leak 2014-08-20 20:38:05 -04:00
hiker
210a8e7ae9 Set the graphical suspension depending on physical suspension (capped).
Adjusted graphical chassis to be 0.1 higher to have similar look at previously
and avoid graphical chassis going into terrain,
2014-08-20 22:19:26 +10:00
nixt
1f435142db Merge remote-tracking branch 'upstream/master' into walldriving 2014-08-02 02:36:35 +05:30
Sachith Hasaranga Seneviratne
c3a774fcc9 Merged master 2014-08-01 18:40:05 +05:30
nixt
f40fb50386 Fix "Wrong Direction" message 2014-08-01 04:01:28 +05:30
nixt
fbf002bfc6 Disable debug messages 2014-07-31 18:15:37 +05:30
Marianne Gagnon
3db9b867a6 In artist debug mode, fast-track race start even more, tired of waiting after thunderbird to test 2014-07-28 19:16:32 -04:00
Vincent Lejeune
bd7babe11f Rename cpp2011.h 2014-07-29 00:35:43 +02:00
nixt
5912dd2dd6 Merge remote-tracking branch 'upstream/master' into walldriving
Conflicts:
	src/karts/kart.cpp
2014-07-29 00:18:52 +05:30
Flakebi
71f8766cb1 Add per-player difficulty 2014-07-28 18:32:39 +02:00
hiker
425675bdac Moved check_structure detection from center of kart to the front
of the kart (which will work better for a photo finish). Hopefully
no other side effect.
2014-07-28 09:52:44 +10:00
hiker
0ef42111bc Fixed rescue transform: the heading rotation need to be done around
(0,1,0), not around the normal, and the order of rotation needs to be
first the heading rotation, then pitch/roll to make the kart parallel
to the ground.
2014-07-23 08:11:30 +10:00
hiker
413c062932 Simplify code by using the kart's normal. 2014-07-21 16:24:44 +10:00
Sachith Hasaranga Seneviratne
f4b357d03c Merged master 2014-07-11 07:04:25 +05:30
nixt
732c3a4b2f Merge remote-tracking branch 'upstream/master' into walldriving
Conflicts:
	src/graphics/irr_driver.cpp
	src/karts/kart.cpp
2014-07-09 23:40:26 +05:30
Marianne Gagnon
faed904061 try to fix linux compilation 2014-07-08 20:39:31 -04:00
Marianne Gagnon
7a0afd9321 Fix crash when changing kart from overworld 2014-07-08 20:10:54 -04:00
nixt
437f8191f4 Fix a bug where the kart's wheels would intersect with the road when rescued to an upside location. 2014-07-03 17:24:04 +05:30
nixt
184e45bb6d Correct the landing after rescue for non-horizontal tracks. 2014-07-03 11:13:49 +05:30
Sachith Hasaranga Seneviratne
3573452519 Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-07-03 07:39:09 +05:30
hiker
6905812425 Fixed typo in warning message. 2014-06-25 09:31:10 +10:00
Sachith Hasaranga Seneviratne
ee73767572 Added possibility of triggering scripts via update method (ie everytime tracks etc are updated, this script will be called 2014-06-17 17:48:47 +05:30
Sachith Hasaranga Seneviratne
390642cb5f Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-06-13 08:00:56 +05:30
Marianne Gagnon
e3a2246e25 More work on cutscene screens 2014-06-12 18:43:20 -04:00
Marianne Gagnon
e5532c32ff Improve code to switch between GUI-cutscenes. Still not fully functional, but better 2014-06-11 19:37:04 -04:00
Sachith Hasaranga Seneviratne
113c87dccf Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-06-11 10:51:23 +05:30
hiker
e55d976aa2 Added simple animation when the player rank changes. 2014-06-10 16:58:43 +10:00
Sachith Hasaranga Seneviratne
75ed68ac58 Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-06-08 20:32:08 +05:30
Marianne Gagnon
be5577045d Work on new feature unlocked cutscene, starting to work correctly, more testing (and art work) needed 2014-06-05 20:06:27 -04:00
Sachith Hasaranga Seneviratne
795a6022e5 Revert "Revert "Merge sources.cmake change""
This reverts commit 0290564310.
2014-06-05 12:38:38 +05:30
Sachith Hasaranga Seneviratne
0290564310 Revert "Merge sources.cmake change"
This reverts commit 03bff8819f, reversing
changes made to 540c7818aa.
2014-06-05 11:46:11 +05:30
Sachith Hasaranga Seneviratne
03bff8819f Merge sources.cmake change 2014-06-05 11:30:28 +05:30
Flakebi
be39fc4f96 Reset speed when porting to a challenge 2014-06-04 19:06:45 +02:00
Flakebi
af6c121a22 Run whitespaces.py 2014-06-04 15:10:20 +02:00
Flakebi
4069e233fe Unify some things 2014-06-04 15:06:35 +02:00
Sachith Hasaranga Seneviratne
d908489ca7 Added script driven kart teleports 2014-06-02 19:55:37 +05:30
Sachith Hasaranga Seneviratne
e08bbb5138 Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-06-02 13:08:53 +05:30
Marianne Gagnon
0057e40e6d Work on cutscene+menu combination. Fix bugs in GPWin cutscene, make them easier to work with in general 2014-06-01 21:03:48 -04:00
hiker
e39f2164b5 Removed OnlineProfile from ActivePlayer, since it was not used at all. 2014-05-31 10:26:02 +10:00
sachith500
6f58864df0 Added namespaces Scripting, Scripting::Physics. Moved collision script code and function,callback binding to Scripting::Physics 2014-05-27 11:57:44 +05:30
Sachith Hasaranga Seneviratne
888c514dc7 Fixed Typo 2014-05-19 09:00:48 +05:30
Sachith Hasaranga Seneviratne
27de7c6f3c MERGE STK into scripting branch 2014-05-19 08:27:15 +05:30
vlj
8673d36885 Merge branch 'fboencapsulate' 2014-05-17 17:05:31 +02:00
Marianne Gagnon
4ff8b813fa Create RTTs only when loading a track 2014-05-16 19:30:39 -04:00
hiker
636f34160a Finished using Log:: instead of printf, removed separate 'profile'
level, instead use 'profile' as component.
2014-05-16 09:54:32 +10:00
Bart Cools
61d9b7a0ea Output of logging profile tests changed to the stdout.log instead of standard output. type of output also changed to space separated values instead of tsv 2014-05-15 18:30:16 +02:00
Marianne Gagnon
486d5c291f Batch physics debug rendering 2014-05-10 19:26:14 -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
Marianne Gagnon
1b7c9ee1e2 Initial work to port GP win/lose cutscenes to new system 2014-05-02 18:47:43 -04: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
24dc70427f Fixed compiler warnings. 2014-03-25 20:54:20 +11:00
Csaba Molnar
3a5812dd6c Merge branch 'master' of https://github.com/supertuxkart/stk-code
Conflicts:
	data/achievements.xml
2014-03-22 00:52:33 +01:00
Sachith Hasaranga Seneviratne
c1b8927b31 Cleaned up a bit 2014-03-21 15:31:28 +05:30
cosmin.crecana
8616ce546a achievement_unstoppable 2014-03-20 15:30:11 +02: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
Guillaume P
45ab7e6907 Clean up some minor coding style issues 2014-03-17 08:21:49 +01:00
Guillaume P
5af377da07 Fix a build issue for Travis CI. 2014-03-15 15:58:17 +01:00
Guillaume P
8a34be1ab3 Add a new Gold Driver achievement. 2014-03-15 15:12:28 +01:00
Guillaume P
955b27bf75 Add a Marathoner achievement. 2014-03-12 14:15:16 +01:00
hiker
4eb4ce1511 Bugfix: onRaceEnd was not called for achievements (resulting in
achievements not being reset at end of a race).
2014-03-12 22:40:43 +11:00
nixt
c3bd527b8c Merge remote-tracking branch 'upstream/master'
Conflicts:
	data/shaders/ssao.frag
2014-03-06 04:25:17 +05:30
Marianne Gagnon
a063d23b37 Fix intro cutscene 2014-03-03 18:57:10 -05:00
hiker
38bdca2038 Fixed typo. 2014-03-03 09:17:45 +11: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
99fe4388d4 Added an enum to reference the achievements by a name instead of
an integer number.
2014-02-24 17:14:42 +11:00
hiker
71f61f71c6 Fixed compilation errors - no idea why VS compiled it ok previously :( 2014-02-24 08:26:51 +11:00
hiker
a3a5d5fc3b Moved achievements data into PlayerProfile (and data is saved in players.xml
now instead of in a separate achievements.xml file).
2014-02-20 22:04:03 +11:00
hiker
94da45238c Renamed GameSlot to StoryModeStatus to better describe its function. 2014-02-17 23:16:53 +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
230e1789f2 Made sorting of players descending (instead of using > in operator<),
removed kart and unique id from game slot, replaced some forgotten calls to
unlock_manager with calls to PlayerManager.
2014-02-10 17:00:16 +11:00
hiker
8d1591b260 Removed all references to current user/slot from unlock manager. 2014-02-10 08:57:16 +11:00
hiker
5acf3e1681 Various compilation fixes, some cosmetic changes. 2014-02-10 08:41:54 +11:00
hiker
97be85777d Started to move current player info from unlock manager into
player_manager.
2014-02-09 23:22:45 +11:00
nixt
39ef5f1655 Merge remote-tracking branch 'origin/master' into battleAI 2014-02-09 00:37:48 +05:30
nixt
d1d83459d0 Merged from master 2014-02-07 23:40:09 +05:30
nixt
5e64f02685 Add a comment to three_strikes_battle.cpp 2014-02-07 23:13:51 +05:30
KroArtem
c0b13b01ff clean src/modes from printf/cout/cerr 2014-02-07 02:17:49 +04:00
hiker
045bfeaf13 Removed m_all_players from UserConfigParams (though there are stil
bugs in the new code).
2014-02-06 23:08:55 +11:00
hiker
78b73aa3c8 Added new player manager, and started to replace the saved data
from user_config with player manager.
2014-02-06 14:43:47 +11:00
KroArtem
8a731691fd more coverity fixes, get rid of printf 2014-02-01 03:54:34 +04:00
Marianne Gagnon
3e253be31e Misc code improvements 2014-01-29 19:20:57 -05:00
hiker
9651a9f224 Minor code cleanup, renamed a variable and function. 2014-01-24 22:25:55 +11:00
nixt
cc78233258 Merged from master 2014-01-23 03:17:32 +05:30
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
hikerstk
6ee751e3c3 Added new class to handle command line parameters, which
simplifies parameter handling in main (e.g. it's not
necessary to list and ignore parameters in the 2nd
pass, when they were handled in the first pass).
Removed some command line options for which there
is a guy (e.g. --weather), or which are not really
useful (--list-karts). 

All parameters to options must now consistently be
specified using '=', e.g.: --log=1 and --kart=tux.

Also removed support for 'classic' camera (which was
not used anymore). Removed now unneccessary #include
in user_config.hpp, which made some #include changes
in other files necessary.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14939 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 12:23:16 +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
nixt
83d91b7b07 Merge from trunk, pending.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/battleAI@14776 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 04:34:57 +00:00
deveee
1a2d26b894 - Fixed crash when goal is scored after time limit
- Set time max value to 15 - playing one game 45 minutes doesn't have a sense
- Remember time value in user config
- Little beter look of soccer setup
- Set goal-limit mode as default

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14743 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-21 17:04:46 +00:00
deveee
49be95b966 Some code cleanup in soccer world
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14741 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-20 21:11:22 +00:00
hikerstk
c450c97472 Allowed the music directory to be external. Renamed
getMusicFile to searchMusic and getTextureFile to
searchTexture. Removed m_root_dir from file_manager.
Added convenience function getTexture to irr_driver
which takes an asset type, so now less code is needed
to load textures (though that's proably not used
everywhere yet).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14736 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-18 22:29:08 +00:00
hikerstk
73c498daf3 Start to support 'externa' data directories. Most directories
from data can now be moved out (except music). STK prints
an overview of which directory is taken from where. More 
cleanups and improvements will come.
Also moved skins into a separate directory under data (from
data/skins), since it's likely that skins will be part
of a binary package (i.e. changes to skins not really
related to code), while gui files will more likely stay
with the code.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14731 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-17 23:48:47 +00:00
deveee
79e01c5c56 Hopefully fixed problem with tutorial which sometimes was starting in a loop
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14728 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-17 21:00:56 +00:00
nixt
13ddb2bfbe Fixed redeclaration of m_debug_sphere. Improved AI turning while reversing.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/battleAI@14684 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 12:38:34 +00:00
nixt
420e73d102 Improved kart reverse when stuck. Fixed a bug in ThreeStrikesBattle::updateKartNodes().
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/battleAI@14673 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 00:02:15 +00:00
nixt
43f1c59a6e Huge merge from trunk, part 1.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/battleAI@14659 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-08 03:45:57 +00:00
nixt
a49a990a99 Improved kart localization on the nav map. The old location is mainted when a kart moves out of the nav map and cannot be found on it.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/battleAI@14654 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-08 00:11:40 +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
d41bbbaa2f Merged uni's branch with trunk. No guarantee that everything works ;)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14620 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-03 23:02:06 +00:00
nixt
c6cbf487c9 A new unified function ThreeStrikesBattle::updateKartNodes() that localizes all karts (AI and player) on the polygon map.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/battleAI@14618 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-03 16:43:07 +00:00
nixt
41fa68f948 Applied a pending merge.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/battleAI@14617 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-03 16:28:57 +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
auria
5899a26aad Merge cand's graphical improvements branch!! There are many known issues folks, so don't cry victory just now, this is just the beginning. Especially, shadows do not work correctly at this time
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14590 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-30 21:33:06 +00:00
hikerstk
87cc616a6c Fixed orientation of final 4 wheels that are added to an arena
in battle mode (plus some minor code cleanup).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14578 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-25 11:27:59 +00:00
hikerstk
c136bc2bd0 Fixed #1109 by adding a proper constructor to the Settings class
(which will make sure all fields are initialised).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14576 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-25 06:01:16 +00:00
hikerstk
a97430c882 'Better' fix for incorrect time in easter egg mode - thanks to
Devee for diagnosing the problem!


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14512 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-21 01:50:46 +00:00
deveee
8ea98eae71 Display time in race result of Easter Egg mode properly.
It was broken since Easter Egg starts as linear world. My proposition is to include it to 0.8.1 branch.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14494 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-20 14:43:17 +00:00
yasin-ghannam
287ff4c8ee Added time limited-match instead of only goal-limited ones.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14472 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-18 01:58:10 +00:00
hikerstk
8247f73604 Replaced tabs with spaces.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14448 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 12:52:39 +00:00
hikerstk
c5b8732087 Probably biggest commit (in terms of number of files) ever -
updated the (c) line of all files to -2013, added missing (c), 
changed format in some cases so that it will be easier in
the future to change them by script. No actualy code change.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14447 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 11:43:21 +00:00
hikerstk
caeb87d9a7 Added file missing in previous commit.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14415 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-12 09:35:51 +00:00
deveee
e1bc4ef8fe Fixed #1089.
Stop goal sound when the game is terminated or restarted.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14405 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-10 09:53:36 +00:00
auria
79e1dc6efd Reset input at the end of easter egg hunt mode
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14399 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-08 22:12:05 +00:00
deveee
41bc19fa99 Add workaround for tickets #1084 and #1085.
Currently there is no non-linear track where eggs could be hidden. Start track as linear solves problem with position after rescue.
Also add win animation when all eggs are collected.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14398 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-08 21:42:49 +00:00
hikerstk
0be530faf0 Fixed compiler warnings (and removed some tabs).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14383 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-04 09:56:33 +00:00
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
nixt
a31c314cb4 Major update to Battle AI. AI can localize itself on the navigation mesh. Battle graph is now stored as adjacency matrix instead of adjacency list.
Implemented pathfinding (Floyd-Warshall), AI can now find a path from one sector to another. As a proof of concept: AI can almost follow a player kart. Some code refactoring is in order before further development.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/battleAI@14340 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-29 05:47:11 +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
nixt
1c75270912 merged updates from trunk to branch
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/battleAI@14308 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-25 14:21:04 +00:00
nixt
3f9bf2ec47 Merged changes from trunk.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/battleAI@14293 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-23 01:09:18 +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
hikerstk
891df54f3a Fixed rewind (events had a time stamp after increasing world clock,
while states had a time stamp before world clock was updated).
Still all work in progress ;)


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/rewind@14138 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-23 06:57:32 +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
hilnius
0ce03186ee merging uni's branch and fixing compilation problems
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13690 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-15 10:12:54 +00:00
hilnius
262f70205c merging trunk and fixing compilation issues
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13689 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-15 10:05:34 +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
unitraxx
f38106ce77 Achievements looking good. Only server syncing and server-side need to be done.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13635 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-06 00:06:59 +00:00
hikerstk
cb46fad124 1) Fixed time when state snapshots are taken (must be before the physics runs)
2) Added support for storing the exact time step sizes (probably only for
   debugging - since now we can try to have bitwise identical results when
   replaying).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/rewind@13631 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-04 22:06:26 +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
hilnius
71fb252654 removed some useless files + improvements in end-race GUI interaction
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13592 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-29 17:57:56 +00:00
hikerstk
de14757419 Fixed compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13582 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 03:39:44 +00:00
hilnius
8233b8067d merging uni's and trunk branches. Not everything tested right now
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13577 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-27 01:02:41 +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
hilnius
8e7338a13e game no longer crashes at the end of the race, the end of race sequence seems ok for 1 player at least
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13532 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-21 19:04:46 +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
yasin-ghannam
a400e48c57 git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13499 178a84e3-b1eb-0310-8ba1-8eac791a3b58 2013-08-18 12:43:19 +00:00
yasin-ghannam
43f8963a01 Goal SFX added.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13498 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 12:25:08 +00:00
yasin-ghannam
51a7b2b387 Goal scoring corrected. "GOAL!" appears when a goal is scored (Music will be added soon). Karts start positions fixed so that each kart faces the goal of the opposite team, not its own.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13497 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 07:36:32 +00:00
hilnius
98f3b20bcb merging uni's branch and trunk
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13485 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-15 12:35:23 +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
unitraxx
2711744ed8 merge with trunk
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13477 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-15 00:20:28 +00:00
hikerstk
9fe8d0f259 Started to work on rewinding. ATM a single kart can be rewound
to a previous time (i.e. the race continuous from the previous
location). No memory handling is done, ... all work in progress :)


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/rewind@13468 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-12 23:29:21 +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
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
a20c200b77 merging uni's branch. one bug appeared back
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13386 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-30 00:41:47 +00:00
hilnius
b737ad753a adding a way to have a network kart selection screen inheriting the normal kart_selection_screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13363 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-27 23:13:03 +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
hilnius
3be0d70ce0 adding a protocol to update positions over network during a race
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13259 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-16 14:45:48 +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
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
hilnius
9aa25a4e97 Modifications in protocols to use the http connector and xml to get information from the database. Correcting the --server option which wasn't working. Now launching supertuxkart --server will connect the user 'server':'serverpass' and start automatically a ServerLobbyRoomProtocol that listens to incoming peer connections.
Improvement of logging. Some were fatal whereas they shouldn't.
Improvement of the protocol system. There were mutex permanent locking.
Protocols that do not use http are now non-blocking (except maybe one).
A user can 'quick join' the server by logging then pressing the 'quick play' button in the online panel.
Improvement of packet serialization/unserialization
Added a ping protocol to ping peers as long as they don't respond


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13112 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-07 19:49:51 +00:00
unitraxx
3ef2c4772a Merge my branch with networking branch
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13103 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-06 14:10:32 +00:00
hilnius
e0e64680a5 merging trunk and networking. 'data/gui/menu_story_focus.png' has its networking version kept (dunno why the two files were different, they seemed same to me)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13101 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-06 11:48:23 +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
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
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
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
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
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
hikerstk
9860f5f576 Moved call to RaceGUI::init out of world::reset to avoid
duplicated thunderbird: reset is called each time before
a race is (re)started, while an init function must only
be called once. This properly fixes #918 (referees not
removed), which was caused by init actually being called
twice. Also changed order of when the referee position
is computed: before it was computed before World::resetAllKarts
was executed (which settles the karts at their stable start
position). This resulted in slightly different start 
positions (depending on positions set in blender, not
the position in which the kart were finally stable. This
fixed #917.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12664 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-16 11:37:25 +00:00
hikerstk
eb004a63a6 Updated source list, and fixed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12612 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-05 12:31:14 +00:00
auria
61720b2661 Add back ability to programmatically add track objects, use it in 3 strikes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12610 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-05 01:30:34 +00:00
auria
94cd32d20d Do not stop music during tutorial
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12607 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 23:14:52 +00:00
auria
3cd4cc1cad Fix reading freed memory after deleting world, plus add what it takes to detect further such issues easily
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12606 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 23:09:53 +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
auria
bc1d1e7d31 First part of track object refactor
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12596 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 01:15:37 +00:00
hikerstk
cc6446cd1c Removed unused files.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12595 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-04-04 00:42:26 +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
hikerstk
f857393ca2 Removed time limit from easter eggs (if used in a challenge, the
challenge will define the time limit), which also fixes #861 (no
timer when easter egg mode is started first). Added high-scores for
easter egg mode.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12574 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-25 06:16:23 +00:00
hikerstk
5445cec7ba Enabled motion blur shader in split screen multiplayer.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12552 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-14 21:04:48 +00:00
hikerstk
62ea0bbbe0 Fixed various compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12542 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-06 23:12:24 +00:00
hikerstk
502042432c Big refactoring: the camera for a kart is now not part of the
kart anymore, instead they are managed by static functions
in Camera. This allows us to have several cameras for one
kart now (can be useful for debugging; or for three-screen setup
where you have one monitor for left, right, and center; or potentially
for an back mirrir). Also 'rain' is moved into camera now (where it
belongs more naturally then in kart), and several loops over all
karts searching for a camera are now replaced by simpler loops over
all cameras (though a few loops were added to handle code for all
cameras now, while before there as no loop).
Main advantage: handling post-processing will be easier to do now.
Also this fixes a bug: in split screen mode, when a kart is eliminated
(ftl) the camera for this kart was supposed to show the
leader facing backwards, which didn't work (it just showed the previous
location of the elimintaed kart) - now it works.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12541 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-03-06 22:08:41 +00:00
hikerstk
e1033ca9f7 Started to restructure rendering loop - moved things out of rendering
loop, cleaned up code, ...


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12531 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-28 01:05:27 +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
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
auria
a81fe6fbae Delete old unused file
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12448 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-02-03 22:31:24 +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
4dc3589086 More tutorial work
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12388 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-19 00:46:03 +00:00
auria
c44dbf4214 Work on tutorial
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12373 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-17 02:20:12 +00:00
auria
14c058a311 Work on tutorial
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12372 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-17 00:58:40 +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
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
45790c0db4 WIP soccer mode GUI setup screen, don't draw player icons when in soccer mode, painted soccer cages in blue and red
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12346 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-01-09 21:32:43 +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
be5f3e47e9 Fixed crash when playing soccer with a minimap (thanks WillemS for the bug report) + fixed tracks screen displaying soccer field when it shouldn't
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12317 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-29 17:44:56 +00:00
funto66
cd28f9128a Now teleporting the soccer ball at its start position when scoring a point
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12314 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-28 14:11:33 +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
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
funto66
a05e26bf05 Soccer mode - WIP
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12296 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-21 21:04:10 +00:00
funto66
3c8634d3af Soccer mode - WIP
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12294 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-20 12:49:38 +00:00
hikerstk
d9c66a8bf6 Fixed compilation errors on linux and several warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12285 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-17 01:27:44 +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
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
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
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
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