Commit Graph

18030 Commits

Author SHA1 Message Date
Benau
aaa8befe0a Fix appveyor build 2017-10-17 11:04:28 +08:00
Benau
fa48d099f2 Fix the remaining msvc warnings 2017-10-17 10:51:52 +08:00
Benau
fb6a0d7631 Merge remote-tracking branch 'origin/master' 2017-10-17 10:25:22 +08:00
Deve
1454e53b79 Set proper min sdk version for 64bit build 2017-10-16 21:31:17 +02:00
Benau
88e15147b8 Merge remote-tracking branch 'origin/win-64bit' 2017-10-17 00:55:22 +08:00
Benau
e47aa5d567 Take relative path issue into account when unloading texture
Now except global particle textures all textures loaded by track can be
clean properly
2017-10-16 16:09:07 +08:00
Benau
c8d13d7360 Preload the particle textures when first load
This prevent hangs when lazy loading texture runtime
2017-10-16 14:22:09 +08:00
Benau
7e0d706946 Don't call setLastTriggeredCheckline for check cannon
It will override the track check line
2017-10-16 13:47:21 +08:00
Benau
9f10676dd3 Remove unused billboard shader 2017-10-16 07:43:00 +08:00
Benau
30e78fb1c0 Merge branch 'fix_2427' 2017-10-16 07:25:38 +08:00
hiker
9166e704e9 Take ball squashing into account when computing the ball height (so now
the basketball properly touches the ground if its height is 0).
2017-10-16 10:10:33 +11:00
Benau
c7dbe715fc Remove duplicated and unused code 2017-10-16 00:48:08 +08:00
Benau
4573e51e98 Fix #2427 2017-10-15 19:14:07 +08:00
Benau
a7debc286a Check flips using unordered_set 2017-10-15 15:05:49 +08:00
Benau
058f9163db Some work to make particle shader able to render billboard
The lifetime in height map stimulation will always now < 1.0f
2017-10-15 13:57:01 +08:00
Benau
f646a26fbe Clean up particle .xml
Remove unsupported entries, notice that particles now are auto-
faded out by lifetime

Also remove flips that are not visible at all
2017-10-15 12:47:21 +08:00
Benau
998b11ed51 Add an option to disable pre-generation for explosion particles
Also remove some unused code
2017-10-15 11:32:58 +08:00
Benau
b1f4ced6f0 Fix bounding boxes in legacy pipeline 2017-10-15 00:18:11 +08:00
Benau
85adab6e1e Allow to use new STKParticle with legacy pipeline
Due to cull face issue the kart exhaust is still not visible
2017-10-14 15:42:10 +08:00
Benau
088d09cb64 Don't hardcode first vbo size 2017-10-14 14:42:54 +08:00
Benau
c3a22ddcf7 Pre-generate some particles if max count is small 2017-10-14 14:42:24 +08:00
Benau
a0c9ba2b8c Pack mixed color into instanced array
With half-floats for lifetime and size for same stride
2017-10-14 12:33:08 +08:00
Benau
e49a7139d7 Split MiniGLM for more usage (instancing, cpu particle, network...) 2017-10-14 11:00:51 +08:00
Benau
0b9a3e1c69 Fix some issues found in first-try 2017-10-14 09:47:13 +08:00
Benau
0066722dab Features completed cpu particle 2017-10-14 00:19:59 +08:00
Deve
63ecbefbdd I forgot about particles 2017-10-12 22:55:26 +02:00
Deve
928ae4e44d Try to fix server-only compilation 2017-10-11 21:50:44 +02:00
Deve
b0cdbd94b4 Merge branch 'srgb_fb' 2017-10-11 21:46:58 +02:00
Deve
c1e17f0593 Add a fallback for intel on linux.
When workaround with alpha_channel=true failed, then fallback to the path with disabled srgb framebuffer.
2017-10-11 21:39:13 +02:00
Deve
6794670510 Disable srgb framebuffer for intel hd 2000 too 2017-10-11 20:53:49 +02:00
Benau
9304f6fa3c Disable the usage of all parts colorized
Please use colorization mask for better effect
2017-10-11 13:05:15 +08:00
Benau
839142b752 Add up-to-date restriction for hd3000 in windows 2017-10-11 11:25:28 +08:00
Ben Krajancic
865426aad7 Small clarification to prevent build errors (#2954)
Building outside of this directory prevents the executable from launching, this small addition can help prevent this issue from happening.
2017-10-09 21:10:50 -04:00
Deve
ae4e302741 Add a way to run STK without srgb framebuffer 2017-10-09 21:18:15 +02:00
auria.mg
0453809915 Update credits 2017-10-08 19:56:13 -04:00
Benau
10e3467f96 Merge remote-tracking branch 'origin/better_rescue_animation' 2017-10-09 07:44:50 +08:00
hiker
fba22def40 Merge branch 'master' of github.com:supertuxkart/stk-code 2017-10-09 10:29:24 +11:00
hiker
b97088c933 Fixed computation of new point. The previous approach was based on
the newly computed point. If this point should be under the track,
and the new height is not enough to offset this, the ball will be
tunnelling, which results in the ball being reset to the previous
position, i.e. the ball will not move.
2017-10-09 10:25:36 +11:00
hiker
f94b3a9120 Added more debug info, removed unused code. 2017-10-09 10:25:11 +11:00
Benau
2217083421 Replace broken abyss replay with candela city 2017-10-08 11:16:25 +08:00
Deve
48d94e10a7 Use separate os name for android stats 2017-10-07 21:37:59 +02:00
Benau
4f1becb20d Add a better rescue animation
Also fix #2501
2017-10-06 23:42:23 +08:00
Benau
cf2a9f7089 Allow configurable exhuast particle, fixes #2878 2017-10-06 01:08:27 +08:00
auria.mg
3ad081104e Re-extract strings for missing track, oops 2017-10-04 20:59:30 -04:00
auria.mg
7a63955a06 Minor challenge tweak 2017-10-04 18:56:43 -04:00
auria.mg
1c9e4bc04a Tweak hacienda easy challenge, see #2951 2017-10-04 18:50:27 -04:00
Deve
bc84559f1d Revert a hack for shadows.
It helps for horizontal surfaces, but makes vertical surfaces worse (for example rocks in cornfield crossing), so it's not really a solution.
2017-10-04 22:19:19 +02:00
auria.mg
0f790d4331 Update strings 2017-10-03 19:04:34 -04:00
Deve
27a79526b1 Allow to use particles heightmap simulation in GLES 2017-10-02 23:05:12 +02:00
Deve
843ebad9a1 Don't use GL_FRAMEBUFFER_SRGB in GLES 2017-10-01 22:25:37 +02:00