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

12649 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Lejeune
06df2d12c7 Forgot to free a temp array. 2014-08-20 23:16:20 +02:00
Vincent Lejeune
04f6c7e729 Use singleton template for VAOManager (ex VBOGatherer) 2014-08-20 23:08:04 +02:00
Deve
c2cf83bb6a xrandr: move restore resolution to separated function because it makes a mess... 2014-08-20 19:44:06 +02:00
Deve
56fa56a38f xrandr: don't restore resolution if output was disconnected during game 2014-08-20 19:44:06 +02:00
Deve
5c4c54bf20 xrandr: make sure that output_id and old_mode are declared 2014-08-20 19:44:06 +02:00
hiker
4a028afb8f Merge branch 'master' of github.com:supertuxkart/stk-code 2014-08-20 21:25:15 +10:00
hiker
4228fbb0d4 Temporary fixed windows compilation (glGetStringi not known). Needs 
a proper fix!!
 2014-08-20 21:24:20 +10:00
hiker
6073788813 Fix linux compilation (no nullptr). 2014-08-20 21:07:12 +10:00
Deve
6a48010644 Fixed compilation error with disabled xrandr 2014-08-20 06:49:38 +02:00
Stephen Just
6b3786457f Fix OpenGL extension detection on Linux/Mesa. 
Created function in glwrap to test whether a GL extension is available.
This required using OpenGL3's glGetStringi. Backwards compat code can
be added to function if necessary.
 2014-08-19 16:19:38 -06:00
vlj
160d4ae432 Merge branch 'texture-factorization' 2014-08-20 02:54:54 +02:00
vlj
fc945a429f Another place found 2014-08-20 02:46:48 +02:00
vlj
d11d56f6cd Replace std::vector<GLuint>{...} in post_processing 2014-08-20 02:42:59 +02:00
vlj
7de6b7adcd Use createVector in others places 2014-08-20 02:21:34 +02:00
vlj
4197e2c320 Another ifdef sets... 2014-08-20 02:05:16 +02:00
vlj
5559a9fd1d Add some #if !defined(APPLE) in debug screen 2014-08-20 02:02:34 +02:00
vlj
b3e6ed03b1 Use VERSION_3_3 macro 2014-08-20 01:56:16 +02:00
vlj
af4fdaf96b Add "functionnal" include in debug.cpp 2014-08-20 01:56:04 +02:00
vlj
953dd9db0d Put some others bunch of code between ifdef win32 2014-08-20 01:48:28 +02:00
Marianne Gagnon
ffd558e577 Merge branch 'texture-factorization' of https://github.com/supertuxkart/stk-code into texture-factorization 
Conflicts:
	src/graphics/post_processing.cpp
 2014-08-19 19:45:24 -04:00
Marianne Gagnon
5788073b17 osx fixes 2014-08-19 19:44:27 -04:00
vlj
ef95f5703a Add createVector in another place. 2014-08-20 01:37:50 +02:00
vlj
d0e22164d5 Add some ifdef for OSX 2014-08-20 01:31:11 +02:00
vlj
190aed6219 Use createVector in some others places 2014-08-20 01:27:26 +02:00
vlj
a28f4d26b4 Add a "createVector" function for OSX 2014-08-20 01:13:39 +02:00
vlj
af9c3d53b7 Use template to declare shader texture usage. 2014-08-19 22:06:49 +02:00
vlj
2a473a550a Remove wrappers. 2014-08-19 17:30:44 +02:00
vlj
92e5126ebf Fix travis ci 2014-08-19 17:16:27 +02:00
Vincent Lejeune
4641854c49 Factorize gl headers include in a separate file. 
It should avoid conflict with Xorg headers
 2014-08-19 17:01:45 +02:00
vlj
5128ab920b Fix build 2014-08-19 17:01:32 +02:00
Vincent Lejeune
30c91217a7 Factorize gl headers include in a separate file. 
It should avoid conflict with Xorg headers
 2014-08-19 16:52:49 +02:00
vlj
bd7ec06d49 Fix build 2014-08-19 16:52:43 +02:00
Vincent Lejeune
da843cc8c1 Add sampler object support 2014-08-19 02:36:06 +02:00
vlj
bdd7951c46 Split animated meshes list from the others 2014-08-19 02:35:51 +02:00
Marianne Gagnon
9af41a5166 Add actual light under thunderbird 2014-08-18 20:01:45 -04:00
Vincent Lejeune
da90ea491e Unlit material supports tex matrix 2014-08-19 01:36:06 +02:00
auriamg
fcbc41171e Merge pull request #1463 from konstin/gp_editor_laps 
small improvements to the gp editor
 2014-08-18 19:04:43 -04:00
Deve
0dc34b2c0d xrandr: few more checks 
- try to run in windowed mode if no output was found
 - close display correctly in case of no output
 - add few warnings
 2014-08-18 20:56:30 +02:00
konstin
33686e9abc make gp editor use default number of laps 2014-08-18 15:16:53 +02:00
konstin
e400b5c212 improve readability 2014-08-18 15:15:22 +02:00
konstin
2f6424c3a2 replace unecessary NULL-checks 2014-08-18 15:11:51 +02:00
hiker
fe62df253d Exit quicker if a request is being executed when stk is quit. 2014-08-18 22:43:26 +10:00
hiker
b2a936c8cd Fix crash caused when downloading requests for icons were still 
executing at game end.
 2014-08-18 22:42:27 +10:00
Marianne Gagnon
fcb80cdb2c Update thunderbird to have new-engine-friendly traffic light animation 2014-08-17 19:33:45 -04:00
Marianne Gagnon
83a1acc961 Merge branch 'save_gp' 2014-08-16 15:42:46 -04:00
Marianne Gagnon
9992f3afa6 bugfix 2014-08-16 15:42:35 -04:00
Marianne Gagnon
5ed8358505 Misc fixes, null crash on invalid billboards, some non-weather particle emitters incorrectly created with Y randomization 2014-08-16 15:26:39 -04:00
Deve
3e3a27252a xrandr: fixed memory leak 2014-08-16 16:02:22 +02:00
Deve
a9bd12bfab xrandr: use primary output if window manager reports this information 2014-08-16 12:21:55 +02:00
Deve
990a297154 Get real width and height of best fit resolution only if resolutions list is not empty. 2014-08-16 12:21:55 +02:00