Commit Graph

102 Commits

Author SHA1 Message Date
hikerstk
93e15df841 1) Replaced all .projectile files with one powerup.xml file,
replaced items.item with items.xml. Cleaned up item_manager
   and removed support for different item styles (since it
   didn't work anyway)
2) If a swapper item is used while items are swapped, they will
   now un-swap.
3) Moved all models and textures from data/items to data/models.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4648 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-07 02:05:21 +00:00
hikerstk
8be9c3397a Added first version of switch collectable.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4635 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-04 22:53:24 +00:00
auria
5d2d0973f2 Added back support for detecting bogus resolutions when switching, and revert to the previous working one when user can't click confirmation button
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4628 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-04 00:45:24 +00:00
auria
af02da1267 Eclude from resolution choices resolutions that are too small (and that STK's GUI does not support)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4627 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-03 21:56:45 +00:00
auria
f1c9b285fa Fixed resolution switching closing STK. Includes a totally ugly workaround a irrlicht behaviour I don't understand
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4626 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-03 21:47:36 +00:00
hikerstk
5def2dd4f6 Fixed bullet debug view.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4593 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-31 23:08:23 +00:00
auria
fd5730a0da Better cursor show/hide management (esp. cursor will show in in-game dialogs)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4565 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-30 19:53:06 +00:00
mbjornstk
17949c6ffe Better var names and make obvious that until counter expires FPS will not show.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4555 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-29 02:03:45 +00:00
mbjornstk
f1353892c1 Ignore FPS values at start, too many times they are misleading.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4554 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-29 00:38:40 +00:00
hikerstk
2f9f6a4db4 Fixedc typo in previous commits.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4552 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-28 12:01:28 +00:00
hikerstk
ef373115d3 Missing file in previous commit.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4551 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-28 11:54:01 +00:00
auria
998cc50ed0 RIP domestic manners
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4535 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-24 23:57:50 +00:00
auria
3920dfe101 Improved black border effect for title font
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4531 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-24 16:48:13 +00:00
hikerstk
cf0e69b48f Removed #include of kart and player_kart from world.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4424 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-10 23:12:29 +00:00
auria
11d864ae7c Attempt at using iconv. Fails miserably for me atm because gettext will only return latin-1 and not UTF-8 like I ask it
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4412 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-08 00:23:31 +00:00
auria
a91591b7c4 Fixed compile warning
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4408 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-07 23:05:43 +00:00
auria
dd9fedd810 Use texture clamping to enhance GUI look
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4407 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-07 23:04:59 +00:00
auria
72c8240bfc Use the irrlicht 1.7 feature that enables smooth scaling in the GUI (ahhhh, my eyes =). A few known issues have been introduced, they will hopefully be fixed soonish.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4406 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-07 22:55:38 +00:00
hikerstk
dcec9bafcf Added support for irrlicht 1.7.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4400 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-05 03:38:35 +00:00
auria
5c432893f3 Gracefully exit when closing window
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4384 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-02 16:28:55 +00:00
auria
f58bc8708b Fixed resolution change messing up kart selection screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4378 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-30 21:28:59 +00:00
auria
27decfcd2a Fixed hiding cursor (responsible was copy and paste)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4377 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-30 21:07:38 +00:00
auria
75149a100c Karts in kkart selection screens are now animation aware and will display the center frame (though elephant still seems slightly off-center, not sure why)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4375 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-30 19:41:59 +00:00
auria
5e5f91247b Added 'starts rotating around head' effect for hit karts
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4358 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-28 19:37:59 +00:00
mbjornstk
5fe41e5625 Run expand -t4 to convert tabs to spaces. No other whitespace fixes, but
there are still trailing spaces and lines with 5 spaces as indent (fix them
as the files are changed for other reasons). src/guiengine/CGUIFont.* and
src/bullet/ not processed to allow cleaner updates from upstream.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4320 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-18 00:36:35 +00:00
hikerstk
81eeb36edb Added a minimum speed karts need in order to use slipstreaming. Removed debug output.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4274 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-09 03:50:44 +00:00
auria
62f3ea1411 Now more different stuff comes out of the chest
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4250 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-06 02:05:45 +00:00
auria
a2357958f9 Now something comes out of the feature unlocked chest
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4248 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-06 01:30:39 +00:00
auria
3a8473e8c6 Added animated Wilber by Rudy & Xapantu
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4237 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-05 15:17:32 +00:00
hikerstk
5b58714fff Revmoed support for irrlicht 1.5 (which doesn't have all functions we need anyway).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4236 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-04 01:09:40 +00:00
hikerstk
ed9bd38402 Some redesign of split screen to enable proper handling of
ambient light changes.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4229 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-11-29 13:04:57 +00:00
hikerstk
a5a90be806 1) Started to add split screen (though not all parts of the race gui are displayed correctly yet).
2) The name of an AI kart will now only get the AI name added if it's profile mode (to prevent
   the name with AI name to be displayed in game)
3) Some code cleanup.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4226 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-11-23 05:20:05 +00:00
auria
8ac714a8f6 Partial fix for lighting issues
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4152 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-26 00:03:23 +00:00
hikerstk
645e79fe30 Made mipmaps the default for b3d files, independent of the mipmaps
flag setting in the file.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4119 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-15 23:43:43 +00:00
auria
3b85e07f68 Fixed crash
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4118 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-15 22:11:02 +00:00
auria
10e039ba7e Removed the CutScene adapter, the new event handling for Screen does not require that kind of thing anymore to combine 2D and 3D, and to use animations
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4115 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-13 19:14:17 +00:00
auria
d7c7861bd1 Removed many 'using namespace' from headers
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4111 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-12 23:43:14 +00:00
auria
0f14b098cd Completely removed the IRR_SVN macro, makes it confusing for people trying to build STK from autotools. irrlicht version is now detected from irrLicht includes.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4092 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-06 19:17:16 +00:00
auria
8b466a6b39 Working towards support for 'cutscenes' (nothing fancy, just a small animation when you finish a challenge, etc.). Navigation is there, though display is all messed up and I still need to figure out why. The network button in main menu is currently (and temporarily) used to test this
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4073 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-04 01:16:00 +00:00
hikerstk
0a84da2726 Applied Hendrik's patch:
Adding command line option --renderer.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4023 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-15 04:48:14 +00:00
hikerstk
0a5e7ba293 Bugfix: the 'circles' representing karts in minimap were not working anymore.
To auria: something's weired with the rtt - you are calling setRenderTarget
twice - but it looks like it's not working for the kart screen otherwise.
I've worked around so that at least the 2d rendering works as expected (with
a single call).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4014 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-08 12:50:52 +00:00
auria
5aa52c20ce Implemented viewing the help menu in-game
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4009 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-06 18:45:38 +00:00
auria
22f6c6e008 First (rough) version of an end-of-race dialog
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3974 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-01 18:11:26 +00:00
auria
d35635f1f6 Disabled clearing of the back buffer since it's unused and would only slow down rendering uselessly (this implies all tracks will need skydomes, but i think we agree we don't want the blue sky of death anyway)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3968 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-30 23:10:34 +00:00
auria
c42429b7d0 RTT can now handle rendering multiple sets of different objects at once (required for multiplayer kart selection)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3955 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-29 19:59:27 +00:00
auria
1281cc5cfd Reduced FOV in kart preview rendering so that they look more natural (less 'stretched')
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3949 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-29 17:23:00 +00:00
auria
ff2dd24ec6 Cleaned up render-to-texture code. It should be much more efficient for kart rendering, and also code should be easier to read. @Joerg: I think I didn't break your RTT bits but better check *blush*
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3948 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-29 17:09:03 +00:00
hikerstk
88abe09dd6 1) Added --kartdir directive, allowing loading of
additional karts from other directories.
2) Fixed potential bug (--track might have allowed you to
   run a locked track)
3) --list-tracks and --list-karts can now keep on running
   (before STK would be ended) - but they are slower now
4) Renamed all kartname.irrkart file to kart.xml. I realised too
   late that those files had not been converted to xml yet.
   It will be fixed later.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3930 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-27 06:22:52 +00:00
hikerstk
184ba6269e Bugfix: the circles for the karts on the minimap were not shown
when the game was started using the menu (instead of -N command
line option).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3878 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-18 09:41:53 +00:00
hikerstk
405ee12ca5 Fixed various memory leaks.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3857 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-13 23:26:38 +00:00