Commit Graph

7452 Commits

Author SHA1 Message Date
hiker
31063f6ae5 Removed unnecessary \n. 2014-01-31 15:45:53 +11:00
hiker
ade89ba89a Merge branch 'master' of https://github.com/KroArtem/stk-code into kroartem 2014-01-31 15:39:53 +11:00
hiker
5e8c8f2715 Fixed linux compilation. 2014-01-31 11:31:26 +11:00
Marianne Gagnon
a38a3b1b9a Try to fix compilation 2014-01-30 19:14:19 -05:00
hiker
9ef4885db6 Merge branch 'gravity_from_normal' 2014-01-31 08:36:28 +11:00
hiker
fe04a73849 Disable upright constraint when having changed gravity. 2014-01-30 17:19:57 +11:00
hiker
9db2d405ef Removed hardcoded 'up' direction for the raycast for terrain detection. 2014-01-30 17:08:39 +11:00
hiker
8313bcb0d2 Trigger rescue only when the kart is not on gravity terrain. 2014-01-30 12:29:05 +11:00
hiker
c80a78dcf2 Made some pointers const. 2014-01-30 12:27:12 +11:00
Marianne Gagnon
8156b8a66b Rewrite bizarre code in a way that makes more sense 2014-01-29 19:45:56 -05:00
Marianne Gagnon
87f5fd988e Don't use raw char*, use std::string instead. Fixes leaks. 2014-01-29 19:39:38 -05:00
Marianne Gagnon
3e253be31e Misc code improvements 2014-01-29 19:20:57 -05:00
Marianne Gagnon
b7e7808500 Fix failed override attempt 2014-01-29 19:08:17 -05:00
KroArtem
b80548a46e fix some coverity issues 2014-01-30 03:19:41 +04:00
Sachith Hasaranga Seneviratne
0811d13d18 addons_screen minor fix
2 weeks = 14 days not 12

Signed-off-by: Sachith Hasaranga Seneviratne <sachith500@gmail.com>
2014-01-29 23:27:04 +05:30
hiker
199b747ef0 Fixed some compiler warnings. 2014-01-29 22:04:18 +11:00
hiker
e775d8eb98 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-01-29 15:14:42 +11:00
hiker
2479000137 Minor cleanup: renamed resetAllKarts back to unloadAllKarts (to avoid
confusion since resetAllKarts in world is called before a race),
and removed unused function.
2014-01-29 15:09:28 +11:00
Vincent Lejeune
e93cfd8b8e Also factorize particles related state changes. 2014-01-29 02:18:19 +01:00
Vincent Lejeune
a9258500b8 Factorize displace and glow state changes. 2014-01-29 02:08:52 +01:00
Vincent Lejeune
4c7ba19642 This shouldnt be there 2014-01-29 01:57:56 +01:00
Vincent Lejeune
5ae0d2f4dc Factorize solid state changes. 2014-01-29 01:57:55 +01:00
Vincent Lejeune
c6e466fdcc Factorise transparent state changes. 2014-01-29 01:57:55 +01:00
Vincent Lejeune
57808f0815 Disable water, bgnodes and textbillboards. 2014-01-29 01:57:34 +01:00
Vincent Lejeune
8b46454859 Add an assertion 2014-01-29 01:35:43 +01:00
Vincent Lejeune
1fa0a9e9cc Display unhandled materials in debug mode 2014-01-29 01:35:43 +01:00
Vincent Lejeune
c994ed720d Fix a typo 2014-01-29 01:33:07 +01:00
Vincent Lejeune
e9d995504d Fix normal maps 2014-01-29 01:21:53 +01:00
auriamg
35405e43b8 Merge pull request #15 from sachith500/master
Ticket #1149 - clarify story mode for players.
2014-01-28 15:01:48 -08:00
Vincent Lejeune
098303dced GPUParticles: Use transparent_effect pass 2014-01-28 21:40:53 +01:00
Vincent Lejeune
5be8dbedab Increase buffer size in displayfps 2014-01-28 21:35:12 +01:00
Vincent Lejeune
fd968a0acf OGL32CTX: Factorize UI shaders
This should fix UI disappearing after resolution change.
2014-01-28 21:26:16 +01:00
Vincent Lejeune
9955aa6970 STKMeshes: Support for transparent_add_color mat 2014-01-28 20:12:56 +01:00
Vincent Lejeune
143e3a355d Display rendered objects count instead of ktris.
Things go well untill we have more than 200 objects on my system, no
matter how big they are.
2014-01-28 20:05:16 +01:00
Sachith Hasaranga Seneviratne
e50c902bf2 Ticket #1149
Message in story mode now additionally points players to the minimap.

Signed-off-by: Sachith Hasaranga Seneviratne <sachith500@gmail.com>
2014-01-28 21:51:46 +05:30
hiker
9192557cd4 Merge branch 'resoCrashFix' of https://github.com/KristofDM/stk-code into KristofDM-resoCrashFix 2014-01-28 22:00:32 +11:00
hiker
1709ccc36d Started to set the gravity for selected material based on the
normal of the triangle where the kart is on.
2014-01-28 21:42:23 +11:00
Marianne Gagnon
f1f8900c5d Add a couple profiler markers 2014-01-27 18:59:53 -05:00
Vincent Lejeune
f50e6f817d Use another normal encoding method from a crytek slide. 2014-01-27 23:29:46 +01:00
Vincent Lejeune
d642bc1489 Lightprepass: Only store normals in rtt
Use a more economical rtt format.
2014-01-27 21:47:25 +01:00
Vincent Lejeune
0bbba17e5e STKBillboard: Fix a typo 2014-01-27 20:33:56 +01:00
Vincent Lejeune
22ccf3bab3 GPUParticle: Use depthbuffer 2014-01-27 20:33:21 +01:00
Vincent Lejeune
dbcf60003b SunLight: Use DepthBuffer 2014-01-27 20:25:45 +01:00
Vincent Lejeune
ecac127dd6 Fog: Use depthbuffer. 2014-01-27 20:25:19 +01:00
Vincent Lejeune
bc57d246e7 Fog: Factorize setUnifors() 2014-01-27 20:25:07 +01:00
Vincent Lejeune
0b531b20f7 SSAO: Use depth buffer. 2014-01-27 20:24:57 +01:00
Vincent Lejeune
5515f51f65 SSAO: Factorize setUniforms() 2014-01-27 20:24:47 +01:00
Vincent Lejeune
5e68334ce9 PointLight: Use depthbuffer 2014-01-27 20:22:01 +01:00
Vincent Lejeune
ac25b2b8b7 PointLight: Factorize setUniforms 2014-01-27 20:21:51 +01:00
KristofDM
fca20ae088 Final fix for issue #13. 2014-01-27 18:14:50 +01:00