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

7784 Commits

Author SHA1 Message Date
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
Dk
84cc9dd972 1195 Multiplayer kart selection 2014-03-01 00:01:32 +05:30
Vincent Lejeune
168780a3ac Clean some code. 2014-02-28 17:56:45 +01:00
Vincent Lejeune
af862cb6c5 #version autoadded to shaders and turn some v120 2014-02-28 17:29:05 +01:00
Dimitrije Jankov
a354648497 Fix for 
Author: hikerstk

Atm the user config.xml file is in UTF (since previously it stored the
name of players which requires special characters). The player
information is now stored in a separate file, so the config.xml can be
written as ascii now (avoiding problems some people have that they can't
see or edit the file)
 2014-02-28 15:32:38 +01:00
hiker
1903aee114 Changed lower and upper bound (at lower speed less speed should be 
lost), capped speed fraction. Tweaked parachutes parameters somewhat.
 2014-02-28 23:57:49 +11:00
Dk
15faf7dbee 1195-Multiplayer kart selection 2014-02-28 16:51:27 +05:30
Bart Cools
c131312b33 Implemented the possibility to give yourself "negative" attachments (parachutes, anvils, bombs) to be able to playtest more efficiently 2014-02-28 11:10:35 +01:00
Bart Cools
89a336ff9a Tweaked the logic of parachutes to be more modifiable. There now is an upper bound percentage and lower bound percentage which will be applied if you are driving faster and slower respectively. Also added those values in stk_config.xml to make playtesting easier (ticket #1135) 2014-02-28 11:10:25 +01:00
Dimitrije Jankov
9fc0d5be77 This fixes the issues my patch has caused... 
1) if I start without existing user config files, it crashes (current
player is NULL)
2) the m_remember_me variable is not used
3) if I understand the code correctly, it sets the current player to a
guest player to indicate that there is no current player atm (which is
then used to start the login window). If this correct, then it would be
better to indicate this by setting the current player to NULL. Reason is
that this way we can easily detect incorrect usage elsewhere (since we
will get a crash, instead of storing data in the guest player, and we
will only later detect that something was not saved as expected).
 2014-02-28 10:23:09 +01:00
hiker
14d6e6ae7e Added missing initialisation of m_is_default. 2014-02-28 19:01:40 +11:00
Dimitrije Jankov
d0f93d3b98 Fixed the skiping of the lobby screen :) 2014-02-28 02:36:53 +01:00
Dimitrije Jankov
2ef991e9e7 Removed the m_default_player from the user_config.hpp because the 
default user is loaded from the players.xml file
 2014-02-28 00:38:35 +01:00
hiker
0ddeb3b434 More documentation, and usage of typedef instead of std::vector<...>. 2014-02-28 09:19:10 +11:00
hiker
bef02c116c Bugfix: addPersistent/addToCache would call Profile::merge(), which 
deletes the original profile --> the profile accessed after this call
was invalid.
 2014-02-28 08:51:02 +11:00
hiker
76787599d9 Moved some class declarations into functions. Added comments. 2014-02-28 08:48:07 +11:00
hiker
db0c75b988 Make sure that the used bit of a profile is always set when updating 
the cache bits (even though it probably doesn't matter, but that's
hard to understand, this way is cleaner).
 2014-02-28 08:12:03 +11:00
hiker
efdb78f012 Added comments, sorted some functions so that all cache functions 
are next to each other etc. No actual code change.
 2014-02-27 16:55:32 +11:00
hiker
a686c43dd8 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-27 15:36:51 +11:00
hiker
42b72cc2a8 Added comments, minor code changes only. 2014-02-27 15:29:30 +11:00
Vincent Lejeune
108e82afc2 Fix Sara's moving textures. 2014-02-27 01:49:03 +01:00
Vincent Lejeune
9941b18d7f Rework moving textures support. 2014-02-27 01:22:34 +01:00
hiker
d734d310ab Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-27 09:36:11 +11:00
Vincent Lejeune
7532ea1768 Skybox: Do some cleaning. 2014-02-26 22:28:06 +01:00
Vincent Lejeune
61ea376ff2 Use cubemap for skyboxes 2014-02-26 19:08:24 +01:00
hiker
1c6d63acc7 Added separate create() function for ProfileManager, and some cosmetic changes. 2014-02-26 16:34:46 +11:00
hiker
4d6b110e56 Removed unnecessary #include of user_config.hpp in other hpp files 
(to reduce the amount of recompilation when user_config.hpp is changed).
 2014-02-26 12:52:16 +11:00
hiker
04fe9b6329 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-26 12:07:51 +11:00
Marianne Gagnon
2a8476305d Fix uninitialized variable 2014-02-25 20:06:02 -05:00
hiker
96a0c599d1 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-26 11:55:38 +11:00
Marianne Gagnon
196cbdee09 Fix bogus error level 2014-02-25 19:14:51 -05:00
Vincent Lejeune
c4a38b413f Remove cullface disable in ref tested texture. 2014-02-26 00:43:29 +01:00
hiker
36c9c4d6c3 Fix the display of achievement progress: avoid that a value can be 
larger than the goal value (otherwise after racing one track 12 times
the progress for Christoffel would should 12/10).
 2014-02-26 10:36:02 +11:00
Marianne Gagnon
e1830b4e8a Replace printf with log 2014-02-25 18:31:43 -05:00
hiker
0b33474f2f For now disable shader by default, to avoid people not being able to 
run stk at all (#1212).
 2014-02-26 10:24:09 +11:00
Vincent Lejeune
6e6667a2ea Check minor gl version 2014-02-26 00:00:50 +01:00
hiker
4139d145cf Create a default user config file if no user config file exists. 
This is for now useful for crash problems (e.g. to disable shaders).
 2014-02-26 09:41:38 +11:00
hiker
ac2619007f Fixed translation. 2014-02-26 09:16:40 +11:00
hiker
c6288af326 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-26 08:40:51 +11:00
hiker
b17d2ca0e2 Started to add support for offline achievement viewings (still not 
fully working).
 2014-02-26 08:19:24 +11:00
hiker
7644a5960f Fixed bug (instance variables were access after the object was deleted); 
addded code to show the achievement screen.
 2014-02-26 08:17:49 +11:00
Vincent Lejeune
65c0750525 Clean some unneeded code and fix ssao viz. 2014-02-25 19:01:35 +01:00
hiker
f8a462a39f Added support for different types of achievement checking: besides 
'all-at-least' (all keys must be >= the corresponding goal value) now also
'one-at-least' (at least one key is >= a constant goal value) is supported.
Implemented 'Arch Enemy' achievement: hit the same kart at least 5 times
in one race.
 2014-02-25 17:20:24 +11:00
hiker
2cb1f1fc78 Let only hits from the current player trigger an achievement. 2014-02-24 23:25:56 +11:00
hiker
99fe4388d4 Added an enum to reference the achievements by a name instead of 
an integer number.
 2014-02-24 17:14:42 +11:00
Marianne Gagnon
6eaa1e6db8 Fix crash in tracks without skybox 2014-02-23 19:35:30 -05:00
hiker
71f61f71c6 Fixed compilation errors - no idea why VS compiled it ok previously :( 2014-02-24 08:26:51 +11:00
hiker
4f266639aa Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-24 08:22:55 +11:00
hiker
5fc300d7bb Removed Single and MapAchievent (and Singe/MapAchievementInfo), instead 
using the generic key-value mapping Map* has provided for everything.
Changed format of achievements.xml to be more compact.
 2014-02-24 08:21:15 +11:00
Vincent Lejeune
2d1acf5353 Godray: improve the effect and its stability. 2014-02-23 20:16:03 +01:00
Vincent Lejeune
04fc4c3be7 Reenable Godray (on all track atm) 2014-02-23 20:02:15 +01:00
Vincent Lejeune
778cdcf3ce Godray/Godfade now declared in new pipeline. 2014-02-23 18:59:24 +01:00
KroArtem
30977b7913 Merge remote-tracking branch 'upstream/master' 2014-02-23 19:41:00 +04:00
Vincent Lejeune
a00abffb01 MotionBlur: Use direct GL calls. 2014-02-23 00:13:22 +01:00
Vincent Lejeune
58ef59dcd9 Split stkmesh into mesh and actual scene node 2014-02-22 23:31:27 +01:00
hiker
b4099b5354 Made the story mode xml file format more compact by saving only the 
highest level at which a challenge was solved (lower levels will
automatically be marked as solved).
 2014-02-22 11:44:21 +11:00
KroArtem
08fcb42e7b Merge remote-tracking branch 'upstream/master' 2014-02-21 20:59:41 +04:00
hiker
90343ff276 Fixed missing initialisation of m_reset_after_race, and added 
error message in case of missing achievement data.
 2014-02-21 23:39:14 +11:00
hiker
b214799a35 Some refactoring in he Achievement classes, code style cleanup. 2014-02-21 22:15:36 +11:00
hiker
8307e0d8a3 Fixed memory leak. 2014-02-21 16:54:52 +11:00
hiker
1921dbdacd Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-21 13:38:55 +11:00
Vincent Lejeune
1325fa7940 Fix UI clipping. 2014-02-20 18:43:51 +01:00
Vincent Lejeune
8ba0fcb8e0 STKMesh: Transparent texture can move now. 2014-02-20 18:31:00 +01:00
hiker
8f36220b61 Renamed AchievementsSlot to AchievementsStatus. 2014-02-20 23:03:25 +11:00
hiker
700953f295 Removed unnecessary save function. 2014-02-20 22:37:27 +11:00
hiker
a3a5d5fc3b Moved achievements data into PlayerProfile (and data is saved in players.xml 
now instead of in a separate achievements.xml file).
 2014-02-20 22:04:03 +11:00
Vincent Lejeune
40c4155bd2 STKMesh: Support for (non ref) moving texture 2014-02-20 00:01:02 +01:00
hiker
55665e21a3 Removed some compiler warnings. 2014-02-20 08:55:35 +11:00
hiker
b0b9712fb9 Removed friend relation between StoryModeStatus and UnlockManager. 2014-02-20 08:44:57 +11:00
samuncle
e3f85ba41b Tweak the cam tilt 2014-02-17 23:47:07 +01:00
hiker
fb1c73718a Try to remove shaking of camera somewhat. 2014-02-18 08:51:03 +11:00
hiker
23301d822a Experimentally adjust camera up vector depending on kart roll, which means 
the camera will now follow the gravity changes.
 2014-02-18 08:18:33 +11:00
hiker
a34d47d72a Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-18 07:53:30 +11:00
hiker
8cd1e2e491 Renamed the node name in the player.xml file to better describe what 
it is, removed unused variable.
 2014-02-18 07:38:44 +11:00
Vincent Lejeune
e5a174d85b Add compatibility keyword on and remove some unused shaders 2014-02-17 15:34:57 +01:00
hiker
94da45238c Renamed GameSlot to StoryModeStatus to better describe its function. 2014-02-17 23:16:53 +11:00
hiker
f2e6126f8d Renamed Challenge to ChallengeStatus (to better describe what 
this class is doing).
 2014-02-17 22:20:23 +11:00
hiker
2b4729a145 Renamed player.?pp to player_profile.?pp (to follow our style 
guide); removed unnecessary #includes.
 2014-02-17 20:10:29 +11:00
hiker
6685966616 Fixed flying. 2014-02-17 17:00:11 +11:00
Marianne Gagnon
148ab7deb3 Improve profiler to CSV export 2014-02-16 19:05:30 -05:00
hiker
753e5199b9 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-17 10:58:11 +11:00
hiker
c84264a44e Fixed linux compilation bug. 2014-02-17 10:57:40 +11:00
Marianne Gagnon
8763b95603 Merge branch 'master' of https://github.com/supertuxkart/stk-code 
Conflicts:
	src/utils/profiler.cpp
 2014-02-16 18:11:17 -05:00
Marianne Gagnon
1e8c2ff523 Use plain ofstream to write profiler CSV 2014-02-16 18:10:29 -05:00
Marianne Gagnon
289505d909 Add missing profiler 2014-02-16 17:42:06 -05:00
hiker
7a1670bc8a Merge branch 'master' of github.com:supertuxkart/stk-code into new_login 
Conflicts:
	src/utils/profiler.cpp
 2014-02-17 09:41:55 +11:00
hiker
8cccc72b9a Fixed merge from upstream. 2014-02-17 07:48:18 +11:00
hiker
10db4d6c2c Removed unused variable. 2014-02-17 07:47:01 +11:00
hiker
7b993cd210 Fixed VS compilation. 2014-02-16 21:31:41 +11:00
hiker
c2b4f42c93 Merge remote-tracking branch 'upstream/master' into new_login 2014-02-16 15:11:50 +11:00
KroArtem
12a9b92af0 replace auto_ptr by unique_ptr as auto_ptr is deprecated 2014-02-16 00:32:40 +04:00
Vincent Lejeune
d5d57bbae0 Shadows: Softer edge and smoother cascade transitions 2014-02-15 20:45:47 +01:00
Marianne Gagnon
fd8496ffba Fix linux/gcc compilation 2014-02-13 18:57:51 -05:00