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

8329 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
hiker
6fb9832fc2 Added box around screen, hide 'guest' if no online login is requested. 2014-05-07 17:10:02 +10:00
hiker
6c9fbb8dec Fixed hanging dialog if no password was entered. 2014-05-07 16:55:26 +10:00
hiker
1eed1272ad If a player is already selected when entering the UserScreen, 
display the name of the player instead of 'login'.
 2014-05-07 16:47:08 +10:00
hiker
83c29b0778 Instead of individual 'remember-me' settings, use one global setting. 2014-05-07 16:39:09 +10:00
hiker
6fab5e89fd Merge remote branch 'origin/master' into new_login 2014-05-07 13:04:35 +10:00
hiker
0be01a5977 Added rename functionality. 2014-05-07 08:00:03 +10:00
vlj
8e21810282 Encapsulate GPUTimer calls 2014-05-06 17:50:29 +02:00
hiker
737c8a9983 Added 'delete player' functionality. 2014-05-06 16:52:36 +10:00
hiker
bb18d65ccd Select the current player by default. 2014-05-06 11:39:55 +10:00
hiker
bef811e098 Fixed login problems (e.g. only online log in worked), improved handling 
of error message, removed need for m_login_successful.
 2014-05-06 08:21:53 +10:00
hiker
d847e8de00 Renamed StoryModeLobby to UserScreen. 2014-05-05 21:17:46 +10:00
hiker
6010831654 Removed original login screen, made the new login screen a tab. 
Removed guest tab (and started to use a checkbox for that for now).
Work in progress.
 2014-05-05 20:46:48 +10:00
hiker
00cf9a3dbe Merge remote branch 'origin/master' into new_login 2014-05-05 09:20:37 +10:00
hiker
fc3213a47d Fixed linux compilation. 2014-05-05 09:17:19 +10:00
hiker
5ff9d7f198 Block new StoryModeLobbyScreen while login is in progress (and display ... 
while this is happening). This allows to show error messages (e.g. user can
re-enter the password if login failed, without having to go to another menu
or perhaps even missing the fact that they are not logged in).
 2014-05-05 08:59:27 +10: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
hiker
d7219f3a2d Added 'ok' button to 'new player' dialog. I can't seem to get them next 
to each other, so for now they are just on top of each other.
 2014-04-30 16:57:22 +10:00
hiker
bb737d0448 Added error sfx. 2014-04-30 16:57:04 +10:00
hiker
af9fb24d2e Handle disabled internet (and provide a message to the user if he 
tries to login with internet disabled).
 2014-04-30 16:37:05 +10:00
hiker
a52b92083e Fixed typo. 2014-04-30 12:25:34 +10:00
hiker
5c7d29830d Fixed compiler warning. 2014-04-30 12:23:54 +10:00
hiker
3b8d988cd2 Fixed compiler warnings. 2014-04-30 11:34:53 +10:00
hiker
5124ba2bed Merge remote-tracking branch 'origin/master' into new_login 2014-04-30 11:28:13 +10: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
hiker
13024bf6ef On first time start the player is automatically asked to create a new 
player with a sensible default name.
 2014-04-30 08:42:43 +10:00
hiker
ecef685b32 Adding new players now works. 2014-04-30 07:54:49 +10: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
hiker
6f5c523e86 Fixed display of players, thanks to auria. 2014-04-29 09:46:00 +10:00
hiker
396e3bb54e Merge remote-tracking branch 'origin/master' into new_login 2014-04-29 09:10:37 +10:00
hiker
812da3e0c0 Some work on new login screen, though wip atm. 2014-04-29 09:02:44 +10:00
Guillaume P
03fbdc260d Add a new option for high-definition textures. 2014-04-28 18:42:23 +02:00
hiker
2f17264f39 Very eary first version of a new login screen. 2014-04-28 16:41:47 +10:00
hiker
b3291caea2 Moved 'startup now' code in separate function to make main more readable. 2014-04-28 07:51:24 +10: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
hiker
370e2e4935 Merge remote-tracking branch 'origin/master' into new_login 2014-04-24 12:26:29 +10: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
hiker
ea2b797bb3 Keep track of online ids used in the player.xml file. 2014-04-24 08:17:44 +10: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
hiker
3b85f601b1 Support automatic online login even if current user is not saved 
(i.e. online login is now started after the player is selected).
 2014-04-15 09:07:13 +10:00
hiker
f33a9f7cf6 Fixed #1282: STK crash on startup for the first time. 2014-04-15 09:06:50 +10:00
Marianne Gagnon
9993e31601 First pass to update video options menu 2014-04-14 19:05:33 -04:00
Marianne Gagnon
60a3cfb3fd Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-04-14 18:32:36 -04:00
Vincent Lejeune
ea1ba4147d Try to fix additive blend for object 2014-04-14 23:50:12 +02:00
vlj
4c85f6255b Remove the ability to disable pixel shaders 
It doesn't work with GL 3.1 and mesa drivers (which requires a core
context)
 2014-04-14 22:11:20 +02:00
vlj
b7f6084fba Add a config option to disable dynamic lights 2014-04-14 22:06:24 +02:00
vlj
63db2d33c0 Fix a memleak 2014-04-14 21:50:14 +02:00
vlj
b0041633ee Handle skybox texture compression. 2014-04-14 21:48:38 +02:00
vlj
de1bbad76c Add some more graphic config options. 2014-04-14 21:46:51 +02:00
vlj
1d84ea850b Add an option for Tex compression 
Also turn m_ssao into bool.
 2014-04-14 21:37:50 +02:00
vlj
308c9c3b94 Fix too dark screen with MLAA enabled. 2014-04-14 03:48:35 +02:00
Vincent Lejeune
5b47891514 Apply MLAA after color_in. 2014-04-14 03:30:42 +02:00
Vincent Lejeune
ba27eb42ef Bloom: Weight the different sized contribution. 2014-04-14 02:45:15 +02:00
Vincent Lejeune
d342dd78d8 Bloom: Use power of two quads. 2014-04-14 02:15:13 +02:00
Vincent Lejeune
123a192963 Use half res FBO for SSAO 
SSAO is a medium frequency effect, using half res fbo is fine and
improve performance and look by doing an additionnal bilinear filtering.
Also tune up some values.
 2014-04-14 01:01:36 +02:00
Vincent Lejeune
4c37cadd5f Fix crash when loading instanced node without texture. 2014-04-13 22:56:14 +02:00
Marc Coll Carrillo
82cc7af4f6 Avoid the use of the new GP editor as a cheating aid 2014-04-13 21:34:28 +02:00
Guillaume P
3febfecbef Merge remote-tracking branch 'remotes/upstrem/master' into skiddingAI 2014-04-13 20:31:28 +02:00
Marianne Gagnon
99a50ec70c misc little changes 2014-04-13 14:25:10 -04:00
Vincent Lejeune
3cd85a829e Compress/convert to srgb per material basis. 
This allows to remove manual conversion in normalmap shader.
 2014-04-13 17:53:52 +02:00
samuncle
1f14e26bde Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-04-13 01:01:59 +02:00
samuncle
04e5bb1239 Tweak the new camera 2014-04-13 01:01:24 +02:00
Vincent Lejeune
59c50ebbdd Use ITexture instead of GLuint in GLMesh 2014-04-12 22:33:27 +02:00
Marianne Gagnon
a2d60cc97d move camera closer to kart 2014-04-11 21:24:07 -04:00
vlj
d873d2d4fd Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-04-12 02:17:31 +02:00
vlj
3828e70f5a Fix for glow effect 2014-04-12 02:15:02 +02:00
hiker
fcedb80a89 Fixed some compiler warnings. 2014-04-12 09:49:46 +10:00
hiker
b8c304b229 Merge branch 'SmoothMoveCamera' of https://github.com/divvy81/stk-code into smooth 2014-04-12 09:28:18 +10:00
Vincent Lejeune
68a71f6e22 Use for_in macro in stkmeshscenenode too. 2014-04-12 00:47:32 +02:00
konstin
9d22b74b54 Fixing compilation issues on linux 2014-04-11 20:14:20 +02:00
vlj
8775a5e006 Properly clean FBO and RTT. 2014-04-11 17:53:28 +02:00
hiker
71ddeda94f Tried to avoid compilation problem on travis (though afaik there are 
still other issues with building on travis atm), though atm only
by a quick hack.
 2014-04-12 01:48:55 +10:00
Dk
d1dcf826a8 Merge remote-tracking branch 'upstream/master' into SmoothMoveCamera 2014-04-11 17:48:16 +05:30
hiker
488c1231c9 Moved getUserState from CurrentUser to PlayerManager::getCurrentOnlineState(). 2014-04-11 16:37:48 +10:00
hiker
3a5a0a56b2 Moved isRegisteredUser from CurrentUser into PlayerManager::isCurrentLoggedIn. 2014-04-11 16:20:04 +10:00
hiker
071aa01f35 Changed all calls to CurrentUser::getID() to PlayerManager::getCurrentOnlineId(). 2014-04-11 16:06:51 +10:00
Marianne Gagnon
00e85b4637 Use PtrVector to get for_in iteration 2014-04-10 20:04:33 -04:00
vlj
09d13e2bfe Try to fix travis ci build. 2014-04-11 00:37:50 +02:00
hiker
df88a013c2 Fixed more conflicts, removed compiler warnings. 2014-04-11 08:14:38 +10:00
hiker
54c7d67b90 Merge branch 'master' of github.com:supertuxkart/stk-code 
Conflicts:
	src/graphics/render.cpp
	src/graphics/shaders.cpp
	src/graphics/stkmesh.cpp
 2014-04-11 08:08:13 +10:00
hiker
27a5959fcc Added stack trace to LeakCheck on windows. Re-enabled stack 
trace printing (though off as default).
 2014-04-11 08:00:10 +10:00
vlj
42482e0c41 Some more conversion 2014-04-10 23:03:57 +02:00
vlj
3a55bbe796 Generalize use of UBO. 2014-04-10 21:16:44 +02:00
Vincent Lejeune
fee89a3a3e Start decoupling tree based draw sequence. 2014-04-10 21:16:43 +02:00
Vincent Lejeune
55097aba91 Add shader file as comment for easier debug 2014-04-10 21:16:43 +02:00
Vincent Lejeune
9ba636f661 Gather View Projection and shadows matrix generation. 2014-04-10 21:16:42 +02:00
hiker
8483f58f9d Moved saved session data from UserConfig to PlayerProfile - which 
means that now each player can individually save an online session.
 2014-04-10 21:14:13 +02:00
hiker
a6f4f50281 Fixed documentation. 2014-04-10 21:14:12 +02:00
hiker
6a3698232e Removed unused parameters. 2014-04-10 21:14:11 +02:00
hiker
ec213fbe28 Removed signedInAs function. 2014-04-10 21:14:11 +02:00
hiker
79edc5fa48 Made getCurrentUser() a static function. 2014-04-10 21:14:10 +02:00
hiker
1d71f8f1e1 Moved ServerJoinRequest from CurrentUser into RequestConnection 
(from which file it is also used in online_screen). And cosmetic
changes everywhere.
 2014-04-10 21:14:09 +02:00
hiker
1299db94e6 Cosmetic changes only. 2014-04-10 21:14:08 +02:00
hiker
502987d3e0 Now each PlayerProfile has a (currently still called) CurrentUser 
which manages online connection data. Work-in-progress to use
only one object for all player data (instead of two atm: PlayerProfile
and CurrentUser).
 2014-04-10 16:32:58 +10:00
Dk
e0d22a28d6 Camera Moves Back Smoothly 2014-04-10 07:06:13 +05:30
Marianne Gagnon
f42e4203cd Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-04-09 18:55:22 -04:00
Marianne Gagnon
c2fb05cc61 Compute tangents for core track mesh, allowing normal maps 2014-04-09 18:55:17 -04:00
hiker
481b5f22bb Fixed compiler warnings. 2014-04-09 19:07:58 +10:00
hiker
5182cdb18b Fixed line endings. 2014-04-09 19:07:44 +10:00
hiker
25c96d88ec Moved saved session data from UserConfig to PlayerProfile - which 
means that now each player can individually save an online session.
 2014-04-09 08:33:42 +10:00
hiker
de697f26c8 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-09 08:28:01 +10:00
Vincent Lejeune
55489bc188 Use UBO instead of copying Shadow VP matrixes. 2014-04-08 21:45:04 +02:00
Vincent Lejeune
d67834574b Remove some instance of setTransform. 2014-04-08 14:15:29 +02:00
Vincent Lejeune
4f92d9bc6b Remove unused code. 2014-04-08 13:49:13 +02:00
Vincent Lejeune
f65b460f1c Remove some reference to ETS_WORLD. 2014-04-08 13:49:11 +02:00
hiker
8c197a24b2 Fixed documentation. 2014-04-08 16:52:29 +10:00
hiker
c599359737 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-08 12:52:59 +10:00
vlj
62c6029e7a Clean another line. 2014-04-08 02:05:55 +02:00
vlj
84488b192f Another round at cleaning. 2014-04-08 02:02:08 +02:00
vlj
246d581e4c Some cleaning. 2014-04-08 01:52:19 +02:00
hiker
384bdb1124 Removed unused parameters. 2014-04-08 08:19:14 +10:00
hiker
38051c0191 Removed signedInAs function. 2014-04-08 08:09:28 +10:00
hiker
43593d6312 Made getCurrentUser() a static function. 2014-04-08 08:06:52 +10:00
hiker
5956f2fdf7 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-08 08:00:51 +10:00
Vincent Lejeune
c5fd99a096 Clamp to edge when blurring fbo. 2014-04-07 22:38:20 +02:00
Vincent Lejeune
8fc3453eda Fix instancied glossy map. 2014-04-07 22:29:06 +02:00
Vincent Lejeune
939e574cd8 Make bloom effect more subtle. 2014-04-07 22:19:25 +02:00
vlj
e00ce85d7c Support FresnelSchlick factor. 2014-04-07 21:35:10 +02:00
vlj
79c6424703 Use specularmap as glossiness map. 2014-04-07 21:35:09 +02:00
Vincent Lejeune
8aa5031fc0 FBO: Combined TMP1 and TMP2 should embed DS. 2014-04-07 17:47:49 +02:00
hiker
d88f513ad6 Moved ServerJoinRequest from CurrentUser into RequestConnection 
(from which file it is also used in online_screen). And cosmetic
changes everywhere.
 2014-04-07 21:15:42 +10:00
hiker
cb8daa4977 Cosmetic changes only. 2014-04-07 16:52:09 +10:00
hiker
9b1b66689b Moved achievement notification for server from CurrentUser to 
Achievement.
 2014-04-07 13:19:07 +10:00
Marianne Gagnon
569d68dfe1 Add asset to 'clearWindow' to catch invalid uses 2014-04-06 21:05:09 -04:00
Marianne Gagnon
06a3d770e5 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-04-06 20:57:37 -04:00
Marianne Gagnon
61ad56f088 Fix recovery dialog 2014-04-06 20:57:28 -04:00
gl3nn
8d3d65270a Don't allow showing the notification dialog without using the dialog 
queue anymore.
 2014-04-07 02:12:45 +02:00
hiker
73e8fb3556 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-07 09:42:09 +10:00
Marianne Gagnon
a413fa3f15 Add proper instancing fallback when shaders are off 2014-04-06 18:46:25 -04:00
Marianne Gagnon
456d57f7ce Instancing : don't crash when shaders are off 2014-04-06 18:31:15 -04:00
hiker
cb959acb44 Added 'action' parameter to setUserDetail, and made it work when 
the user is not logged in, so that it can be used for the recovery request.
 2014-04-07 08:25:48 +10:00
hiker
6b7dcedc02 Don't log the value of 'current', 'new1' and 'new2' (which are used 
when changing passwords).
 2014-04-07 08:13:33 +10:00
vlj
dd51124680 Fix specular light buffer not written to. 2014-04-06 17:40:51 +02:00
Vincent Lejeune
ada1d2617c Clear SSAO fbo at least once. 
On intel driver (windows) texture swizzling seem not to work everytime
so use an untouched rtt instead of swizzling SSAO rtt if ssao is
disabled.
 2014-04-05 21:21:01 +02:00
Vincent Lejeune
150ee87471 Use glFrameBufferTexture on shadows buffer 
We're sure there is at least gl 3.2 support.
 2014-04-05 20:53:38 +02:00
Vincent Lejeune
a951a8c885 Wrong glsl check when compressing textures. 2014-04-05 20:48:50 +02:00
Vincent Lejeune
04176d52a8 Do not create shadow vao for ctx < gl 3.2 2014-04-05 20:16:15 +02:00
Vincent Lejeune
012cf599b4 Use 2D version of glFramebufferTexture 
glFramebufferTexture is not supported on GL 3.1 context, while
glFramebufferTexture2D is.
Also fix an inverted comparaison.
 2014-04-05 19:22:03 +02:00
hiker
8e8f02a1dc Bugfix: if the recovery dialog was shown and cancelled, no more mouse 
events got sent to the LoginDialog. Seems to be the same problem that was
reported in #1216, and properly fixed in
d954fc6c72. Auria, can you check if this is correct?
 2014-04-06 01:27:04 +11:00
hiker
0a107897ca Moved user search and password change from CurrentUser into the 
corresponding dialogs.
 2014-04-06 01:25:31 +11:00
hiker
800a012283 Removed unnecessary copy of Addon. 2014-04-05 22:25:35 +11:00
hiker
a9ecf5b601 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-05 22:00:30 +11:00
hiker
4a3cf13bc4 Moved voting code from CurrentUser to VoteDialog. 2014-04-05 21:59:56 +11:00
Vincent Lejeune
2264f8e3a7 Disable srgb texture compression for Intel 
RGB texture compression works fine but it looks like srgb TC isnt
properly supported.
A later TODO would be to convert rgb to srgb in cpu and use compression
again.
 2014-04-05 03:13:45 +02:00
vlj
a57e81a37c Use custom FBO instead of Irrlicht's ones. 
This allows STK to use multisampled FBO.
 2014-04-05 02:42:05 +02:00
Vincent Lejeune
ca214230e3 MLAA: Load the right shader for step 2 
No wonder why it didnt work as expected before...
 2014-04-04 19:42:05 +02:00
hiker
85bd942de7 Removed unnecessary variable. 2014-04-04 21:00:22 +11:00
hiker
21f145b951 Moved requestGetAddonVote from CurrentUser into VoteDialog. 
Some cosmetic only changes to VoteDialog to follow style guide.
 2014-04-04 16:46:28 +11:00
hiker
34d79a8cd2 Fixed warning about modal dialog shown while previous dialog is open. 2014-04-04 16:44:55 +11:00
hiker
c663839d98 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-04 15:39:48 +11:00
hiker
59cbfbab6b Fixed compiler warning. 2014-04-04 13:51:27 +11:00
hiker
6bf328e199 Try to fix clang compilation (note that std::swap does not work 
on std::vector<bool>).
 2014-04-04 13:50:35 +11:00
hiker
de694cc5fe Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-04 08:36:24 +11:00
hiker
dcba93aa7e Moved canceling of friend requests into UserInfoDialog. 2014-04-04 08:15:48 +11:00
vlj
6a3556b4ba Shaders'outputs use premultiplied alphas 2014-04-03 14:46:35 +02:00
hiker
e8e4b7ad5f Fixed unnecessary double precision computation. 2014-04-03 17:13:54 +11:00
hiker
af94314462 Merge branch 'crash-impulsion' of https://github.com/gupascal/stk-code into gupascal-crash-impulsion 2014-04-03 17:00:51 +11:00
hiker
d9267a937a Moved 'removeFriendRequest' into UserInfoDialog. 2014-04-03 16:58:38 +11:00
Vincent Lejeune
afa2e2e98d Use a A8R8G8B8 fbo to apply mlaa. 2014-04-03 00:55:30 +02:00