51 Commits

Author SHA1 Message Date
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
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
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
rforder
3119dec5c2 temporary work around for multiplayer kart selection
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3855 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-13 21:58:55 +00:00
rforder
db1c53fa94 Moved the handling for the fire & rescue buttons in the kart selection menu out of the device manager & into the input manager (which makes more sense). No more setting the action to PA_FIRST to signify that it was handled internally (too hackish).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3842 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-12 18:19:02 +00:00
rforder
2a23fa33a8 Fixed sticky joysticks... again.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3828 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-09 19:04:06 +00:00
rforder
aee48faca8 Updated input configuration GUI to work correctly with recent changes to the input system.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3826 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-09 18:12:35 +00:00
rforder
cf8e767f5c more input code clean-up
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3823 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-09 04:12:04 +00:00
rforder
21fb622a6d Broke down mapInputToPlayerAndAction() into several composite functions to increase readability & ease efforts to debug.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3822 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-07 17:31:14 +00:00
rforder
1d681112af Fixed sticky joystick bug that cropped up in the last commit
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3818 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-07 00:29:43 +00:00
rforder
f12463b4c9 Fixed temporarily broken keyboard support.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3816 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-06 20:13:22 +00:00
rforder
f3e3206b26 More cleanup for the input system. Removed a lot of functions from InputDevice that won't be used there anymore.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3815 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-06 19:05:26 +00:00
rforder
9ba0bd67d2 Added new DeviceConfig class (/config/device_config.cpp) for review. The DeviceConfig class will be responsibile for handling Gamepad and Keyboard configurations. It is now possible to share a single configuration between identical devices. Begun integration, still needs *a lot* of cleanup, but basically works.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3814 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-06 18:00:18 +00:00
rforder
9f38ccb15b ================================================================================
Temporary fix for multicontroller problems.  This fix will support multiple 
controllers with the same name, but there will be one entry in the config file
for each controller.  No longer creates multiple entries for each controller.
Need to correct a few other problems before this can truly be completed.



git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3805 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-04 20:18:43 +00:00
auria
aceea4b120 Controller patch by Bob Forder - thanks\!
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3789 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-31 23:50:40 +00:00
auria
85266dfe10 Started mammoth cleanup of GUI code. Separated the generic GUI engine and the STK-specific bits (still work to do on this side)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3764 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-18 17:48:36 +00:00
auria
a44b531525 Replaced usage of some confusing IDs with more explicit pointers
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3736 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-12 00:18:37 +00:00
auria
ab4787f884 Fixed in bug in the device manager that could cause crashes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3734 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-11 19:29:33 +00:00
auria
ab4cdcae00 A player can now remove himself by pressing rescue at the kart selection screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3733 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-11 19:24:42 +00:00
auria
f987fff348 more work on multiplayer kart selection screen & multioplayer input
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3731 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-11 16:50:57 +00:00
auria
8eaef3f63b Better player detection. Still getting some problems with irrlicht widgets : they internally catch some events without asking me. For instance, in 'press fire to join', if player has 'fire' assiged to the spacebar, pressing the spacebar results in irrlicht pressing the currently button - not sure how to get around this.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3726 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-11 01:56:07 +00:00
auria
18dc556fe6 Added functions to clean-up input after a game (though they're not called yet)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3702 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-04 20:09:49 +00:00
auria
a7abbf4c82 More work towards multiplayer (player 1 is now assigned an input device when pressing 'new game'). Cleanup when restarting game not implemented
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3701 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-04 20:00:18 +00:00
hikerstk
ee90eca26e 1) Created new config subdir and moved the last remaining files into
appropriate subdirs (only main.cpp and main_loop.?pp are now directly
   in the src directory).
2) Cleaned up all #include directives, so that all files now use
   the right subdirectories.
3) Some minor code cleanup.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3606 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-06-11 10:00:43 +00:00
auria
1f7ec5ae58 hopefully fixed Arthur's issue + more code work towards gamepad support
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3563 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-05-31 01:27:21 +00:00
auria
72c4ac468a playing around a bit more with input. added debug prints to corner what's happening on Arthur's computer
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3561 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-05-31 00:40:42 +00:00
auria
dc84e15685 cleaned up old TuxKart crap left in input module (variables id0, id1, id2, whose meaning change from device to device... how brilliant)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3553 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-05-30 18:57:25 +00:00
auria
d38c6672a1 improved my replacement for plib detectory detection functions
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3517 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-05-18 18:38:51 +00:00
auria
184da61d55 removed debug prints now that the bug is fixed
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3437 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-04-26 00:47:34 +00:00
auria
b0ead848bc removed debug prints now that the bug is fixed
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3436 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-04-26 00:43:31 +00:00
auria
3b0c85f05d added placeholder input config screen. added debug logs for jpenguin
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3430 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-04-26 00:03:46 +00:00
auria
9eea5f5aac gamepad axes work again
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3423 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-04-25 19:26:44 +00:00
auria
6ed09ea3c5 bringing gamepad back in (won't work in game but will be detected, watch terminal)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3422 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-04-25 18:25:08 +00:00
auria
87a274fc77 started removing SDL from STK. Gamepad input broken, maybe keyboard a bit too. Default bindings changed because some keys on mac are ignored by irrlicht (known bug, fixed in enxt version IIRC)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3421 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-04-25 17:55:39 +00:00
auria
71f99430c1 more attempts at fixing gamepad buttons
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3333 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-31 20:49:51 +00:00
auria
43ed6ea083 fixed bug related to axes vs buttons
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3331 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-31 20:33:44 +00:00
auria
ac211ab6de made input config file valid XML by adding a global container tag
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3327 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-31 15:14:23 +00:00
auria
a32dd4c5aa only write config file when needed + other cleanup
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3322 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-30 01:42:12 +00:00
auria
5b50990c3e removed debug checks that are no more needed
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3320 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-30 01:22:53 +00:00
auria
5ca3f169ca more gamepad fixes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3319 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-30 01:21:43 +00:00
auria
9c727717aa improved somewhat joystick loading from config, and added debug logging to help find what's wrong with minibjorn's
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3318 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-30 01:15:52 +00:00
auria
15e2386398 attempt at saving and loading gamepad configs to/from config files. support for multiple gamepads is theorically possible though configs can only be changed by editing the config file. joystick users will need to test and report (and help me) since i can't go much farther than that
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3316 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-30 00:58:12 +00:00
auria
06cfbc2aeb keyboards will now read their config from file (only default keyboard, support for multiple configs to come later)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3315 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-30 00:19:24 +00:00
auria
51231429e1 started writing new XML config file
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3314 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-29 23:37:21 +00:00
auria
81d860a1ab improved joystick code again
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3312 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-29 18:43:39 +00:00
auria
174a753997 restored more gamepad code (hopefully cleaner but not tested)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3311 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-29 16:15:17 +00:00
auria
34f8e281d7 bringing gamepad input a bit more in. help me with testing please - i can somewhat fake gamepad input with some utility but it's not too handy
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3310 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-29 15:51:55 +00:00
auria
38ff0a3d46 bringing back some joystick code (can't test since i don't own one XD I will need help on this probably)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3296 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-23 19:09:16 +00:00
auria
10eadc6090 some cleanup over previous commit
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3295 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-23 18:46:35 +00:00