Vincent Lejeune
44f70454ad
Fix dof overwriting alpha value.
2014-05-30 02:32:01 +02:00
Marianne Gagnon
80b8851a9a
Fix merge
2014-05-29 20:04:10 -04:00
Marianne Gagnon
7e9252e5b3
Merge branch 'master' into NewRTTWidget
2014-05-29 20:00:58 -04:00
Sachith Hasaranga Seneviratne
038aaa6f3b
Hitting a physical object with an object now triggers a message (Test in tutorial by shooting at the boxes). All currently suppported collision types now denote the type in the message that appears.
2014-05-29 18:51:48 +05:30
Sachith Hasaranga Seneviratne
870f438b06
Removing animations now also removes the corresponding PhysicalObject as well. Additionally opened up the PhysicalObject class to allow for the setting of the interaction type with the future goal of exposing it to scripts
2014-05-29 17:37:13 +05:30
Sachith Hasaranga Seneviratne
329d11421b
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-05-29 10:40:36 +05:30
hiker
1cb7445e1b
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-05-28 21:41:56 +10:00
hiker
b18d7e75ac
Rewrote insertionSort to only require operator< (no >),
...
and removed the unnecessary operators.
2014-05-28 21:41:07 +10:00
Sachith Hasaranga Seneviratne
6015b66f9a
All existing script functions decoupled from script engine, moved into namespaces of Kart,Track and Physics.(Corresponding to their game engine equivalents
2014-05-28 13:51:13 +05:30
Sachith Hasaranga Seneviratne
8b9629fb5e
Cleaned up a bit
2014-05-28 13:21:45 +05:30
Sachith Hasaranga Seneviratne
34fec63f9c
Added Kart sub-namespace
2014-05-28 13:13:45 +05:30
hiker
dd04c11260
Sort tracks first by locked/unlocked status, then alphabetically.
...
Added support for special sort names for each track (e.g. 'The Island'
can be sorted as 'Island' etc).
2014-05-28 17:15:00 +10:00
Sachith Hasaranga Seneviratne
0fd792ac5b
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-05-28 12:27:41 +05:30
vlj
220719e507
Allow to toggle off GI.
2014-05-28 07:47:06 +02:00
vlj
40df4afc74
Support some debug option for GI
2014-05-28 07:47:06 +02:00
vlj
af16682a9e
Add GI support
2014-05-28 07:47:06 +02:00
Vincent Lejeune
5caf028a71
Add RH support
2014-05-28 07:47:06 +02:00
Vincent Lejeune
180bd939e0
Add RSM support
2014-05-28 07:47:06 +02:00
vlj
b3a8b13a10
Add all necessary fbo for RH
2014-05-28 07:47:06 +02:00
vlj
c96bc37975
Support 3 rtts
2014-05-28 07:47:06 +02:00
vlj
2dba00c45a
Support for layered without depth stencil
2014-05-28 07:47:06 +02:00
Marianne Gagnon
aa1418050d
Bugfix when GLSL disabled
2014-05-27 19:00:55 -04:00
hiker
fc228c96c4
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-05-28 08:57:45 +10:00
hiker
3f1029c55e
Fixed overwritten icons (which prevents player from using their
...
own icons).
2014-05-28 08:57:00 +10:00
auriamg
544d2206ef
Merge pull request #1343 from Flakebi/master
...
Add deactivated buttons and fix device-screen
2014-05-27 18:52:49 -04:00
Flakebi
e5b4121aef
Fix behaviour of device-screen: Go to input-screen if pressing on the back button
2014-05-27 16:15:19 +02:00
Flakebi
d5de7d49d9
Add graphics for deactivated buttons
2014-05-27 16:07:53 +02:00
hiker
0494cc3164
1) Fixed saving of sessions ('save-session=1' was sent instead of
...
'save-session=true').
2) Made logout request same priority as stk-quit request, which means
that the logout request will executed before the quit, resulting
in players properly being marked as logged out.
2014-05-27 23:44:25 +10:00
sachith500
41a56c0cec
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-05-27 11:57:58 +05:30
sachith500
6f58864df0
Added namespaces Scripting, Scripting::Physics. Moved collision script code and function,callback binding to Scripting::Physics
2014-05-27 11:57:44 +05:30
hiker
36d705f021
Added 'always-show-login-screen' option, moved 'remember-password'
...
option from UI-options to UserScreen.
2014-05-27 15:36:44 +10:00
hiker
4ada050ca7
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-05-27 12:28:12 +10:00
hiker
a24e0cf5aa
Also hide the 'online' label if a user is renamed.
2014-05-27 10:44:01 +10:00
sachith500
8c5606be08
Karts involved in collisions addressable by ID
2014-05-26 20:30:27 +05:30
sachith500
31f7ea7c89
Added very basic collisions
2014-05-26 18:03:41 +05:30
sachith500
3cb24f55d5
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
2014-05-26 16:58:16 +05:30
hiker
726070b331
Use Log::, fix coding style issues.
2014-05-26 16:58:50 +10:00
Marianne Gagnon
5bc824a6d4
More improvements to new RTT
2014-05-25 19:26:40 -04:00
Marianne Gagnon
986563fdf8
Fix transparency
2014-05-25 18:45:54 -04:00
hiker
4cc59a56ce
Fixed renaming of local player, removed old rename dialog.
2014-05-26 08:25:33 +10:00
hiker
64492fb6cb
Merge branch 'pgabor-master'
2014-05-25 22:43:14 +10:00
hiker
79081f8ce8
Merge branch 'master' of https://github.com/pgabor/stk-code into pgabor-master
2014-05-25 22:38:03 +10:00
vlj
2cf9bb6d2c
Use UBO in MLAA
2014-05-25 03:21:08 +02:00
vlj
5ce3a6221a
Extent RTT_MLAA_COLORS to use alpha value
2014-05-25 03:13:53 +02:00
vlj
670c25dd26
Return alpha value in tonemap.
2014-05-25 03:13:19 +02:00
Marianne Gagnon
8afc03deff
Optimize kart switching
2014-05-24 20:57:38 -04:00
vlj
081a379dc0
RTT background is transparent without mlaa
2014-05-25 02:55:32 +02:00
vlj
0bd5d0973d
Set alpha to 0
2014-05-25 02:42:39 +02:00
Marianne Gagnon
bdc13d3bb9
Fix multiplayer kart select with new RTT widget
2014-05-24 20:34:39 -04:00
Marianne Gagnon
add14147a3
Fix RTT widghet clearModels() method
2014-05-24 20:22:34 -04:00