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

9099 Commits

Author SHA1 Message Date
Vincent Lejeune
04f6c7e729 Use singleton template for VAOManager (ex VBOGatherer) 2014-08-20 23:08:04 +02:00
hiker
210a8e7ae9 Set the graphical suspension depending on physical suspension (capped). 
Adjusted graphical chassis to be 0.1 higher to have similar look at previously
and avoid graphical chassis going into terrain,
 2014-08-20 22:19:26 +10:00
hiker
e95536c265 Fixed height computation. Moved adding of gravity center 
shift, which probably fixed the problems we had with
 'wheels inside kart chassis' tests earlier.
 2014-08-20 21:35:22 +10: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
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
5788073b17 osx fixes 2014-08-19 19:44:27 -04: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
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
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
hiker
8c525ab2d4 Make the physics settings configurable, but default to use the old 
settings for now.
 2014-08-16 10:20:24 +10:00
hiker
6d5651f357 Test to see if the physics work better. 2014-08-16 09:44:00 +10:00
Marianne Gagnon
af33992691 Remove accidentally added file 2014-08-15 18:34:59 -04:00
vlj
8b81d0ac3f Map UBO to change its value. 2014-08-16 00:33:47 +02:00
vlj
5f6d0bd63c Use stream storage for ubo 2014-08-16 00:19:45 +02:00
vlj
cbd77b469c Do not use srgb fbo if ubo workaround is enabled. 2014-08-15 22:06:05 +02:00
Vlj
647a5d6990 Fix skybox generation with non square textures 2014-08-15 02:14:30 +02:00
Marianne Gagnon
0a95344a01 Fix potentiel crash 2014-08-14 19:54:35 -04:00
Marianne Gagnon
c425e7e153 Also export GPU markers to CSV 2014-08-14 19:41:33 -04:00
Marianne Gagnon
58f509d953 Fix vlj's profiler code, only worked in single player 2014-08-14 19:08:21 -04:00
Vincent Lejeune
07bff38427 Fix a typo. 2014-08-14 21:45:31 +02:00
Vincent Lejeune
f9c692052e Try a fix for nvidia and GI 2014-08-14 21:26:16 +02:00
vlj
49779d36bf Do not update mesh in shadow pass. 
It may introduce some 1 frame latency between shadows and geometry but
in practice it's not noticeable.
 2014-08-14 18:55:21 +02:00
vlj
33e3b43346 Add a (quite big) timeout to sync. 2014-08-14 18:40:14 +02:00
Vlj
8ec4fb6308 Use sync object 2014-08-14 18:12:15 +02:00
vlj
18981ff943 Set unsynchronized bit in transparent pass 2014-08-14 16:29:59 +02:00
vlj
1c7fe8c518 Use mapbuffer to modify animated mesh buffer content. 2014-08-14 16:14:36 +02:00
vlj
6ef8f666ee Add mapbuffer glfunction. 2014-08-14 16:06:42 +02:00
vlj
d1f83c0334 Properly clean/regen vbo in updatevbo() 2014-08-14 14:27:18 +02:00
vlj
9840650038 Update some data usage hint. 2014-08-14 14:11:04 +02:00
vlj
21683251a2 Fix shadow lod level in singleplayer 2014-08-14 02:43:01 +02:00
hiker
52fba7958a Fixed pre-2011 compilation. 2014-08-14 10:24:23 +10:00
hiker
3521368112 Oops - committed file with typo :( 2014-08-14 10:21:26 +10:00
hiker
27155b5543 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-08-14 10:19:54 +10:00
Marianne Gagnon
a5f36ec412 Add new particles flag for vlj 2014-08-13 20:23:21 -04:00
hiker
f338282a15 Merge branch 'master' of github.com:supertuxkart/stk-code 
Conflicts:
	src/graphics/stkinstancedscenenode.cpp
 2014-08-14 10:19:31 +10:00
Marianne Gagnon
1de0e50607 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-08-13 20:10:28 -04:00
Marianne Gagnon
5c3c7afeae Fix bogus cast resulting in reading random URL in particles 2014-08-13 20:10:02 -04:00
vlj
5f78f2687f Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-08-14 02:09:15 +02:00
vlj
9120d792be Fix GPUTimer 2014-08-14 02:09:12 +02:00
Marianne Gagnon
ba3027b6bb Little improvement to for_in macro. Still only works on PtrVector though 2014-08-13 19:47:59 -04:00
hiker
86ea16bd43 Fixed compilation for pre-C++-2011 compilers. 2014-08-14 09:38:31 +10:00
vlj
47e176d4a3 User wrong VS for instanced normal 
Also fix the srgb normal map.
 2014-08-14 00:55:12 +02:00
Marianne Gagnon
b95765c172 use better tool to calculate tangents 2014-08-13 18:35:07 -04:00
Marianne Gagnon
976ea043bb Add missing bit of code 2014-08-13 18:25:21 -04:00
Vlj
3e277f8edf Dont alloc quaternion buffer if not flip 2014-08-13 23:56:27 +02:00
Vlj
c7a4d45d08 Fix malloc/delete mismatch 2014-08-13 23:52:47 +02:00
Vincent Lejeune
b5016ba85e Factorise simulation code. 2014-08-13 22:47:03 +02:00
Vincent Lejeune
00e945e75c Port heightmap simulation shader. 2014-08-13 22:42:02 +02:00
Vincent Lejeune
47cfe08fe1 Port simple simulation particle shader. 2014-08-13 22:32:15 +02:00
Vincent Lejeune
8117260bf6 Factorise attribute location of simulation program. 2014-08-13 22:26:52 +02:00
Vincent Lejeune
e6eac5b57f Clean quaternionbuffer at the right place. 2014-08-13 22:02:18 +02:00
Vincent Lejeune
f43538aad7 Factorize again code in gpuparticle. 2014-08-13 21:59:57 +02:00
Vincent Lejeune
b5f89501f6 Factorize some GL code in gpuparticle. 2014-08-13 21:38:33 +02:00
Vincent Lejeune
013e823408 Extract ParticleVBO from gpuparticle.cpp 2014-08-13 21:13:28 +02:00
Vincent Lejeune
dc02eec7b6 Port particle rendering shaders too. 2014-08-13 21:04:03 +02:00
Vincent Lejeune
22137eee88 Port UI shaders. 2014-08-13 20:25:56 +02:00
Vincent Lejeune
dc9993d780 Add Debug for instanced vertex type mismatch. 2014-08-13 19:28:02 +02:00
Vincent Lejeune
70b0fce50c Add support for instanced normal map mesh. 2014-08-13 19:20:40 +02:00
Vincent Lejeune
ebacfcfcef Put RSM draw in its own method. 2014-08-13 18:59:30 +02:00
Vlj
fda6aac5dd Reenable shadows for instanced mesh 2014-08-13 17:33:10 +02:00
hiker
de16d1ace3 Bugfix: A new local only user was now able to change the online account. 
If a new account is created with an online account, make the online account
the default.
 2014-08-13 21:46:53 +10:00
hiker
7111eb55ee Merge branch 'laps' of https://github.com/konstin/stk-code into konstin-laps 2014-08-13 16:01:22 +10:00
Vlj
ce5d09f159 Move instanced rendering code to render_geometry.cpp 
Shadows are disabled temporary
 2014-08-13 04:11:44 +02:00
hiker
98bb7e3959 Merge branch 'bumpy' 2014-08-13 11:16:03 +10:00
Vincent Lejeune
292aa0cbc4 Factorize FullScreen shaders invocations. 2014-08-13 02:01:29 +02:00
Vincent Lejeune
955e0d3259 Move RHDebug code to post process 2014-08-13 01:21:48 +02:00
Marianne Gagnon
345a3bc451 Fix logic in video settings popup 2014-08-12 19:18:38 -04:00