Commit Graph

163 Commits

Author SHA1 Message Date
hikerstk
ac85c71e31 Removed 2nd debug key for bubble gum, added debug key for bowling ball.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/switch_coordinate_system@4945 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-03-06 00:42:18 +00:00
hikerstk
d7c44cc93d Physics debug mode now cycles through off, show karts and collision shape,
to show only collission shape and then back to off. The command line
option --bullet-debug was removed.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/switch_coordinate_system@4853 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-26 07:03:12 +00:00
hikerstk
f41150eae7 Replaced OpenGL bullet debug view with irrlicht bullet debug view.
Debug view can now be switch on and off during a race (ctl-F11),
but currenlty does not display as much information as the 
original debug view (more to be implemented here).
Removed glut dependency.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4794 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-22 12:02:13 +00:00
auria
b868909efe Some cleanups with ActivePlayer. Moved it to StateManager, because that's where active players are created and stored - this will be less confusing than hiding it inside a configuration class. More work is still to be done if we want to make this code really clean, though.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4764 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-18 21:28:32 +00:00
hikerstk
da3de6d131 Big code refactoring: instead of having auto_kart, player_kart, the karts
now use a 'controller' object which is responsible for its steering, e.g.
a default_ai_controller, player_controller etc. This makes it easier to
switch a player kart to use a end-of-race computer controller to drive
the kart once the race is finished (though that's not implemented yet).
I expect some bugs with restarting race, and perhaps end of race
behaviour at this stage.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4714 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 00:54:28 +00:00
hikerstk
328373289a 1) Moved access to world object from race_manager to static functions in
world.
2) Removed more dujplicated/unnecessary functions from race_manager
   (getPlayerKart, getTrack).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4682 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-11 07:11:52 +00:00
hikerstk
47a1a1dfa2 Removed m_local_player_karts vector from world.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4678 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-10 12:47:18 +00:00
mbjornstk
6f2a459096 Add bubblegum to cheats (F5) and make real gum become small nitro on swap.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4662 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-07 21:14:08 +00:00
hikerstk
566e12d129 1) Removed bubblegum as a separate object, instead bubblegums are now
created as normal items. 
2) Now bubblebum can be used in swapping as well, so all nitro become
   bubblegums, and all bubblegums become items.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4657 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-07 08:49:36 +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
5bfebb1425 Fixed bug that allowed players that had backed from the kart selection screen to use their device to make selections later on
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4615 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-02 01:08:47 +00:00
auria
702fc9b92e Improved file names consistency
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4506 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-21 22:55:08 +00:00
hikerstk
037069a257 Improved handling of directory for user configuration files to work even if $HOME/.config
does not exist, and moved handling of files and directories from user_config to file_manager.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4467 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-15 01:46:03 +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
2dd0a904b6 Improved buttons to have their size depend on text contents; made the 'enter' key trigger a PA_FIRE action
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4388 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-02 20:55:19 +00:00
auria
4768654113 Fixed subtle input issue (problem assigning mouse to the right player when keyboard config used is not the first)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4381 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-02 01:55:20 +00:00
auria
2fb710f30b Implemented adding keyboard configs through the GUI
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4357 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-28 18:13:24 +00:00
auria
df422703ac Much cleanup and documentation in input code, which was done on the way of fixing a bug that dealt with multiple and/or custom keyboard configs and menu navigation
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4355 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-27 19:12:44 +00:00
auria
2caccb8c6e Fixed input bug that occurred when going back in menus
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4354 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-27 18:41:19 +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
auria
958c107969 non-game-master players are now also prevented from altering race setup screens using mouse
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4266 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-06 19:29:35 +00:00
auria
e20f805e61 In multiplayer mode, players other than the game master should not be able to select stuff in race setup menus
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4265 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-06 19:22:57 +00:00
auria
d58d42b27d Fixed input device association bug when starting game clicking and a gamepad is plugged
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4254 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-06 16:23:17 +00:00
auria
a5edabee75 Fixed input mode not properly reset when exiting race
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4253 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-06 16:06:39 +00:00
auria
bed690a4d1 Support for multiple keyboard players (but you can't add a 2nd keyboard through the GUI atm, it needs to be done in the config file)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4224 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-11-14 15:19:40 +00:00
auria
cb91674631 Started adding support for multiple keyboard players (does not work at kart selection screen atm)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4223 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-11-14 15:09:34 +00:00
auria
bc9f8ebf6c Improved assignment of mouse to which player (a few known glitches when game master uses a gamepad, but getting better overall)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4193 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-11-02 01:04:05 +00:00
auria
32968a2454 Removed useless TODO
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4189 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-11-01 01:11:33 +00:00
auria
26d1917d31 Fixed that, when you brought up a dialog asking you to type text by pressing a button with the spacebar, a space was added into the text box
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4188 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-11-01 00:42:16 +00:00
auria
129c93f4bf Fixed pressing space in text areas (/me should beware about static variables in header files...)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4186 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-31 23:35:54 +00:00
auria
729ccbc79b Fixed keyboard navigation & text boxes, improved the visual clues that it's focused
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4184 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-31 23:06:58 +00:00
auria
22a7479a59 Cleanup in input & GUI code
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4182 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-31 22:03:20 +00:00
auria
1292e2a37f Yay for another mammoth commitsvn rm src/states_screens/options_screen.hpp Major cleanup in screens event handling, so that I can look at my code without being ashamed ;)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4077 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-04 23:59:05 +00:00
auria
8b9d4bd2e7 Cleaned up event propagation code a lot to stop using different contradictory conventions, and to be easily read
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4051 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-27 19:43:22 +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
d891996797 Fixed crash in game dialogs + Fixed input sensing issue
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4008 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-05 17:27:14 +00:00
auria
27b4537cd2 Tweaks to event handling to fix keyboard navigation and dialogs (more work still needed)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4005 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-05 16:08:13 +00:00
auria
10b589b168 More work on in-game dialogs
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4004 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-05 15:46:24 +00:00
auria
c3f0f7ab82 Massive conversion from std::string to stringw for all strings that need to be translated. Currently, translation is broken (strings i try to transalte appear as junk) -- since irrlicht GUI widgets all use wchar_t, using std::string in UTF-8 just didn't make it
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3963 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-30 18:21:59 +00:00
auria
b39414cf8e Many more I18N clarifications, and fine-tuning of extracting strings from XML files
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3960 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-30 01:50:22 +00:00
auria
e655b6330b Updated french translation so that I can test transaltion of menus eventually
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3958 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-30 00:00:15 +00:00
auria
d9707351ea First steps towards letting two different players choose their own kart
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3932 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-27 18:41:20 +00:00
auria
8417a50796 Fixed keyboard navigation on kart selection screen (still 1-p only though)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3923 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-26 20:05:51 +00:00
auria
67b46fe67c Fixed bug I introduced while fixing warnings
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3920 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-26 18:12:11 +00:00
auria
452808838a Fixed various warnings
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3916 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-26 15:18:14 +00:00
hikerstk
96dc2a8fe2 Cleaned up StringUtils: used 'better' names (e.g. getPath()
instead of path()), and used our convention of using capitalization
for words (and not _). Started adding support for additional track
directories, but that's not working yet.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3912 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-24 05:56:53 +00:00
rforder
b5e25d1298 Fixes key-up propagation bug in menu system
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3890 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-19 17:48:02 +00:00
auria
a2e93a9b2c Don't show music desc when music is off
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3869 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-16 20:55:06 +00:00
auria
b7c8b77952 Improved input handling with modal dialogs & text boxes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3868 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-16 19:36:52 +00:00
auria
600ac7ebf5 Fixed backspace in new player dialog dismissing the dialog
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3867 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-16 19:25:15 +00:00