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 |
|
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 |
|
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
|
f77695c098
|
Add Tangent/Bitangent in instanced object shader.
|
2014-08-15 17:15:19 +02:00 |
|
Deve
|
d45429bf88
|
First destroy the window, then restore resolution.
This may solve some possible issues with WM fullscreen.
|
2014-08-15 11:34:16 +02:00 |
|
Vlj
|
7fbe529e6f
|
Forget to add Tangent/BiTangent with pre 330
|
2014-08-15 02:14:30 +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 |
|
Vlj
|
d3ec1a27ce
|
Completly unroll the loop
|
2014-08-15 00:02:43 +02:00 |
|
Vlj
|
4829b8ddd8
|
Manually unroll rh shader
|
2014-08-14 23:58:11 +02: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 |
|