Alayan-stk
|
448a7eb94f
|
Fix issue #1108
|
2014-11-09 16:54:01 +01:00 |
|
Sachith Hasaranga Seneviratne
|
ebade1f3aa
|
Disabled callback for now
|
2014-11-09 18:33:11 +05:30 |
|
Sachith Hasaranga Seneviratne
|
d9b73907fe
|
Added basic line callback
|
2014-11-09 18:32:20 +05:30 |
|
Sachith Hasaranga Seneviratne
|
b7beff1406
|
Added map container for script cache
|
2014-11-09 17:35:01 +05:30 |
|
Sachith Hasaranga Seneviratne
|
f8cb8c75bb
|
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptCache
|
2014-11-09 14:55:46 +05:30 |
|
samuncle
|
e20d8bdcdf
|
Merge branch 'master' of https://github.com/supertuxkart/stk-code into lensflare
Keep lens flare updated with trunk
|
2014-11-08 01:51:40 +01:00 |
|
hiker
|
5401e7f3b7
|
First try to prevent #1566: kart chassis appears inside of terrain.
|
2014-11-08 11:43:06 +11:00 |
|
Vincent Lejeune
|
833f162d1a
|
Enable m_support_sdsm by default
|
2014-11-08 01:19:27 +01:00 |
|
samuncle
|
1e547652f7
|
Merge branch 'master' of https://github.com/supertuxkart/stk-code into lensflare
Keep lens flare updated with master
|
2014-11-07 16:14:11 +01:00 |
|
Vincent Lejeune
|
d7f3198ac9
|
Merge branch 'sdsm'
|
2014-11-07 13:42:29 +01:00 |
|
Vincent Lejeune
|
909948c9a4
|
Implement depth histogram to position cascade split
|
2014-11-07 13:42:13 +01:00 |
|
Vincent Lejeune
|
cacb008ae6
|
Prepare compute shader to stretch lightcoord
|
2014-11-07 13:42:13 +01:00 |
|
hiker
|
3c88898113
|
Fixed --camera-wheel-debug command line option (better distance
computation, no smoothing); removed unused function.
|
2014-11-07 16:36:03 +11:00 |
|
Marianne Gagnon
|
2c8f86fabd
|
Intro cutscene fixes
|
2014-11-05 18:13:47 -05:00 |
|
hiker
|
ce0d713dd3
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-11-05 23:25:29 +11:00 |
|
hiker
|
884daf9093
|
Fix #1665 (kart hovering in pyramid after jump) by only cushioning with
half the computed impulse.
|
2014-11-05 22:53:25 +11:00 |
|
Flakebi
|
9dd86c8332
|
Don't handicap AIs
|
2014-11-04 23:57:33 +01:00 |
|
Flakebi
|
5a84b471e4
|
Add 'handicapped' to player name
|
2014-11-04 23:36:16 +01:00 |
|
samuncle
|
52bc4cebd4
|
Add the lensflare shader
|
2014-11-04 21:15:18 +01:00 |
|
samuncle
|
bea2586af3
|
Preparing lens flare branch
|
2014-11-04 21:12:26 +01:00 |
|
Vincent Lejeune
|
92ecd01e61
|
Make cascade split modifiable
|
2014-11-04 20:53:32 +01:00 |
|
Deve
|
6d07189474
|
Don't allow doubled tracks in random GP.
Otherwise track number limit wouldn't have sense.
|
2014-11-04 20:27:01 +01:00 |
|
Deve
|
66a1ff2b2b
|
Don't allow to run locked tracks in random GPs
|
2014-11-04 20:10:36 +01:00 |
|
Deve
|
e27e7a0132
|
Reset kart rotation when skidding is broken by rescue animation.
Minor improvements with breaking during skidding.
|
2014-11-04 11:27:07 +01:00 |
|
Vincent Lejeune
|
3eafdd9729
|
Culling was wrongly disabled
|
2014-11-04 02:06:17 +01:00 |
|
Vincent Lejeune
|
2f4edb6183
|
Higher value for zmin
|
2014-11-04 01:55:10 +01:00 |
|
Vincent Lejeune
|
c93e6c0ee3
|
Fix shadow glitches in minigolf
|
2014-11-04 01:48:50 +01:00 |
|
Marianne Gagnon
|
aeed2618a4
|
Set anisotropic filtering to 16 on highest graphical level, fixes #1655
|
2014-11-03 17:47:07 -05:00 |
|
samuncle
|
d7caebe847
|
enable vignette during races
|
2014-11-03 21:53:44 +01:00 |
|
Deve
|
3cec4b25fb
|
Set jump animation only if any other animation os not used.
It avoids to break eg. win/lose animation.
Remove unused variable.
|
2014-11-03 16:49:44 +01:00 |
|
Deve
|
01a7094cd8
|
Don't show jump animation during rescue
|
2014-11-03 13:32:23 +01:00 |
|
hiker
|
18bcb92afc
|
Used better variable name.
|
2014-11-03 21:36:54 +11:00 |
|
hiker
|
150941aad2
|
Maintain a flag that indicates if the gamepad device name is 'useful'
(on windows we might get a dummy name, identical for all gamepads).
Only add a number to the gamepad if the device has a useless default
name.
|
2014-11-03 16:37:19 +11:00 |
|
hiker
|
ce488aa98f
|
Removed duplicated A/B handling for xbox/classic xbox; use "thumb button"
instead of "stick button", and more switch instead of if.
|
2014-11-03 13:51:54 +11:00 |
|
hiker
|
e488b61b62
|
More fixes for classic xbox controller.
|
2014-11-03 13:43:50 +11:00 |
|
hiker
|
d2d665b449
|
More fixes for classic xbox controller.
|
2014-11-03 13:34:23 +11:00 |
|
hiker
|
467bc6b34b
|
Try to improve xbox classic controller support.
|
2014-11-03 13:18:45 +11:00 |
|
hiker
|
ff5c3ac65e
|
Try to identify old xbox controllers.
|
2014-11-03 12:45:19 +11:00 |
|
Vincent Lejeune
|
17aafae42c
|
Merge remote-tracking branch 'origin/esm'
|
2014-11-03 01:02:27 +01:00 |
|
Vincent Lejeune
|
f2da00954d
|
Check if textureview is available before filtering
|
2014-11-03 00:57:07 +01:00 |
|
Vincent Lejeune
|
e5b269949a
|
Use polygon offset
|
2014-11-03 00:49:52 +01:00 |
|
Vincent Lejeune
|
70f53a0e51
|
Revert "Reenable again culling for shadows"
This reverts commit 61dd0fdc60 .
|
2014-11-03 00:48:29 +01:00 |
|
Vincent Lejeune
|
61dd0fdc60
|
Reenable again culling for shadows
|
2014-11-03 00:29:44 +01:00 |
|
hiker
|
841ae8814e
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-11-03 08:56:19 +11:00 |
|
hiker
|
3f74ed3911
|
Fixed compiler warnings.
|
2014-11-03 08:56:01 +11:00 |
|
hiker
|
2462aef75a
|
Fixed compiler warnings and coding style issues.
|
2014-11-03 08:55:20 +11:00 |
|
hiker
|
ed10b022d2
|
Use a group for handicap related config settings.
|
2014-11-03 08:32: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 |
|
Vincent Lejeune
|
ebe11370a2
|
Reenable bluring
|
2014-11-02 16:30:44 +01:00 |
|
Vincent Lejeune
|
c5186e3ab3
|
Use depth in exp space
|
2014-11-02 16:26:46 +01:00 |
|
Vincent Lejeune
|
b975b63eea
|
Use proper depth linear value
|
2014-11-02 16:00:41 +01: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
|
1ecd8dcf4f
|
Fix moiré pattern
|
2014-11-02 02:37:20 +01:00 |
|
Vincent Lejeune
|
f4e0437106
|
Fix textureview
|
2014-11-02 02:37:19 +01:00 |
|
Vincent Lejeune
|
6bf5c13bde
|
Implement shadow blur
|
2014-11-02 02:37:19 +01:00 |
|
Vincent Lejeune
|
57b6d8e415
|
Revert "Use MSAA for shadowmap"
This reverts commit fce9fe4385aa488a6f02814790022828d5e8f8bf.
Conflicts:
src/graphics/render_geometry.cpp
src/graphics/rtts.cpp
|
2014-11-02 02:37:18 +01:00 |
|
Vincent Lejeune
|
cedbb32a17
|
Try to fix incomplete fbo attachement
|
2014-11-02 02:37:17 +01:00 |
|
Vincent Lejeune
|
4e6a7b5192
|
Use MSAA for shadowmap
|
2014-11-02 02:37:17 +01:00 |
|
Vincent Lejeune
|
937eb3baf8
|
Add trilinear + anisotropic on shadows
|
2014-11-02 02:37:16 +01:00 |
|
Vincent Lejeune
|
9113aa7a39
|
Implement Exponential Shadow map
|
2014-11-02 02:36:10 +01:00 |
|
Vincent Lejeune
|
8588720f6b
|
Add a check for instance buffer overflow
|
2014-11-02 01:00:10 +01:00 |
|
Vincent Lejeune
|
5557a0165a
|
Fix rtt crash
|
2014-11-02 00:21:54 +01: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 |
|
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 |
|
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 |
|
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 |
|
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
|
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
|
690e632e1b
|
Move handicap to ui options and to the player name spinner
|
2014-10-26 16:56:50 +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 |
|
Marianne Gagnon
|
047c6fc760
|
Add debug name to meshes and mesh buffers, helps debugging
|
2014-10-24 19:25:24 -04: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
|
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
|
3372d06759
|
Removed unused files.
|
2014-10-24 10:22:27 +11:00 |
|
hiker
|
b4f95d672a
|
Started to indicate the name of the logged in user ... still work in
progress (black writing on dark grey).
|
2014-10-23 22:26:11 +11:00 |
|
hiker
|
f70687a00b
|
Minor cosmetic changes only.
|
2014-10-23 22:25:23 +11:00 |
|
hiker
|
6e79f90166
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-10-23 08:34:47 +11:00 |
|
hiker
|
efe64f4a67
|
Engine is no longer disabled after a kart-kart collision.
|
2014-10-23 08:21:54 +11:00 |
|
hiker
|
2cad89ceeb
|
iFix #1617 (no sfx on hitting the track).
|
2014-10-23 08:03:15 +11:00 |
|
Vincent Lejeune
|
7d602225fb
|
Use InitTexture for transparents too
|
2014-10-22 22:05:09 +02:00 |
|
Vincent Lejeune
|
d0b996ab4a
|
Use template defined SetTexture argument sets instead of vector
|
2014-10-22 21:51:11 +02:00 |
|
hiker
|
86b8036926
|
Fix #1631 (SFX can not be enabled in in-race game menu).
|
2014-10-22 17:16:39 +11:00 |
|
hiker
|
69c155063a
|
Added Yes/No dialog box, and used it for the 'allow STK to connect
to internet' question.
|
2014-10-22 09:15:42 +11:00 |
|
hiker
|
c012e98f9b
|
Allow disabling of hw stats collection.
|
2014-10-22 08:20:26 +11:00 |
|
hiker
|
690ad4ce95
|
Fixed sfx direction.
|
2014-10-21 22:07:22 +11:00 |
|
Marianne Gagnon
|
0025f908db
|
Add cleanup post-minimap-RTT. Appears to fix #1470 . Hard to know for sure since this bug is random :(
|
2014-10-20 20:38:37 -04:00 |
|
hiker
|
98a10d5614
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-10-21 08:49:03 +11:00 |
|
hiker
|
8d9f1aa002
|
Renamed SoundToggled to toggleSound.
|
2014-10-21 08:48:21 +11:00 |
|
Deve
|
04933af4b0
|
Redrawing GP info screen is not needed now.
|
2014-10-20 23:46:25 +02:00 |
|
Deve
|
321f0e7078
|
Remove saved GP when we start new race.
Avoid a crash. Saved GP was deleted, but was not NULL. And in other place we have if(m_saved_gp != NULL) check, which was true for deleted object.
|
2014-10-20 23:46:25 +02:00 |
|
konstin
|
4647a50acb
|
Save GP on abort
|
2014-10-20 23:46:25 +02:00 |
|
konstin
|
f65ad8f84f
|
Save GP reverse Type; close #1137
|
2014-10-20 23:46:25 +02:00 |
|
konstin
|
035fc599ee
|
fix ordering of the karts and maybe some more
|
2014-10-20 23:46:25 +02:00 |
|
konstin
|
ae24c6b40f
|
only one saved GP per GP-ident
Conflicts:
src/graphics/glwrap.cpp
|
2014-10-20 23:46:25 +02:00 |
|
hiker
|
65b7589849
|
Make sure the sfx are resumed before calling onSOundEnbaledBack().
|
2014-10-21 08:31:10 +11:00 |
|
hiker
|
c7d7e17ff9
|
Handle setMasterVolume in sfx thread.
|
2014-10-21 08:28:41 +11:00 |
|
hiker
|
a09c1346b7
|
Fixed sound objects.
|
2014-10-21 08:21:58 +11:00 |
|
Flakebi
|
57afd1d585
|
Merge remote-tracking branch 'origin/master' into perPlayerDifficulties, this time the right branch...
Conflicts:
data/gui/user_screen.stkgui
data/gui/user_screen_tab.stkgui
src/graphics/glwrap.cpp
src/graphics/weather.cpp
src/states_screens/user_screen.cpp
|
2014-10-20 22:36:54 +02:00 |
|
hiker
|
9dff5a7990
|
Fix potential memory overwrite in soccer mode when using one player
only (artist debug mode).
|
2014-10-20 23:01:31 +11:00 |
|
hiker
|
8b7bf28e0f
|
Fixed #1147 - sounds should stopped when they are disabled in option screen.
Fixed by explicitely stopping all non-looped sfx.
|
2014-10-20 22:37:19 +11:00 |
|
hiker
|
07c37539fd
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-10-20 09:43:40 +11:00 |
|
hiker
|
36ea7f30bf
|
Only restart sfx if they were really paused.
|
2014-10-20 09:43:05 +11:00 |
|
Vincent Lejeune
|
f3dd009376
|
Try to fix model loader hpp
|
2014-10-19 18:44:08 +02:00 |
|
Vincent Lejeune
|
4ee0e24ff7
|
Try to fix travis build.
|
2014-10-19 16:40:27 +02:00 |
|
Vincent Lejeune
|
b13e6931ce
|
Revert "Try to fix travis build."
This reverts commit 3ea954cc73 .
|
2014-10-19 16:39:39 +02:00 |
|
hiker
|
3ea954cc73
|
Try to fix travis build.
|
2014-10-20 00:48:15 +11:00 |
|
hiker
|
11dbb6f062
|
Fixed some warnings printed when sfx are disabled.
|
2014-10-20 00:05:48 +11:00 |
|
Marianne Gagnon
|
9b46cdc981
|
Refactor library nodes to be proper TrackObjects, allows animating them with curves
|
2014-10-18 19:11:24 -04:00 |
|
Vincent Lejeune
|
e23aba65f4
|
Move shader load code to shader.cpp instead of glwrap.hpp
|
2014-10-18 23:53:16 +02:00 |
|
Vincent Lejeune
|
80c7c5e49b
|
Remove unused functions
|
2014-10-18 18:29:37 +02:00 |
|
Vincent Lejeune
|
95cf6c5f4a
|
Put 2d function in their own header
|
2014-10-18 18:16:50 +02:00 |
|
Vincent Lejeune
|
5efea6fd1a
|
Factorise attribute binding function
|
2014-10-18 17:59:30 +02:00 |
|
hiker
|
c40a8eb377
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-10-18 23:44:11 +11:00 |
|
hiker
|
650b541def
|
Try to fix #1622 (can't login due to a missing password entry field).
|
2014-10-18 23:43:27 +11:00 |
|
Vincent Lejeune
|
e165398fdd
|
Fix texture
|
2014-10-18 04:10:59 +02:00 |
|
hiker
|
3082267eb4
|
Properly test for sfx disabled, and only schedule events if sfx
are enabled. Fixes #1629.
|
2014-10-18 12:11:02 +11:00 |
|
hiker
|
df5635e90f
|
Fixed typo in warning message.
|
2014-10-18 12:10:27 +11:00 |
|
hiker
|
02435e4977
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-10-18 11:47:20 +11:00 |
|
hiker
|
19f9afb67f
|
Manually keep track of the duration each sfx has been played (instead
of relying on the world clock, which can run backwards, e.g. in
FTL mode). Fixes #1624.
|
2014-10-18 11:46:22 +11:00 |
|
Marianne Gagnon
|
acc90fd03c
|
Don't let irrlicht process tab events. FIxes #1619, fixes #1225, fixed #1454
|
2014-10-17 19:39:38 -04:00 |
|
Vincent Lejeune
|
ce7f017adf
|
Some fixes
|
2014-10-17 18:43:39 +02:00 |
|
Vincent Lejeune
|
f67f207d4b
|
Start fixing speedmeter
|
2014-10-17 18:19:23 +02:00 |
|
hiker
|
7103ea8e88
|
Throttle sfx command if the queue should get too long (might need some
tuning). Non-essential sfx (positioning, speed, looping, and play)
are discarded.
|
2014-10-17 16:53:44 +11:00 |
|
hiker
|
403702d6bb
|
Handle pauseAll and resumeAll completely in thread now. Avoids a crash
(caused by pauseAll trying to pause a sfx that is still in the list of
all sfx, but has a delete command already queued up).
|
2014-10-17 16:26:15 +11:00 |
|
hiker
|
383cbef14d
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-10-17 12:04:04 +11:00 |
|
hiker
|
c7f37297b1
|
Fixed potential deadlock (if a sfx is not found in the queue, which shouldn't
happen); stop sounds which are deleted only once, slightly reduce size of
locked region.
|
2014-10-17 12:02:23 +11:00 |
|
hiker
|
813edc7ddf
|
Remove SFX_INITIAL state.
|
2014-10-17 12:00:00 +11:00 |
|
Marianne Gagnon
|
1bd9fc0423
|
Fix mesh tangents caching
|
2014-10-16 18:40:49 -04:00 |
|
Marianne Gagnon
|
bf5c77d061
|
Merge branch 'master' into TangentsCaching
|
2014-10-16 18:20:23 -04:00 |
|
hiker
|
a40d6d8a00
|
Removed isPlaying function, and use getStatus instead.
|
2014-10-17 08:27:40 +11:00 |
|
hiker
|
3d15f13c74
|
iFixed #1624 (though it is a bit of a hack).
|
2014-10-16 23:45:09 +11:00 |
|
hiker
|
31c4b2c475
|
Merge branch 'master' of https://github.com/quizywiz/stk-code into quizywiz-master
|
2014-10-16 22:47:46 +11:00 |
|
hiker
|
014bc73940
|
Don't create a sound effect for AIs if its volume is set to 0.
|
2014-10-16 21:46:31 +11:00 |
|
Deve
|
9921c742e3
|
Merge pull request #1621 from marcoll/master
Use length limit for dynamic ribbon labels in the GP editor
|
2014-10-16 08:30:34 +02:00 |
|
hiker
|
4bb1091f3e
|
Moved sfx thread update to happen after graphics code is finished.
This improves performance since threads in graphics code do not
compete with threads in sfx handling anymore.
|
2014-10-16 17:11:15 +11:00 |
|