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 |
|
hiker
|
a14423ac2a
|
Bugfix: the number '4' would not be displayed correctly if used
as input key.
|
2014-10-27 16:55:49 +11:00 |
|
hiker
|
99f69f4070
|
Moved KeyboardConfig and GamepadConfig from DeviceConfig to their
own separate files.
|
2014-10-27 13:26:52 +11:00 |
|
Marianne Gagnon
|
32c5d79e26
|
World : do not self-destruct until everything completely done
|
2014-10-26 19:05:07 -04:00 |
|
Flakebi
|
f27597c450
|
Revert "Fix incorrect alignment in spinner widgets"
This reverts commit 4cb8be6ab4 .
|
2014-10-26 18:02:28 +01:00 |
|
Flakebi
|
46f3fa5f74
|
Merge branch 'upstream/master' into perPlayerDifficulties
Conflicts:
data/gui/options_ui.stkgui
src/graphics/stkmesh.cpp
src/states_screens/options_screen_ui.cpp
|
2014-10-26 17:47:29 +01:00 |
|
Flakebi
|
4cb8be6ab4
|
Fix incorrect alignment in spinner widgets
|
2014-10-26 17:10:28 +01:00 |
|
Flakebi
|
690e632e1b
|
Move handicap to ui options and to the player name spinner
|
2014-10-26 16:56:50 +01:00 |
|
Arthur-D
|
ef2cf3b17d
|
Sorry for the previous messy merge - no files were changed remotely so should be safe. Due to my mishap I need to commit the files I wanted to again. Those are new bg images for achievement and friend notifications. Feedback welcome.
|
2014-10-26 15:34:51 +01:00 |
|
Arthur-D
|
4ed59d8a4d
|
Merge branch 'master' of https://github.com/supertuxkart/stk-code
|
2014-10-26 14:10:31 +01:00 |
|
hiker
|
e8f509eefe
|
Moved DeviceConfig from config to input directory.
|
2014-10-26 23:26:02 +11:00 |
|
hiker
|
ec908d85c6
|
Split GamepadDevice and KeyboarDevice from input_device into their
own files. Renamed InputManager::getDeviceList() to getDeviceManager().
|
2014-10-25 23:09:00 +11:00 |
|
hiker
|
d63a5dba45
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-10-25 10:36:19 +11:00 |
|
hiker
|
d8cb6e1069
|
Moved #include to the top.
|
2014-10-25 10:32:28 +11:00 |
|
Marianne Gagnon
|
047c6fc760
|
Add debug name to meshes and mesh buffers, helps debugging
|
2014-10-24 19:25:24 -04:00 |
|
hiker
|
759182bb68
|
Used SDL's joystick name detection on windows.
|
2014-10-25 10:18:27 +11:00 |
|
hiker
|
1cd5ffd484
|
Fixed compiler warning.
|
2014-10-24 21:48:14 +11:00 |
|
hiker
|
6893e94e71
|
Replaced irrXML usage with out XMLNode.
|
2014-10-24 21:47:50 +11:00 |
|
hiker
|
2d5af3bee8
|
Change the text of the login name dynamically (i.e. from local
name to online name).
|
2014-10-24 16:52:37 +11:00 |
|
hiker
|
d1f68ca480
|
Go to the user screen when clicking on the user button.
|
2014-10-24 14:00:51 +11:00 |
|
hiker
|
f7893afbef
|
Adjusted button position, thanks to auria.
|
2014-10-24 11:16:08 +11:00 |
|
hiker
|
b5db6f3270
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-10-24 10:35:55 +11:00 |
|
hiker
|
8bc6aa91bb
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-10-24 10:34:59 +11:00 |
|
hiker
|
1920703f09
|
Converted label to button, just for tests.
|
2014-10-24 10:34:10 +11:00 |
|
hiker
|
f6aa05ec1c
|
Modified to trigger automatic rerun of cmake.
|
2014-10-24 10:30:23 +11:00 |
|