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

7876 Commits

Author SHA1 Message Date
Marianne Gagnon
89e070c7f3 Revert dubious change from GP patch 2014-03-20 21:30:10 -04:00
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
Vincent Lejeune
1e8bc6bc41 Try to avoid updating skidmark each frames. 2014-03-19 01:54:07 +01:00
Vincent Lejeune
9a6d15a865 Attempt to fix skidding mark's color 2014-03-19 01:25:54 +01:00
Vincent Lejeune
433903be5d Reenable skidmark, although their color is wrong 2014-03-19 01:07:32 +01: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
Vincent Lejeune
dd5997d277 Start working on instancing library node 2014-03-18 23:47:53 +01:00
Vincent Lejeune
4af050e1c0 Bring back minimap. 2014-03-18 23:47:40 +01:00
Csaba Molnar
83ae6909b5 Tab fix 2014-03-18 23:47:40 +01:00
Csaba Molnar
571b3a8e34 Wrong include corrected (\ -> /). 
Drift counting fixed.
 2014-03-18 23:47:39 +01:00
Csaba Molnar
806da15a12 Skidding achievement 2014-03-18 23:47:38 +01: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
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
Csaba Molnar
249635f01a onLapEnd() fix 2014-03-17 22:30:17 +01:00
Csaba Molnar
60f1d8ae20 Achievement reset-after-lap beta 2014-03-17 22:07:55 +01: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
Guillaume P
8a34be1ab3 Add a new Gold Driver achievement. 2014-03-15 15:12:28 +01:00
Guillaume P
9030291340 Now IA don't fire a cake if the kart is driving too slow. Also correct some comments. 2014-03-15 10:52:01 +01:00
hiker
de820054b6 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-15 11:55:28 +11:00
hiker
3f738b60d5 Fixed crash in UserInfoDialog if an invalid response is received (friend id 
is not contained in the response --> profile not found --> crash. Now
the friend id is stored in the request itself, and not needed in the response
from the server). Moved RejectFriendRequest into UserInfoDialog.
 2014-03-15 11:54:04 +11:00
Csaba Molnar
385f108b16 Skidding achievement 2014-03-15 00:38:16 +01:00
Marianne Gagnon
3fb98fe85f Work around crash in render code. Vlj, please review this, this is likely not the proper fix 2014-03-14 19:35:35 -04:00
hiker
aa169d0191 Moved AcceptFriendRequest into UserInfoDialog. 2014-03-15 10:27:13 +11:00
hiker
f76536ca31 Moved FriendRequest into corresponding GUI object. 2014-03-15 10:13:44 +11:00
hiker
e63ad2754d Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-15 09:48:14 +11:00
hiker
e77287d3ce Moved signup request from CurrentUser to register screen. 2014-03-15 09:34:23 +11:00
KroArtem
ccd6019f48 Merge remote-tracking branch 'upstream/master' 2014-03-15 01:15:48 +04:00
Vincent Lejeune
cb344520ef Merge branch 'BatchedDrawCalls' 2014-03-14 16:57:18 +01:00
Vincent Lejeune
0c5d5ce96e IBL: Fix sampling ignoring cubemap rotation 2014-03-14 16:51:07 +01:00
Vincent Lejeune
740c251808 Use Instancing for lights. 2014-03-14 16:51:06 +01:00
Vincent Lejeune
6cad7339e3 Factorize texture binding. 2014-03-14 16:51:05 +01:00
Vincent Lejeune
cf2035ca0a Batch draw calls 2014-03-14 16:51:05 +01:00
hiker
c0a70830c2 Moved ServerCreationRequest from CurrentUser into the server creation screen. 2014-03-14 22:18:02 +11:00
hiker
6afc12c866 Moved recovery request into recovery dialog. Fixed recovery dialog to 
work now (except the URL sent from the server is still wrong).
 2014-03-14 16:44:58 +11:00
hiker
7e1a59fe99 Mark fulfilled achievements in blue. 2014-03-13 17:18:28 +11:00
hiker
cecb725228 Display correct results for achieved achievements. 2014-03-13 17:12:51 +11:00
hiker
a5f9d26f88 Fixed display of achievements when not logged in. 2014-03-13 08:31:06 +11:00
Guillaume P
955b27bf75 Add a Marathoner achievement. 2014-03-12 14:15:16 +01:00
hiker
4eb4ce1511 Bugfix: onRaceEnd was not called for achievements (resulting in 
achievements not being reset at end of a race).
 2014-03-12 22:40:43 +11:00
hiker
be9d7292f2 Replaced template function to simplify setting online request data with 
function (since template doesn't compile on linux without -std=gnu++0x or so).
 2014-03-11 17:13:37 +11:00
hiker
642797bdde Cosmetic changes to follow our coding style. Also fixed incorrect 
'waiting for friends' message while waiting for achievements.
 2014-03-11 17:03:07 +11:00
Guillaume P
16cff9097b Fix a compilation issue with VS10. 2014-03-09 10:10:34 +01:00
auriamg
112c46fa14 Merge pull request #1236 from divvy81/downstream 
Change of color player kart when any player quits
 2014-03-08 19:11:14 -05:00
Marianne Gagnon
56a8fe8fbe Some cleanup in particles. Make 'scale affector' behavior uniform between GPU particles and fallback irrlicht particles 2014-03-08 19:02:42 -05:00
Dk
b4d922512e 1195 Multiplayer Kart selection screen commit 22 2014-03-08 21:08:06 +05:30
hiker
796d43ebb2 For now avoid the use of the template, since it doesn't work on linux. 2014-03-08 12:24:44 +11:00
hiker
56b53cc3c0 Another try to fix linux compilation. 2014-03-08 11:49:18 +11:00
hiker
51f3a6d555 Added static template function to CurrentUser to create html requests, 
which will prefill the HTML request with the details of the current user.
So far used only in online_profile.
 2014-03-08 10:29:40 +11:00
hiker
809cb27d89 Fixed crash when clicking on empty achievement list. 2014-03-07 16:35:13 +11:00
hiker
f86646abb9 Fixed crash (when clicking on empty friend list). 2014-03-07 16:33:07 +11:00
hiker
3c1a7b1c7b Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-07 16:05:17 +11:00
hiker
c8749a3400 Fixed unnecessary include. 2014-03-07 16:04:59 +11:00
hiker
1ccac0db7c Fix #1232 (GP causes crash). 2014-03-07 16:04:10 +11:00
Marianne Gagnon
10caa7a2ec Post-merge tidying up 2014-03-06 19:19:39 -05:00
auriamg
780201b1ad Merge pull request #1226 from konstin/master 
Solving Issue 1180 - Load addon GPs from local folder
 2014-03-06 19:12:29 -05:00
hiker
58c325e6c3 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-07 11:02:53 +11:00
hiker
7cb7651c07 Renamed Profile to OnlineProfile to better distinguish the various profiles we use. 2014-03-07 11:02:07 +11:00
Vincent Lejeune
cbd7453f7b Do not crash if old shaders dont compile 2014-03-07 00:03:26 +01:00
hiker
d19b5a2732 Fxed support for searching for data and assets based on the executable location. 2014-03-07 07:53:35 +11:00
konstin
f7953f4f12 Adding debug messages for 1180 2014-03-06 20:30:52 +01:00
Dk
52e910a438 1195 Multiplayer kart selection commit 21 2014-03-06 23:39:33 +05:30
Dk
7c8a32a10e 1195 MUltiplayer kart selection cmmit 21 2014-03-06 23:31:34 +05:30
konstin
9ddd5a2d5c reducing the pull request to it's content 2014-03-06 11:58:09 +01:00
konstin
baa56f3254 Merge remote-tracking branch 'upstream/master' 2014-03-06 11:45:19 +01:00
konstin
b561f440ba 1180 Loading Grand Prix's from locale directory 2014-03-06 11:30:51 +01:00
hiker
0208dbaf8a Fixed #38, fixed #1230 (which is a duplicate). 2014-03-06 17:11:22 +11:00
hiker
58a5928b17 Fixed #1228 (crash when no default player is set and -N, -R, ... is used). 2014-03-06 17:06:41 +11:00
auriamg
605e4c6dff Merge pull request #1218 from divvy81/downstream 
1195 Multiplayer kart selection
 2014-03-05 18:04:03 -05:00
hiker
b0018d4e5f Removed unnecessary variable. 2014-03-06 08:49:30 +11:00
hiker
352863a763 Handled case that friends are not in cache when looking at the friend list 
(which can happen when you look at friends of friends, your own friends
are persistent).
 2014-03-06 08:21:54 +11:00
hiker
ebc2299150 Added more comments, code style cleanup only. 2014-03-06 08:04:43 +11:00
hiker
6450c569ac Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-06 07:44:18 +11:00
hiker
b80e9217f5 Fix camera tilting (some debug left-over broke it). 2014-03-06 07:43:51 +11:00
Dk
796c8b823a 1195 Multiplayer karts selection screen commit 20 2014-03-06 00:18:12 +05:30
Dk
7d87d79d20 1195 Multiplayer Kart Selection commit 19 2014-03-05 23:22:41 +05:30
Dk
c5d23f7154 1195 Multiplayer kart selection commit 18 2014-03-05 23:02:23 +05:30
Dk
eddc512b16 1195 Multiplayer kar selection screen commit 17 2014-03-05 21:37:07 +05:30
Dk
b5feb9740a 1195 Multiplayer kart selection commit 16 2014-03-05 21:08:17 +05:30
Dk
0e17d39f1a 1195 Multiplayer kart selection commit 15 2014-03-05 20:47:05 +05:30
Dk
1dab0daeb5 1995 Multiplayer kart selection screen commit 14 2014-03-05 20:16:48 +05:30
konstin
c09a3172f1 Solving Issue 1180 - Load addon GPs from local folder 2014-03-05 12:11:20 +01:00
hiker
eba8fd1e45 Remove passwords and tokens from Log:: output. 2014-03-05 10:34:28 +11:00
Vincent Lejeune
8600d3bc61 IBL: Spheremap now reflects skybox 2014-03-04 23:37:45 +01:00
Vincent Lejeune
391053e368 IBL: Implement IBL 2014-03-04 23:28:24 +01:00
hiker
02fa3ceed0 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-05 08:42:39 +11:00
Vincent Lejeune
718c1cacb0 Improved caustics effect. 2014-03-04 22:30:33 +01:00
hiker
586641120c Fixed crash in online user search (triggered when pressing ESC while the 
search is being executed).
 2014-03-05 08:21:19 +11:00
Vincent Lejeune
8f127be9de Fix caustic shader not picking caustic.png 2014-03-04 22:08:34 +01:00
Vincent Lejeune
ada5928aa2 Forgot a hunk 2014-03-04 18:47:10 +01:00
Vincent Lejeune
c93c921028 STKMesh: Support caustic material. 2014-03-04 18:42:33 +01:00
Vincent Lejeune
ada19f828c Fix black glowing objects. 2014-03-04 17:52:23 +01:00
hiker
f549b729df Remove camera tilting in flying mode. 2014-03-04 16:56:03 +11:00
hiker
3e478265bc Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-04 14:12:11 +11:00
Marianne Gagnon
a063d23b37 Fix intro cutscene 2014-03-03 18:57:10 -05:00
Vincent Lejeune
e1d879a1f2 STKMesh: Improve displace effect. 2014-03-03 23:59:12 +01:00
Vincent Lejeune
4ac634bb11 Fix motion blur edge. 2014-03-03 23:58:37 +01:00
hiker
46304e7f28 Removed m_fake_search, resorted functions to be in a more logical order, 
added comments.
 2014-03-04 08:15:46 +11:00
Dk
72346ee101 1195 Multiplayer kart select commit 13 2014-03-04 00:16:35 +05:30
Dk
99a19ee739 multiplayer kart selection commit 12 2014-03-03 23:53:15 +05:30
Dk
14467e320b 1195 Multiplayer kart selection screen 2014-03-03 23:32:43 +05:30
samuncle
7393fa0603 Add an attenuation based on depth 2014-03-03 16:38:26 +01:00
hiker
7592200a44 Added more comments. 2014-03-03 21:55:46 +11:00
hiker
4fd6d29462 Removed debug code. 2014-03-03 16:37:54 +11:00
hiker
c1afacfc38 Added support for limited resizing of the online profile cache 
if too many search results are found. Print warning (instead of
assert) to console if search results should be missing (because of
cache eviction).
 2014-03-03 16:32:05 +11:00
hiker
7cdc064640 Fixed replay using the --ghost command line option. 2014-03-03 13:14:56 +11:00
hiker
f1ecf999b2 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-03 10:03:02 +11:00
hiker
38bdca2038 Fixed typo. 2014-03-03 09:17:45 +11:00
hiker
0ec7542175 Added more comments. 2014-03-01 17:16:23 +11:00
hiker
e79a46ef38 Fixed crash when --track or --kart is used and no default player exists. 
Also only print an error message if --track or --kart do not work (e.g.
the track/kart is not unlocked, or no default player exists) instead of
aborting STK.
 2014-03-01 17:14:56 +11:00
Marianne Gagnon
d954fc6c72 Better fix for player info dialog 2014-02-28 19:54:18 -05:00
hiker
937533dbdb Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-01 11:35:46 +11:00
hiker
d1e02a6870 Removed commented out code. 2014-03-01 11:34:48 +11:00
hiker
9f6d6949f6 Merge branch 'master' of https://github.com/dimitrijejankov/stk-code into dim 2014-03-01 11:31:32 +11:00
Dimitrije Jankov
c8cba7df07 Fixes the player_info_dialog not loading... 2014-03-01 01:11:25 +01:00
Marianne Gagnon
093ac337d1 Fix GP info dialog 2014-02-28 18:28:42 -05:00
hiker
7e9682bde6 Merge branch 'master' of https://github.com/dimitrijejankov/stk-code into dim 2014-03-01 09:47:59 +11:00