ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,985 Commits 9 Branches 28 Tags 433 MiB
41a4619120
Commit Graph

8501 Commits

Author SHA1 Message Date
vlj
baf128059d Add 3 new gl api calls 2014-06-01 02:24:19 +02:00
Marianne Gagnon
aff3b32bc6 compilation fix when c++2011 is enabled 2014-05-31 19:47:32 -04:00
auriamg
2877cedd1c Merge pull request #1317 from konstin/random-gp 
Changes in preparation for Random GP
 2014-05-31 18:44:59 -04:00
Vincent Lejeune
f31e5763d2 Fix condition. 2014-05-31 22:24:32 +02:00
vlj
21317f561f Remove sun specular if there is no shadow in track. 
Avoid the ghost specular in star track.
 2014-05-31 18:00:16 +02:00
Vincent Lejeune
5d095d4d24 Use options to determine if a fbo is needed. 2014-05-31 17:49:00 +02:00
konstin
2534abeed2 trying to merge upstream 2014-05-31 15:11:05 +02:00
vlj
e9cb12a1fb Used wrong condition. 2014-05-31 02:57:21 +02:00
vlj
5945ee878b Start GI at the second tick. 2014-05-31 02:53:16 +02:00
hiker
5906cdb070 Merge branch 'NewRTTWidget' of github.com:supertuxkart/stk-code into NewRTTWidget 2014-05-31 10:45:55 +10:00
Marianne Gagnon
588b4189ac Merge branch 'master' into NewRTTWidget 2014-05-30 20:44:38 -04:00
hiker
e39f2164b5 Removed OnlineProfile from ActivePlayer, since it was not used at all. 2014-05-31 10:26:02 +10:00
hiker
a0ee4d0bc5 Don't save guest players to the players.xml file. 2014-05-31 10:25:08 +10:00
vlj
6643f749b1 Remove unneeded profilers. 2014-05-31 02:04:32 +02:00
vlj
0f833b0619 Remove unneeded shaders/wrong assignements. 2014-05-31 01:59:33 +02:00
vlj
2d921ca588 Add a profiler for Dof 2014-05-31 01:52:10 +02:00
Marianne Gagnon
5e132f7410 Add GI to video options 2014-05-30 19:49:21 -04:00
vlj
ef91bf9549 Force RTT usage even in basic mode. 2014-05-31 01:26:47 +02:00
vlj
aa0691015a Fix crash with 3.1 context when cleaning rtt. 2014-05-30 15:34:24 +02:00
hiker
a907df37ad Save the last three stdout.log files (which is useful in diagnosing 
crashes caused by e.g. a problem in a previous run).
 2014-05-30 16:00:28 +10:00
Sachith Hasaranga Seneviratne
ad71674b2c Added IDs to track objects, coding style fixes 2014-05-30 08:15:34 +05:30
Sachith Hasaranga Seneviratne
79d267ad9e Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-05-30 07:45:23 +05:30
hiker
8ea5110fd4 Fix crash caused by uninitialised variable. 2014-05-30 11:30:44 +10:00
Marianne Gagnon
a055d42829 A few tweaks 2014-05-29 21:08:12 -04:00
hiker
bb09ec9e37 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-05-30 11:03:46 +10:00
hiker
23e56e9454 Fixed indentation. 2014-05-30 11:03:32 +10:00
hiker
c705ad7732 Combined windows and non-windows handling of redirecting log to file (no 
idea why there was ever made a distinction).
 2014-05-30 10:54:08 +10: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
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
79081f8ce8 Merge branch 'master' of https://github.com/pgabor/stk-code into pgabor-master 2014-05-25 22:38:03 +10:00
vlj
5ce3a6221a Extent RTT_MLAA_COLORS to use alpha value 2014-05-25 03:13:53 +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
hiker
a07c931921 Removed file accidentally added (thanks to Konstin for noticing). 2014-05-24 22:12:04 +10:00
hiker
22f5b39223 Fix linux compilation. 2014-05-24 12:16:44 +10:00
hiker
36cbb18e27 Fixed compiler warnings. 2014-05-24 12:07:47 +10:00
hiker
63bbf6e092 Converted files to standard unix format. 2014-05-24 12:00:25 +10:00
hiker
fc32fcc865 Fix crash when deleting the current player (also prevent the user from 
deleting the last user, since STK (after login) needs a current player).
 2014-05-24 11:52:09 +10:00
Marianne Gagnon
90ab6fec3a Fixes to new RTT widget 2014-05-23 21:45:47 -04:00
Marianne Gagnon
5ce2b0b922 Work on new RTT widget, let there be light 2014-05-23 21:15:23 -04:00
vlj
a6f266ea40 Forgot to uncomment some lines 2014-05-24 03:02:27 +02:00
vlj
03ee8622de Better fix for absent track 2014-05-24 03:01:08 +02:00
vlj
a4405ed6a0 Fix orientation 2014-05-24 02:56:28 +02:00
Marianne Gagnon
40d62e7c6c Fix update 2014-05-23 20:51:02 -04:00
vlj
c6f4c8e0aa Dirty fix for null track 2014-05-24 02:38:07 +02:00
hiker
ab70c55d02 Fixed infinite recursion. 2014-05-24 10:31:20 +10:00
hiker
05e6414cb8 Try to fix travisci compilation. 2014-05-24 10:24:37 +10:00
vlj
b461e4ba11 Merge branch 'NewRTTWidget' of https://github.com/supertuxkart/stk-code into NewRTTWidget 2014-05-24 02:23:51 +02:00
vlj
0acc7d18d0 Fill Matrix data before rendering Scene 2014-05-24 02:23:48 +02:00
hiker
e879dcf0a8 Merge remote-tracking branch 'origin/master' into new_login 2014-05-24 10:06:50 +10:00
hiker
3739e7515d Support old configs (i.e. if icons don't exist, they will be 
created at startup).
 2014-05-24 10:05:54 +10:00
Marianne Gagnon
b1f34a09e7 One step forward 2014-05-23 19:56:24 -04:00
Marianne Gagnon
8417fd3394 A couple improvements to new RTT widget. Still does not work 2014-05-23 19:50:13 -04:00
vlj
a1465b9039 Factorize draw code for pass1 shaders 2014-05-23 17:04:38 +02:00
vlj
9929678ba4 Fix a regression introduced by skybox fix 2014-05-23 16:55:55 +02:00
hiker
11d80d47ad Added support for player icons. 2014-05-23 22:43:19 +10:00
sachith500
867f1607dd Action triggers addressable by name, scripts can enable/disable action triggers 2014-05-23 14:39:03 +05:30
sachith500
cfef3e5456 Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-05-23 08:54:38 +05:30
sachith500
3c67a6159f Moved scripts to stk-code/data/scripts and provided access to them via file_manager 2014-05-22 18:17:30 +05:30
sachith500
4578ddc073 Added animation enabling and reactivation 2014-05-22 12:39:46 +05:30
hiker
911faa0676 Fix #1339. 2014-05-22 16:06:32 +10:00
sachith500
5056f2cc7e Merge branch 'master' of https://github.com/supertuxkart/stk-code into newchanges 2014-05-22 11:35:21 +05:30
Marianne Gagnon
60fead1eea Progress on new RTT widget, now I see a white rectangle 2014-05-21 20:13:36 -04:00
vlj
bca5beeaa7 Add a draw2dImage function to display glsl rtt 2014-05-22 01:29:40 +02:00
hiker
de8c6ac8b8 When a player logs in with an online account, reset any other saved 
session for this online account (since these token are now invalid).
 2014-05-22 08:21:41 +10:00
hiker
f4688fa621 Added support to change the online account for the same player. 2014-05-22 08:12:55 +10:00
hiker
c551ea0c14 Added online name of the player to be logged in/out to the sign in/out 
message.
 2014-05-22 07:45:19 +10:00
hiker
498c6b46db Removed m_save_session, some code cleanup. 2014-05-22 07:44:26 +10:00
sachith500
e96cf33cf5 Cleaned up a bit 2014-05-21 19:59:56 +05:30
sachith500
1db3d7bfd2 Deleted unused files 2014-05-21 19:59:41 +05:30
vlj
0b091e3095 Reset viewport size in model_view_widget 2014-05-21 14:30:10 +02:00
amtkhdkr
9c7f2d4de9 Whitespace cleanup 2014-05-21 16:18:56 +05:30
amtkhdkr
b7ab039cc6 Whitespace cleanup 2014-05-21 16:16:24 +05:30
amtkhdkr
efdaac1040 Use core::stringw functions 2014-05-21 16:14:44 +05:30
amtkhdkr
3577660f84 Rolling back changes,no need to edit here 2014-05-21 13:11:52 +05:30
amtkhdkr
397c2e4a33 Tested changes for wchar 2014-05-21 13:04:44 +05:30
Sachith Hasaranga Seneviratne
3023a12f2b Scripting Engine built and tested with merges from latest master 2014-05-21 12:51:21 +05:30
amtkhdkr
091ff10039 Spaces removed 2014-05-21 12:05:27 +05:30
amtkhdkr
50119a493c Checked for valid email id. 2014-05-21 11:57:56 +05:30
amtkhdkr
cd573d8446 Checked for valid email id. 
Email id is checked for (z)(z)*@(z).(z)
where z is an alphanumeric character. 
Following emails are valid: abc@xyz.com a@abc.com
d@ddyC00l@abc.com foo@ab.com
Following are invalid: abc foo@ @foo.com @.com .com@
 2014-05-21 11:41:32 +05:30
Marianne Gagnon
8b8a17de21 Improve material compat fallback + update one handwritten materials XML 2014-05-20 20:04:21 -04:00
Marianne Gagnon
441d941c41 First attempts at new RTT widget, does not work yet 2014-05-20 19:55:28 -04:00
hiker
1472e69c66 Merge remote-tracking branch 'origin/master' into new_login 2014-05-20 22:17:03 +10:00
hiker
8441dbbd32 Fixed saving login credentials. It's now possible to switch 
user (and automatically a logout and login is triggered).
 2014-05-20 22:13:26 +10:00
Marianne Gagnon
106c23a09b Merge remote-tracking branch 'origin/master' into MaterialsRefactor 2014-05-19 20:48:08 -04:00
vlj
b87f420496 Spheremap: fix low brightness 2014-05-20 02:46:50 +02:00
Marianne Gagnon
f778f68649 Merge remote-tracking branch 'origin/master' into MaterialsRefactor 2014-05-19 20:37:44 -04:00
vlj
c79d96df69 Add lightviz to instanced node 2014-05-20 02:35:50 +02:00
vlj
c88d66a862 Add lightviz to spheremap 2014-05-20 02:35:49 +02:00
Marianne Gagnon
778649f182 More material work 2014-05-19 20:01:51 -04:00
Marianne Gagnon
6410cf8776 Start refactoring materials 2014-05-19 19:30:44 -04:00
Stephen Just
493b7b7c69 Fix whitespace in glwrap.cpp 2014-05-19 10:02:35 -06:00
Stephen Just
0167e6d95a Fix up whitespace in shaders.cpp 2014-05-19 09:59:13 -06:00
Stephen Just
f4992b80fc Fix errors when compiling shaders with UBOs disabled 2014-05-19 09:57:31 -06:00
hiker
ebcce3da32 Avoid freeing potentially uninitialised variable. 2014-05-19 13:58:37 +10:00
Sachith Hasaranga Seneviratne
888c514dc7 Fixed Typo 2014-05-19 09:00:48 +05:30
Sachith Hasaranga Seneviratne
27de7c6f3c MERGE STK into scripting branch 2014-05-19 08:27:15 +05:30
hiker
9ae67f5c7a Merge remote-tracking branch 'origin/master' into new_login 2014-05-19 12:36:17 +10:00
vlj
84235b6491 Fix attempt for intel mesa 2014-05-19 00:25:25 +02:00
vlj
42db6d2bba Forget another change 2014-05-19 00:13:17 +02:00
vlj
6b8df482df Forget a hunk 2014-05-19 00:06:38 +02:00
vlj
df70681574 Fix attempt for linux 2014-05-19 00:05:52 +02:00
vlj
33f19e55b8 Fix for shadows. 2014-05-18 23:47:52 +02:00
vlj
31487814fe Fix compile 2014-05-18 23:28:39 +02:00
Vincent Lejeune
eca3999d52 Do some cleaning 2014-05-18 19:56:25 +02:00
Vincent Lejeune
bf71c2f71d Factorize code drawing shadows. 2014-05-18 19:45:52 +02:00
Vincent Lejeune
838b44fc00 Remove Cautics effect 
It's not used anywhere and I have no way to test it so it's useless.
 2014-05-18 19:28:53 +02:00
hiker
2d4f2c5b28 Try to fix one more potential linux compilation problem. 2014-05-18 22:32:58 +10:00
hiker
c1194600c3 Try to fix my fix for linux compilation ;) 2014-05-18 22:09:04 +10:00
hiker
c9c3b289be Try to fix linux compilations problems (apparently on some systems 
Screen is defined, which then interferes with out Screen class).
 2014-05-18 22:00:28 +10:00
Marianne Gagnon
f0e3ee8832 Fix kart shadow vs kart animation (for the main player only) 2014-05-17 21:57:06 -04:00