Commit Graph

13702 Commits

Author SHA1 Message Date
hiker
d20441d45e Modified to trigger automatic cmake run. 2014-11-03 08:34:47 +11:00
hiker
fa680e8903 Merge branch 'Flakebi-perPlayerDifficulties' 2014-11-03 08:33:51 +11:00
hiker
ed10b022d2 Use a group for handicap related config settings. 2014-11-03 08:32:35 +11:00
hiker
62b81b3e9a Shortened labels to fit on smaller screens. 2014-11-03 08:23:35 +11:00
hiker
0be0d7ee72 Merge branch 'perPlayerDifficulties' of https://github.com/Flakebi/stk-code into Flakebi-perPlayerDifficulties 2014-11-03 06:52:31 +11:00
hiker
6f46f5a8b3 Support for gamepad-specific button/axis names. Added name for xbox
controller.
2014-11-02 23:13:49 +11:00
Vincent Lejeune
5557a0165a Fix rtt crash 2014-11-02 00:21:54 +01:00
auriamg
7d06cfa2d0 Merge pull request #1652 from tobbi/fix_mac_compilation
Fix compilation on OSX 10.10
2014-11-01 18:53:23 -04:00
Vincent Lejeune
6aed902ae0 Store depth in color buffer instead of depth
This allows for instance to blur it using already existing shaders
2014-11-01 22:38:38 +01:00
Tobias Markus
4861a52c3f Fix compilation on OSX 10.10
Closes #1646
2014-11-01 22:22:58 +01:00
hiker
f2e33b1000 Fixed compilation (accidentally added some wip code). 2014-11-01 12:27:09 +11:00
hiker
9f0d1f00ea Inreased default deadzone to 4096. 2014-11-01 12:22:20 +11:00
hiker
6a296aab62 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-11-01 12:13:44 +11:00
hiker
15e712ba49 iFix #960: impossible to configure xbox controller. The xbox controller
can have a rather huge deadzone, which prevent detection when a axis
was released.
2014-11-01 11:58:04 +11:00
Vincent Lejeune
b80ecb48f4 Merge branch 'cullingdebug' 2014-11-01 00:21:26 +01:00
Vincent Lejeune
aba6c00fc6 Add profiler 2014-11-01 00:12:54 +01:00
hiker
8aac6ca6d0 For now comment out debug messages. 2014-11-01 09:54:21 +11:00
hiker
62ef836e7c Bugfixes: set number of buttons in the configuration (since it is
not saved in the config file), use floating point in desensitizing.
2014-11-01 09:53:13 +11:00
hiker
b992375c58 Added missing initialisation. 2014-11-01 09:51:42 +11:00
Vincent Lejeune
b95fb6d030 Do some kind of hierarchical culling 2014-10-31 23:39:06 +01:00
Vincent Lejeune
7489c7bceb Use classic scene manager parsing for cull algorithm 2014-10-31 23:38:59 +01:00
Vincent Lejeune
979d872fe0 Remove quick culling
Sometimes it returns wrong results
2014-10-31 23:29:42 +01:00
Vincent Lejeune
cf18a8ee20 Display bounding boxes 2014-10-31 23:29:41 +01:00
Marianne Gagnon
9c9c4d2fcf bugfix: auto-calculate tangents for static-mesh too 2014-10-31 23:29:40 +01:00
Flakebi
9ca1c03480 Applying merges correctly is difficult... 2014-10-31 18:54:52 +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
98c8985739 Removed unused constants. 2014-10-31 21:06:26 +11:00
hiker
e9e5cab164 Added option to 'desensitze' joysticks, i.e. make it less sensible
at values close to 0.
2014-10-31 16:32:39 +11:00
hiker
22441c1fd8 Forgot to add isAnalog() function for gamepads. 2014-10-31 16:19:31 +11:00
hiker
b56280761f Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-31 15:32:26 +11:00
hiker
e2d17bcf88 Added 'isAnalog' functionality to avoid that gamepads on full left/right
steering will delay steering because of time-full-steer. Added some
virtual destructors.
2014-10-31 15:18:26 +11:00
hiker
086705ab3e Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-31 12:30:44 +11:00
hiker
c72ff275ec CURRENT can not be defined as result of or-ing the values, since the
values are not bit masks.
2014-10-31 12:29:15 +11:00
Vincent Lejeune
a54d03377b Remove quick culling
Sometimes it returns wrong results
2014-10-31 02:16:23 +01:00
Vincent Lejeune
6ea56bb974 Display bounding boxes 2014-10-31 01:46:35 +01:00
Marianne Gagnon
6429d394e5 bugfix: auto-calculate tangents for static-mesh too 2014-10-30 19:57:03 -04:00
hiker
ca6a0accaa Fixed compilation in release mode. 2014-10-31 09:14:18 +11:00
hiker
4986deebd6 Removed number of axes and buttons from GamepadDevice, and use the
values from GamepadConfig instead.
2014-10-31 08:16:15 +11:00
hiker
e9980fcb2f Completely removed device type, instead use isGamePad() and
isKeyboard().
2014-10-30 17:43:50 +11:00
Marianne Gagnon
aac454f846 Fix bug in feature unlocked screen, improve error message 2014-10-29 20:07:01 -04:00
Vincent Lejeune
ee687440c7 Increase shadow filtering 2014-10-29 18:57:39 +01:00
deve
ab82e3f62a Fixed cmake warning.
Angelscript is not separated project, but static library.
2014-10-29 09:30:03 +01:00
hiker
25bbc06109 Made m_type in DeviceConfig private. 2014-10-29 16:41:26 +11:00
hiker
ce9cfa3bc8 Removed unnecessary #include. 2014-10-29 16:41:04 +11:00
hiker
7b809636d4 Made m_plugged and m_name in DeviceConfig private. 2014-10-29 16:37:27 +11:00
hiker
0264677750 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-29 15:44:24 +11:00
hiker
721c8bfa88 Made m_enabled in DeviceConfig private. 2014-10-29 15:44:05 +11:00
Marianne Gagnon
09953e622e Fix crash 2014-10-28 20:09:20 -04:00
Vincent Lejeune
25c017b5fd Reenable normal visualisation 2014-10-29 00:40:30 +01:00
Marianne Gagnon
bf0f75a367 Fix (again) initial scattering of now so that it falls evenly 2014-10-28 19:06:29 -04:00