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

8132 Commits

Author SHA1 Message Date
Marianne Gagnon
e1a5f8254b Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-05-07 19:35:35 -04:00
Marianne Gagnon
c8638ec968 Add basic support to display GPU markers in the profiler 2014-05-07 19:35:31 -04:00
Vincent Lejeune
4c9e2afe31 Cast some char to unsigned char 2014-05-08 01:25:37 +02:00
Vincent Lejeune
a73f03a2c4 Make use of gl_amd_vertex_shader_layer when available 2014-05-08 01:16:02 +02:00
vlj
cc368103b0 Remove an extra EndQuery 2014-05-08 00:03:21 +02:00
vlj
fd7399d983 Use instancing to expand shadows instead of GS 2014-05-07 23:57:07 +02:00
vlj
8e21810282 Encapsulate GPUTimer calls 2014-05-06 17:50:29 +02:00
Marianne Gagnon
654651215a Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-05-04 18:54:46 -04:00
Marianne Gagnon
5acb763ac8 Work on cutscenes 2014-05-04 18:54:37 -04:00
Vincent Lejeune
849467d281 Unload texture transformation state cache. 2014-05-04 20:25:16 +02:00
Vincent Lejeune
94ae8fb21e Use a more tighly fitting quad for pointlights. 2014-05-04 19:21:09 +02:00
Marianne Gagnon
ceb8265203 Merge branch 'NewGPCutscene' 2014-05-03 20:22:07 -04:00
Marianne Gagnon
bee4dcf36c Work on new GPWin screen. Seems to work well now 2014-05-03 20:21:34 -04:00
Marianne Gagnon
6b3d1a4770 More work on porting GP win scene 2014-05-03 19:42:38 -04:00
Marianne Gagnon
dc5d7f707d Work on GP end cutscene 2014-05-03 19:19:00 -04:00
Guillaume P
ab824f0ac3 Remove the use of cbegin and cend. (c++11 features) 2014-05-03 14:39:09 +02:00
Guillaume P
a863757365 Merge remote-tracking branch 'remotes/upstrem/master' into hd-textures-option 
Conflicts:
	data/gui/custom_video_settings.stkgui
	src/states_screens/dialogs/custom_video_settings.cpp
 2014-05-03 10:32:47 +02:00
Guillaume P
b4b2e44a08 Regenerate a cached texture when the original is newer. 2014-05-03 10:15:16 +02:00
Guillaume P
de5375ab9f Add subdirectories in the cache directory to organize textures of each track. 2014-05-03 09:35:51 +02:00
Marianne Gagnon
423a833bb8 Add DOF checkbox to the graphics options 2014-05-02 19:02:58 -04:00
Marianne Gagnon
1b7c9ee1e2 Initial work to port GP win/lose cutscenes to new system 2014-05-02 18:47:43 -04:00
Vincent Lejeune
2d34bd0f47 Do not built grass shadow shader 2014-05-02 23:47:24 +02:00
Vincent Lejeune
b22066d0ab Implement GL_ELAPSED_TIME query 
This allows to measure gpu execution time very accurately.
 2014-05-02 23:47:12 +02:00
Guillaume P
14508bc2ac Merge remote-tracking branch 'remotes/upstrem/master' into hd-textures-option 2014-05-02 19:18:58 +02:00
Guillaume P
7a3ba812d7 Use smaller textures when HD textures option is disabled. Generate them if they are not already in the cache directory. 2014-05-02 19:16:54 +02:00
vlj
2a1623d8ca Use a more efficient screen to view conversion 
Also use the opportunity to use UBO where possible.
 2014-05-02 18:11:34 +02:00
vlj
401471fc18 Allow to toggle dof off 2014-05-02 13:44:10 +02:00
Marianne Gagnon
3ce6dde466 try increasing light count 2014-04-30 19:43:27 -04:00
konstin
b0169d2896 small corrections in grand_prix_data.cpp 2014-04-30 10:55:38 +10:00
konstin
367acd7738 Almost rewrite of GrandPrixData::reload() 2014-04-30 10:54:42 +10:00
konstin
d747b6af3f Minor changes to the grand prix editor 2014-04-30 10:39:27 +10:00
hiker
3487f70740 Minor correction to patch from konstin. 2014-04-30 10:35:06 +10:00
konstin
ca08ee9d86 fixed identing, added comments, corrected spelling, etc. 2014-04-30 10:19:23 +10:00
Marianne Gagnon
4bddf29320 Fix bullet assertion failure 2014-04-29 19:48:54 -04:00
Guillaume P
fac9cafa96 Create the directory where resized textures will be cached. 2014-04-29 18:57:36 +02:00
hiker
b412d0507d Merge pull request #1303 from leyyin/master 
Fix some bugs in the online screens
 2014-04-29 16:25:18 +10:00
Marianne Gagnon
8d2b56a34a Improve flying mode, part 2 2014-04-28 19:55:41 -04:00
Marianne Gagnon
389ec42bde Improve flying mode 2014-04-28 19:55:30 -04:00
Guillaume P
03fbdc260d Add a new option for high-definition textures. 2014-04-28 18:42:23 +02:00
Marianne Gagnon
2ee7f7a2e8 Bugfix : use ambient light from the sun when SH maps are not used 2014-04-26 20:04:16 -04:00
Daniel Butum
5ecfed293d Fix back button in the register screen and login as guest 2014-04-26 13:42:30 +03:00
Daniel Butum
fc5da9eb9a Fix back button in login screen and fix 'move on uninitialised value in MusicInformation' 2014-04-26 13:33:09 +03:00
vlj
a2e202a695 Missing "track->hasShadows" check 2014-04-26 02:22:33 +02:00
Marianne Gagnon
97b6db3fdc Honor the per-track flag to disable god rays 2014-04-24 19:24:23 -04:00
vlj
c5fbd5ff84 Reenable ability to change exposure/lwhite. 2014-04-25 00:59:02 +02:00
vlj
5b8b1a8b57 Temporary comment out exposure/lwhite settings 2014-04-25 00:29:33 +02:00
Vincent Lejeune
7239154a3a NormalMap should cast shadows too 2014-04-24 21:23:32 +02:00
Vincent Lejeune
84ddd7119e Use glPolygonOffset to remove shadow acne 
It's a 2002 trick from M. Kilgard
 2014-04-24 21:02:24 +02:00
vlj
ef07b25202 Make possible to tweak exposure/lwhite in adm 2014-04-24 17:47:17 +02:00
Marianne Gagnon
3f17545541 Use hasShadows flag from Track 2014-04-23 19:19:11 -04:00
Marianne Gagnon
2e53328847 Add debug sliders for vlj 2014-04-23 19:03:23 -04:00
vlj
b939d06be5 Properly add Depth of Field 2014-04-23 22:08:37 +02:00
vlj
22d993dfbe Merge branch 'tonemap' 
Conflicts:
	data/shaders/tonemap.frag
 2014-04-23 18:20:30 +02:00
vlj
77795c796f Revert "Revert "Enable tonemap."" 
This reverts commit e57339841b.
 2014-04-23 18:18:43 +02:00
vlj
fb56a4086f Fix normalmap roughness 2014-04-23 18:09:48 +02:00
Vincent Lejeune
1bb4926ba2 Reorder post processes effects. 2014-04-23 18:09:48 +02:00
Vincent Lejeune
96c8180dfc Remove color_in, it's been superseeded 
Keep the shader because it will be partly used for dof.
 2014-04-22 19:51:36 +02:00
hiker
2e3adee1a2 Merge branch 'master' of https://github.com/whichrakesh/stk-code into whichrakesh-master 
Fix counting of bananas only for current player. Fixed conflicts.
Conflicts:
	src/achievements/achievement_info.hpp
 2014-04-22 17:20:40 +10:00
hiker
469ac9c433 Don't fire a cake if the target kart is invulnerable. Some cosmetic 
changes to reduce line length, and added more comments.
 2014-04-22 16:53:12 +10:00
hiker
ef341344e7 Merge branch 'skiddingAI' of https://github.com/gupascal/stk-code into gupascal-skiddingAI 2014-04-22 14:29:35 +10:00
hiker
886e7614e2 Fixed -help command line options (which was broken elsewhere before). 2014-04-22 14:24:32 +10:00
hiker
1bff514c27 Merge branch 'master' of https://github.com/leyyin/stk-code into leyyin-master 2014-04-22 14:14:49 +10:00
hiker
c8d679139f Improved documentation. 2014-04-22 14:13:27 +10:00
Vincent Lejeune
b0e56ca2b0 Use some diffent value/equation for tonemap 2014-04-22 02:29:22 +02:00
Marianne Gagnon
5373390fac Load textures for ambient lights separately from skybox textures 2014-04-21 20:25:51 -04:00
Vincent Lejeune
e57339841b Revert "Enable tonemap." 
This reverts commit a0e63dea46.
 2014-04-22 00:44:58 +02:00
vlj
a0e63dea46 Enable tonemap. 2014-04-21 02:33:12 +02:00
vlj
8947242de4 Add proper tonemap, although disabled. 
It currently generates way too much HDR.
 2014-04-21 01:52:44 +02:00
vlj
1d40851600 Fix light shaft 2014-04-21 00:52:18 +02:00
Marianne Gagnon
f0b61c98d7 No longer create an obsolete irrlicht water node. To be replaced by a better water shader 2014-04-19 20:24:43 -04:00
Marianne Gagnon
8e579d4874 Add UBOs flag to graphics options 2014-04-19 20:23:49 -04:00
vlj
87248b46f3 Tweak shadows CSM split. 2014-04-20 02:01:29 +02:00
vlj
fde29887f0 Fix roughness in instanced mesh. 2014-04-20 01:24:38 +02:00
Marianne Gagnon
478e904d1c Remove debug logging 2014-04-19 19:15:38 -04:00
vlj
18b2b341e7 Dont stick to integer coordinate for CSM. 2014-04-20 00:24:37 +02:00
vlj
1291d0cc93 Increase shadow fidelity. 2014-04-20 00:21:30 +02:00
vlj
a457b9f423 Shadows: Clean shaders. 2014-04-20 00:04:49 +02:00
vlj
dd3e15b298 Debug: display cascade in shadow debug mode 2014-04-19 23:57:27 +02:00
vlj
5d3d44e400 Avoid an extra blit in bloom. 2014-04-19 23:29:42 +02:00
vlj
ce6397c5e7 Remove an leftover return. 2014-04-19 23:20:40 +02:00
vlj
c353a60443 Glow: Use blit. 2014-04-19 23:20:12 +02:00
Daniel Butum
c7e9b87e90 Fix memory leak on early exit(0) in handleCmdLinePreliminary() 2014-04-19 20:44:30 +03:00
Vincent Lejeune
d7eaaf4885 Add a m_ubo_disabled switch in user config file. 
This should be used to workaround a bug in intel windows drivers.
 2014-04-19 18:38:57 +02:00
vlj
c695875654 PointLight: Use a 1/(1 + d + k d^2) attenuation 
This is not physically accurate, but a 1/d^2 attenuation makes light
extend too broad, and went too high if close from the source.
 2014-04-19 02:04:39 +02:00
Marianne Gagnon
f6d52511ea Merge branch 'Issue_1263' 2014-04-18 18:24:31 -04:00
Vincent Lejeune
c2d9e9fc42 Directly draw on default fbo if dyn lights are disabled 2014-04-18 19:06:57 +02:00
Vincent Lejeune
9437b16c00 Dont print glGetError result, prefer DEBUG_OUTPUT 2014-04-18 18:50:13 +02:00
Vincent Lejeune
b77a20f621 Bloom: Blit fbo instead of using a shader 2014-04-18 18:45:00 +02:00
Vincent Lejeune
9b926ce713 Do not write to 2 buffers outside of renderLights() 2014-04-18 18:34:02 +02:00
Guillaume P
cca44705cb Merge remote-tracking branch 'remotes/upstrem/master' into skiddingAI 2014-04-18 08:49:54 +02:00
Guillaume P
43441cf3cc A kart is now considered as slow if he is slower than the current kart. 2014-04-18 08:49:18 +02:00
hiker
c9fd09725a Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-17 15:40:36 +10:00
hiker
a8bf73633f Renamed CurrentUser to OnlinePlayerProfile. 2014-04-17 15:39:51 +10:00
hiker
f6d22922d2 Fixed linux compilation. 2014-04-17 13:18:31 +10:00
hiker
056aa5ed6f Refactor so that PlayerProfile provides a proper interface plus 
function/states for local use, and CurrentUser implements the
missing functions.
 2014-04-17 08:19:04 +10:00
hiker
447ca89c0a Removed CurrentUser usage from all files except PlayerManager 
and PlayerProfile.
 2014-04-16 11:13:35 +10:00
Vincent Lejeune
1a908b254f Use more compatible fbo format 2014-04-15 14:48:27 +02:00
hiker
5ec71c5b06 Moved getProfile from CurrentUser to PlayerManager::getCurrentOnlineProfile(). 2014-04-15 16:25:55 +10:00
Marianne Gagnon
70cb9cec59 Update graphics options screen 2014-04-14 19:32:44 -04:00
hiker
8b05f69031 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-15 09:08:04 +10:00