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

11091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marianne Gagnon
2f2547420d Apply Marc Coll's Grand Prix editor, thanks! There will be refinements to come for sure, but this is a very nice start 2014-03-20 21:13:05 -04:00
vlj
68935decaa Reenable Debug Output on windows. 2014-03-21 01:44:14 +01:00
vlj
a35b7d1e2d Do not reload Caustic/displace texture each frame 2014-03-21 01:43:45 +01:00
auriamg
dee2a0300e Merge pull request #1259 from cosmincav/master 
Added achievement: unstoppable
 2014-03-20 20:08:43 -04:00
vlj
f06ad3c785 Reenable transparent + fog material. 2014-03-20 18:25:44 +01:00
vlj
b3f59437b1 Fix rubber band effect for plunger. 2014-03-20 18:06:59 +01:00
cosmin.crecana
8616ce546a achievement_unstoppable 2014-03-20 15:30:11 +02:00
vlj
a3eee305ca Remove the max distance for lights 2014-03-19 23:07:40 +01:00
vlj
822081deb4 Only reupload buffer for skidding mark 2014-03-19 23:00:45 +01:00
Vincent Lejeune
4128371b7f Do not switch program if it's not used. 2014-03-19 19:02:29 +01:00
Vincent Lejeune
782e280bfc Factorize PointLightShader vao and vbo. 2014-03-19 18:42:48 +01:00
Arthur-D
9c3d854a2a Merge pull request #1257 from matthiaskrgr/patch-1 
travis: revert all changes done to notification section
 2014-03-19 03:17:52 +01:00
Matthias Krüger
04f635d9cb travis: revert all changes done to notification section 2014-03-19 02:33:58 +01:00
Vincent Lejeune
1e8bc6bc41 Try to avoid updating skidmark each frames. 2014-03-19 01:54:07 +01:00
Arthur-D
5a77c2082a Merge pull request #1256 from matthiaskrgr/patch-1 
travis: rm unneeded deps, don't build via script
 2014-03-19 01:40:46 +01:00
Matthias Krüger
15f0445ce3 travis: rm unneeded deps, don't build via script 2014-03-19 01:38:27 +01:00
Vincent Lejeune
9a6d15a865 Attempt to fix skidding mark's color 2014-03-19 01:25:54 +01:00
Arthur-D
d9c5d415cd Merge pull request #1255 from matthiaskrgr/patch-1 
travis: remove some useless options, condense irc message, skip joins in...
 2014-03-19 01:20:53 +01:00
Vincent Lejeune
433903be5d Reenable skidmark, although their color is wrong 2014-03-19 01:07:32 +01:00
Matthias Krüger
66d2404243 travis: remove some useless options, condense irc message, skip joins in channel 2014-03-19 00:57:50 +01:00
auriamg
37ee2d73b3 Merge pull request #1254 from nathan-osman/bluetooth-check 
Check for libbluetooth on Unix platforms.
 2014-03-18 19:37:00 -04:00
Marianne Gagnon
9042a4e0f2 Fix bogus merge, sorry 2014-03-18 19:26:36 -04:00
Marianne Gagnon
4948f5acb2 Merge branch 'master' of https://github.com/sudip1401/stk-code 
Conflicts:
	data/achievements.xml
	src/achievements/achievement_info.hpp
 2014-03-18 19:16:43 -04:00
hiker
506b64b587 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-18 21:18:30 +11:00
hiker
2173ae8280 Try to work around the currently reported build problem by travis. 2014-03-18 21:17:40 +11:00
sudip1401
0bca25504a Poweruplover achievement 2014-03-18 13:18:50 +05:30
hiker
03b1994041 Merge branch 'master' of https://github.com/konstin/stk-code into konstin-master 2014-03-18 16:22:59 +11:00
hiker
0f4fb50fd6 Merge branch 'master' of https://github.com/KroArtem/stk-code into KroArtem-master 2014-03-18 16:15:14 +11:00
Nathan Osman
6b8f12b1b5 Check for libbluetooth on Unix platforms. 2014-03-17 19:02:53 -07:00
hiker
cd7e9ff8a9 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-18 10:47:53 +11:00
hiker
3d5fbaa92f Merge branch 'master' of https://github.com/gupascal/stk-code into gupascal-master 
Fixed some merging issues.
Conflicts:
	data/achievements.xml
	src/achievements/achievement_info.hpp
 2014-03-18 10:44:11 +11:00
Marianne Gagnon
3d6fd8e792 Add patch to mention firing back in tutorial 2014-03-17 18:52:36 -04:00
sudip1401
72920ab0ab Poweruplover achievement 2014-03-18 02:20:51 +05:30
hiker
e9367dd1c9 Fixed potential crash if RelationInfo should not exist, which I saw 
once while a decline was in progress), started some minor refactoring.
 2014-03-18 07:48:52 +11:00
sudip1401
89d7663112 Poweruplover achievement 2014-03-18 02:04:01 +05:30
KroArtem
4dec9c3fc5 having fun reverting changes 2014-03-17 23:56:49 +04:00
konstin
de50ea46e8 Allow karts to specifie a different sound effect for their engine; closes #1234 2014-03-17 17:01:34 +01:00
Guillaume P
45ab7e6907 Clean up some minor coding style issues 2014-03-17 08:21:49 +01:00
Guillaume P
b4fe033331 Revert "Now IA don't fire a cake if the kart is driving too slow. Also correct some comments." 
This reverts commit 9030291340.
 2014-03-17 08:10:21 +01:00
KroArtem
66c5d4a645 removed unused functions 2014-03-16 15:28:46 +04:00
KroArtem
d4e90f83f2 revert unique_ptr back to auto_ptr 2014-03-15 23:30:15 +04:00
Vincent Lejeune
ce12ebe9ce Bring back minimap. 2014-03-15 20:05:04 +01:00
auriamg
847ceca671 Merge pull request #1243 from mcsab/master 
Skidding achievement
 2014-03-15 15:01:41 -04:00
Csaba Molnar
c175f2450e Tab fix 2014-03-15 19:58:25 +01:00
Marianne Gagnon
037688b020 Fix terminal warning flood, and improve error detection. Thanks to vlj for help 2014-03-15 14:39:27 -04:00
Csaba Molnar
bc3850ebdb Wrong include corrected (\ -> /). 
Drift counting fixed.
 2014-03-15 19:18:03 +01:00
Vincent Lejeune
1b4863d7aa Add asserts before binding vao and fix 0 glow vao 2014-03-15 18:59:22 +01:00
Marianne Gagnon
0425cf2ef4 Implement color variation in particle system 2014-03-15 13:35:51 -04:00
Guillaume P
5af377da07 Fix a build issue for Travis CI. 2014-03-15 15:58:17 +01:00
KroArtem
a3a851b300 Merge remote-tracking branch 'upstream/master' 2014-03-15 18:30:17 +04:00