Commit Graph

13832 Commits

Author SHA1 Message Date
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
Sachith Hasaranga Seneviratne
ebb914d0ef Added basic caching for scripts 2014-10-31 16:23:56 +05:30
hiker
98c8985739 Removed unused constants. 2014-10-31 21:06:26 +11:00
Sachith Hasaranga Seneviratne
9822234fc5 Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptCache 2014-10-31 15:28:05 +05:30
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
Sachith Hasaranga Seneviratne
2c70eb5cc7 Remove unnecessary engine releases within script engine lifetime 2014-10-29 17:42:58 +05:30
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
Vincent Lejeune
40932fadeb Make resolution change more robust 2014-10-28 23:43:41 +01:00
Vincent Lejeune
cd74ee0d87 Use correct sampler for azdo mode for rubber band 2014-10-28 23:19:42 +01:00
vlj
93d03c53b9 Merge pull request #1644 from tobbi/fix_mac_compilation
Add default constructor to class Tuple<>, fixes issue #1643
2014-10-28 22:42:13 +01:00
hiker
29f5b14e45 More refactoring. Created factory for DeviceConfigs. 2014-10-29 08:22:25 +11:00
Arthur-D
6c0ace85ee Slight improvement on notification backgrounds. Feedback welcome. 2014-10-28 07:16:29 +01:00
hiker
92196c7534 Made processAndMapInput a pure virtual function of InputDevice, which
is implemented in Keyboard- and GamepadDevice.
2014-10-28 17:04:00 +11:00
hiker
9d5fd13ae9 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-28 16:10:16 +11:00
hiker
ab915b20a3 Use toIrrVector(). 2014-10-28 16:00:28 +11:00
Vincent Lejeune
891330a8f3 Do fast culling inside precise culling 2014-10-28 01:40:02 +01:00
hiker
39b8f79f9f Fixed conflicts with my refactoring work. 2014-10-28 10:14:38 +11:00
hiker
a0b7b1003d More work on refactoring input devices (still wip). 2014-10-28 10:14:04 +11:00
hiker
891b0697dc Fixed compilation on VS. 2014-10-28 10:13:44 +11:00
hiker
f7d767e57b Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-28 09:47:28 +11:00
Marianne Gagnon
139f20b39d Merge remote-tracking branch 'sachith/ScriptEngine'
Conflicts:
	CMakeLists.txt
	sources.cmake
	src/io/file_manager.cpp
	src/io/file_manager.hpp
	src/modes/world.hpp
	src/tracks/track.hpp
	src/tracks/track_object_presentation.cpp
2014-10-27 18:43:09 -04:00
Tobias Markus
1acfc4a878 Add default constructor to class Tuple<>, fixes issue #1643 2014-10-27 23:12:07 +01:00
hiker
9e9ce47a2b Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-28 09:02:35 +11:00
hiker
b66fb2e56b Removed unnecessary parameter for gamepads in processAndMapInput,
started a common virtual function for processAndMapInput. Removed
unnecessary #includes, cosmetic changes.
2014-10-28 09:00:22 +11:00
hiker
9d06c276b2 Removed unnecessary line breaks. 2014-10-27 17:03:41 +11:00
hiker
bb24585229 Fixed error in xml writing. 2014-10-27 17:03:16 +11:00
hiker
3235633bbc Fixed copy&paste error. 2014-10-27 16:56:27 +11:00