Commit Graph

11774 Commits

Author SHA1 Message Date
Stephen Just
1070fd7395 Fix segfault on Linux/Mesa
For some reason, glGetString(GL_EXTENSIONS) is failing. This will need more investigation
2014-05-07 23:19:39 -06:00
hiker
15f43a0537 Merge branch 'master' into new_login 2014-05-08 13:35:40 +10:00
Vincent Lejeune
5f6829b071 Simplify some code and have a function that render a scene from a cam pov 2014-05-08 03:14:00 +02:00
Vincent Lejeune
1746835cae Factorize godray visibility test in its own function. 2014-05-08 02:14:31 +02:00
Vincent Lejeune
8a64d411d9 Remove debug arount scoped timer. 2014-05-08 02:07:03 +02:00
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
d4b263761e Fix #1231 - stk-code/data not found on windows (secondary report). 2014-05-07 13:23:22 +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
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
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
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
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
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