Commit Graph

8358 Commits

Author SHA1 Message Date
hikerstk
36c6284ebe Added more asserts to find #687 (nan when setting engine force).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11509 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-16 04:22:33 +00:00
auria
b966057611 Change intro music to something free and hopefully better too
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11508 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-14 22:40:33 +00:00
auria
dda9b8f831 Fix a few minor glitches in part 1 of intro
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11506 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-14 00:50:17 +00:00
hikerstk
e467e711fb Disable new skidding AI, which was committed accidentally.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11504 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-13 01:09:25 +00:00
auria
81966f33d6 Pressing escape cancels both parts of the cutscene
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11503 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-13 00:25:30 +00:00
auria
cd0ba32a65 Play the 2 parts of the intro
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11502 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-13 00:23:18 +00:00
hikerstk
d73421afbc Fixed minor memory leak.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11499 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-09 06:53:24 +00:00
hikerstk
e2caea1c05 Refactored ItemManager to use static components to load
the default item meshes. An instance of it is now only
created when a race is started (and deleted once the
race is finished). This makes the race-specific 
initialisation and cleanup better to understand. Also
added singleton access to the one instance of ItemManager.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11498 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-09 06:37:29 +00:00
hikerstk
98c5a5aba9 Added leak checking to items.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11497 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-09 05:58:56 +00:00
hikerstk
08efb945f2 Bugfix: an item that was collected and that had not yet re-appeared
was invisible when the race was restarted.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11496 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-09 05:58:34 +00:00
auria
dcfab8bea2 Add music to part II of intro cutscene. Not sure how well it fits, we can change it if needed
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11495 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-09 00:15:00 +00:00
auria
f6c89a20be Make sure subtitles are properly synchronized
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11493 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-08 23:59:28 +00:00
auria
ac0326fe77 Fix backdrop of intro cutscene 2 and a few other minor thingas
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11492 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-08 23:47:51 +00:00
auria
71a5e77ead Tweak some timings in intro cutscene
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11490 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-08 23:19:13 +00:00
hikerstk
fcb815856c Fixed linux compilation.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11489 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-08 23:06:32 +00:00
hikerstk
16316364ea Removed unnecessary m_all_meshes and m_all_low_meshes mappings,
some refactoring to avoid code duplication.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11488 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-08 07:05:59 +00:00
hikerstk
b972a2b2a3 Renamed GraphNode::getIndex to getQuadIndex.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11487 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-08 06:57:55 +00:00
hikerstk
bb0219fa42 Fixed NAN crash, which could happen because m_curve_center was not
initialised. If m_current_track_direction was UNDEFINED, 
m_curve_center was actually used.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11486 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-07 23:31:35 +00:00
hikerstk
0a8ddf3a1f Moved asserts to find reason for NANs.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11485 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-07 23:23:48 +00:00
hikerstk
a13dc9835d Added more asserts to find NAN crash.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11484 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-07 23:10:09 +00:00
hikerstk
cc364e9f23 Simplified leak checks (removed one unnecessary class), and made
the data structure thread safe to avoid a race condition that would
(very infrequently) crash the game.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11483 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-07 01:54:27 +00:00
hikerstk
f63011d003 Added default constructor, which simplifies usage of this object.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11482 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-07 01:35:41 +00:00
hikerstk
43359f9292 Removed debugging which was committed by accident.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11480 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-06 23:49:51 +00:00
wardje
361d2362fa Fix parentheses warning and an outdated comment
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11478 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-06 16:54:36 +00:00
auria
39e29c3c2e On Linux, with regards to feature 'remember window location', make sure to get the coordinate of the window including borders, not coordinates of the contents as was done before, which resulted in the window going down a bit on every launch
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11476 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-06 01:39:42 +00:00
hikerstk
d5284adf89 Added assert to catch a nan problem (reported in mailing list).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11475 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-06 01:20:55 +00:00
hikerstk
22ee9171e6 Minor bug fix (though it's in commented out code anyway).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11474 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-06 01:18:34 +00:00
auria
d9724c3690 Fix quite afew glitches in into cutscene part 2
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11472 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-06 01:00:23 +00:00
hikerstk
2562beae86 Adding asserts to find a NAN problem.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11471 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-06 00:45:52 +00:00
hikerstk
13175b8566 1) Changed the minimum turn radius when skidding to be 20% instead
of 40%. This allows longer skids in wider turns (e.g. hacienda).
2) Improved skidding decision when sharp turning is required:
   on sharp turn when already skidding, wait till an 'even sharper'
   turn is required, which (usually) means that then the AI is
   nicely aligned with the new track direction when releasing skid,
   which makes nice use of the bonus and the additional rotation.
   If not skidding when sharp turn is required, don't even start
   one.
3) Prevent AI from skidding 'against' track direction (i.e. track
   is turning left, but AI tries to skid right). This happened
   before (e.g. when slightly adjusting steering) and caused
   rapid left/right turns (and skid/stop/skid/stop sequences).
4) Allow some steering in wrong direction when skidding (to allow
   for some incorrect estimations, and to avoid skidding on/off
   sequences when only minor corrections are necessary).
5) If adjusted (i.e. taking the skid steering reduction into account)
   steer fraction when skidding is too high, stop skidding.
6) Re-enabled braking when AI is not aligned with track direction.
7) Improve debug output so that only a state change (skidding to
   non-skidding and vice versa) triggers output (instead of output
   every frame).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11469 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-05 23:27:39 +00:00
auria
21c26f5f54 Improvements to intro part 2
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11465 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-05 01:19:26 +00:00
mbjornstk
9123435b51 Remove useless executable property from image file.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11464 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-05 01:09:20 +00:00
auria
bbf2c6540a Add second part of intro, PRELIMINARY WORK IN PROGRESS VERSION. To switch between intro parts, atm you need to edit main_menu_screen.cpp, see the diff to this file in this commit. There are known issues
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11461 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-05 00:21:46 +00:00
auria
678a45cc9a Fix potential crashes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11458 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-03 22:35:46 +00:00
auria
fd6f2aa617 In screenshot title, use local time instead of GMT time
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11457 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-01 00:14:19 +00:00
auria
8c9c123986 Fix crash when taking screenshot while in menus
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11456 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-01 00:11:55 +00:00
auria
fe03de6851 Only save screenshot on keydown, not on keyup, and also improve date formatting
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11455 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-01 00:08:35 +00:00
auria
cc4affabd4 Add date in screenshots. Sorry, GMT time
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11454 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-08-01 00:03:39 +00:00
auria
90b28e86f1 Remove leftover code from my attempts at findind a working key combination
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11453 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-07-31 23:33:01 +00:00
auria
bf18201b30 Add feature to save screenshot. Try Right-Alt + PrintScreen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11452 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-07-31 23:28:23 +00:00
hikerstk
16cd5fed20 Updated code to properly use the graph (and not just
assume that node n is followed by n1) - though that code
is actually not used.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11451 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-07-31 06:47:05 +00:00
hikerstk
203ae69ce6 Added support in MaxSpeed for an additional engine force
to work while a speed increase is active. This simplifies
existing code (for slipstream, nitro). Additional engine
force is also added for skidding, which should make 
skidding more worthwhile (since usually adjusting the
heading when stop skidding will use up the actual bonus
speed).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11450 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-07-29 23:46:16 +00:00
auria
5f0f8e0346 Make gnu stop playing flute when he's abducted
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11449 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-07-29 19:16:59 +00:00
auria
1ae417fcb2 Fix pressing on escape multiple times resetting the fadeout in cutscene
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11448 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-07-28 00:29:45 +00:00
auria
8d68c2a766 Apply patch by nathanm32292394 to better support gpus/drivers that don't support non-power-of-two textures, thanks a lot
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11447 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-07-28 00:18:41 +00:00
auria
de6cfbdcc1 Resist to a couple crash types
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11446 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-07-27 23:01:51 +00:00
hikerstk
f756c9c981 Split skidding handling into three separate functions:
determineTrackDirection, handleCurve, doSkid (the latter
was already implement, but didn't do anything).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11445 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-07-27 06:34:25 +00:00
hikerstk
50e07355f5 Fixed skidding handling for players: players might
press skid while still turning in the opposite direction
(due to the delay with which the turning reacts). Therefore
skidding is only triggered when steering has nearly reached
full left or right (this code was by accident removed in
a previous commit).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11444 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-07-27 06:31:04 +00:00
wardje
f6689f382c Some coding style changes (mostly comments)
Sorry for the big recompile because of it, had some of these
after some experimenting and it was clouding my svn diff.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11443 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-07-26 21:24:15 +00:00
wardje
f24fa3e0a3 Remove smooth-normals warning
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11442 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-07-26 02:37:23 +00:00