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

7632 Commits

Author SHA1 Message Date
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
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
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
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
Marianne Gagnon
8227e1c092 Add first rudimentary way to dump profiler measurements to CSV. More work to do! 2014-02-12 21:06:12 -05:00
auriamg
0e722b30a3 Merge pull request #41 from sachith500/bug1118 
Bugfix for 1118
 2014-02-12 18:33:50 -05:00
Vincent Lejeune
57079cbff5 Shaders: Declare penumbraH/V and shadowgen 2014-02-12 23:32:18 +01:00
Vincent Lejeune
3d3333905d Some factorization. 2014-02-12 22:41:32 +01:00
Vincent Lejeune
3d61056b81 Revert "STKMesh: Force readonly materials." 
This reverts commit 8c5a5b9b20.
 2014-02-12 18:46:28 +01:00
Vincent Lejeune
8c5a5b9b20 STKMesh: Force readonly materials. 
We never changed materials on the fly but better safe than sorry.
 2014-02-12 18:31:21 +01:00
Vincent Lejeune
bff2208947 Remove rain effect. 
Rain enabled map crashes with non glsl codepath, and having a particle
effect handled separatly from others effect made it unmaintainable.
Rain must be implemented using gfx file with eventually a custom
property.
 2014-02-12 17:51:18 +01:00
Vincent Lejeune
0cf6e4266a Graphics: Clean some dead code. 
Still leave some shadow related code as comment, I will need later to
port cand's work on penumbra shadow.
 2014-02-12 17:51:17 +01:00
Sachith Hasaranga Seneviratne
56656b581d Bugfix for 1118 
Hide countdown as soon as race ends to prevent the drawGlobalTimer() method in race_gui from checking for failed challenges.

https://sourceforge.net/apps/trac/supertuxkart/ticket/1118

Signed-off-by: Sachith Hasaranga Seneviratne <sachith500@gmail.com>
 2014-02-12 22:04:21 +05:30
Vincent Lejeune
70f89a8bce Shadow: Use 4 cascades. 
Now that we use GS and textures array it's easier to add a cascade.
4 is still not optimal but I'd like to avoid cascade count inflation as
much as possible ; 4 x 1024x1024 has the bandwidth requirement of the
single 2048x2048 shadowmaps we previously had.
 2014-02-11 21:49:46 +01:00
Vincent Lejeune
934d1f10b8 Shadow: Use Geometry Shader for better perfs. 
The 3 cascades are now rendered in a single pass, using 2D array texture and
a GS to do the dispatch ("layered rendering").
It's possible to use instancing instead but it requires the AMD_vertex_shader_layer
extension which is oddly part of opengl 4.2.
 2014-02-11 21:07:44 +01:00
hiker
07a5d90aa0 Merge remote-tracking branch 'upstream/master' into new_login 2014-02-11 22:36:13 +11:00
hiker
ff585e4c73 Automatically compute active challenges when changing the current player. 2014-02-11 22:35:23 +11:00
hiker
7bba1ae478 Fixed saving first-time use of the story mode. 2014-02-11 22:28:41 +11:00
auriamg
b060b7651a Merge pull request #37 from KroArtem/master 
Fix coverity issues (memleaks, copy-paste error)
 2014-02-10 19:23:45 -05:00
hiker
7b45db42e7 Removed debug print. 2014-02-11 10:13:23 +11:00
hiker
2fe21fc3b2 Added operator<<(const bool&), to get proper true/false written 
instead of 0/1 - but it doesn't work yet :(
 2014-02-11 09:52:46 +11:00
hiker
83bc8c83e6 Fixed empty user config.xml files. 2014-02-11 08:54:44 +11:00
hiker
810c536d43 Fixed various minor bugs. 2014-02-11 08:12:10 +11:00
hiker
0228b82ef4 Fixed incomplete merge. 2014-02-11 07:41:35 +11:00
Vincent Lejeune
da6e6daeaa Create a BO with texture_2d_array for shadows. 2014-02-10 19:01:24 +01:00
Vincent Lejeune
515bcbc750 Shadow: very crude csm support 2014-02-10 15:42:17 +01:00
Vincent Lejeune
ad2dcff431 Revert "Fixed running on hd3000 (8192 was too big for my system, not sure" 
This reverts commit 748dcf1e15.
 2014-02-10 15:39:52 +01:00
hiker
8fc76729f9 Merge remote-tracking branch 'upstream/master' into new_login 2014-02-10 21:37:40 +11:00
hiker
8b7754cd4f Merge remote-tracking branch 'upstream/master' into new_login 
Conflicts:
	src/challenges/game_slot.cpp
	src/states_screens/kart_selection.cpp
	src/tracks/track.cpp
 2014-02-10 21:37:04 +11:00
hiker
748dcf1e15 Fixed running on hd3000 (8192 was too big for my system, not sure 
what values should be used best, I used the previous code here).
 2014-02-10 21:35:13 +11:00
hiker
230e1789f2 Made sorting of players descending (instead of using > in operator<), 
removed kart and unique id from game slot, replaced some forgotten calls to
unlock_manager with calls to PlayerManager.
 2014-02-10 17:00:16 +11:00
hiker
16521fce5a Removed loading and saving of challenge.xml file. 2014-02-10 15:28:13 +11:00
Vincent Lejeune
4fd130b2ac Shadow: Grass now cast shadows. 2014-02-09 23:24:01 +01:00
hiker
8d1591b260 Removed all references to current user/slot from unlock manager. 2014-02-10 08:57:16 +11:00
Vincent Lejeune
18896ff95e Shadow: Support for alpha tested meshes. 2014-02-09 22:56:50 +01:00
hiker
5acf3e1681 Various compilation fixes, some cosmetic changes. 2014-02-10 08:41:54 +11:00
Vincent Lejeune
1c510881a7 Shadow: Fix broken specular with shadows enabled. 2014-02-09 21:16:16 +01:00
Vincent Lejeune
5d5ac34648 Shadow: soften edge a little 2014-02-09 20:03:54 +01:00
Vincent Lejeune
f0ef8e9913 Shadow: reenable shadows 
It's just plain basic shadowmaps, a lot of tweak is still necessary but
it gives a way to see how light values are affected in some places.
(cave in chocolate for instance)
 2014-02-09 19:20:55 +01:00
KroArtem
dfe267e9ec Merge remote-tracking branch 'upstream/master' 2014-02-09 17:23:47 +04:00
KroArtem
33ea1a6ef5 fix coverity issues 2014-02-09 17:04:15 +04:00
hiker
97be85777d Started to move current player info from unlock manager into 
player_manager.
 2014-02-09 23:22:45 +11:00
KroArtem
452af6f423 fix typo 2014-02-09 02:16:14 +04:00
KroArtem
cdeab373c3 add assert in case ftell fails 2014-02-09 02:04:22 +04:00
KroArtem
49d14e5046 copy-paste error 2014-02-09 01:50:02 +04:00
KroArtem
c4fd2eda08 fixing some memleaks 2014-02-09 01:36:32 +04:00
Vincent Lejeune
ab05cb45b8 Shaders: Remove some unused shaders. 2014-02-08 18:19:16 +01:00
auriamg
3fdae349b2 Merge pull request #36 from KroArtem/master 
Clean src/modes and src/karts from old logging code
 2014-02-07 18:36:54 -05:00
KroArtem
1861c6533a small fix: mismatching allocation/deallocation 2014-02-08 01:21:39 +04:00
KroArtem
fde38a35af clean src/addons 2014-02-07 16:45:38 +04:00
KroArtem
591e421b10 clean src/io 2014-02-07 16:23:46 +04:00
KroArtem
746c1ddf5d clean src/items 2014-02-07 15:38:20 +04:00
KroArtem
c0b13b01ff clean src/modes from printf/cout/cerr 2014-02-07 02:17:49 +04:00
hiker
3fee08d743 Merge branch 'new_login' of github.com:hiker/stk-code into new_login 2014-02-06 23:09:49 +11:00
hiker
045bfeaf13 Removed m_all_players from UserConfigParams (though there are stil 
bugs in the new code).
 2014-02-06 23:08:55 +11:00
hiker
dd860f46f9 Fixed linux compilation. 2014-02-06 15:56:41 +11:00