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

11561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vlj
8e21810282 Encapsulate GPUTimer calls 2014-05-06 17:50:29 +02:00
Stephen Just
efb85943d1 Fix for #1297. DoF shader compiles in mesa now. The other problem noted 
in the issue was just texture compression + intel.
 2014-05-05 07:59:20 -06:00
Vincent Lejeune
65e4177f5c Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-05-05 01:47:00 +02:00
Vincent Lejeune
d316263660 Tweak light extent again to improve perf 2014-05-05 01:46:57 +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
d6d7c6179c Simplify pointlight.vert 2014-05-04 19:46:21 +02:00
Vincent Lejeune
94ae8fb21e Use a more tighly fitting quad for pointlights. 2014-05-04 19:21:09 +02:00
Marianne Gagnon
30929ef0a7 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-05-03 20:22:26 -04: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
vlj
35df307c3f Tweak light extend. 2014-05-03 23:44:27 +02:00
vlj
5e62347d11 Fix attempt for #1308 2014-05-03 17:36:27 +02: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
2f1578ba32 Potential fix for #1305 2014-05-02 13:54:23 +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
Vincent Lejeune
18aa119890 Tweak light attenuation. 
Doesnt really change the look of the light but reduce their extent.
 2014-04-27 18:31:00 +02:00
Vincent Lejeune
9ac57c3919 Tigher fit of light extent 2014-04-27 18:04:39 +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
a769563878 Fix back button size in guest login screen 2014-04-26 14:03:14 +03: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
924e09b3e9 Very slight tweak 2014-04-25 20:02:16 -04:00
vlj
2ca11c3166 Auria provided tonemap coefficients 2014-04-26 02:00:50 +02:00