Benau
2f0252be98
Merge remote-tracking branch 'origin/master' into renderer_refactoring
2016-10-28 21:41:49 +08:00
hiker
9f4c842b6c
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2016-10-27 21:36:17 +11:00
hiker
fda3afad93
Fix 2658 by separating networking code from main loop.
2016-10-27 21:33:42 +11:00
Benau
956aa83a0a
Remove unused function
2016-10-27 10:15:41 +08:00
Benau
93197d9569
Merge branch 'fix_2445'
2016-10-27 09:41:35 +08:00
Benau
d4e9de1f53
Fix non-animated karts
2016-10-27 09:41:01 +08:00
hiker
94346ae64d
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2016-10-27 11:13:19 +11:00
hiker
b3b9d16ba1
Removed unnecessary logging.
2016-10-27 08:48:38 +11:00
hiker
2c56837ee8
Fixed token handling.
2016-10-27 08:41:35 +11:00
hiker
b1f6632e5b
Changed countdown from a mixture of ms and seconds to seconds only;
...
added documentation.
2016-10-27 08:40:45 +11:00
deve
bc7f89d49a
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2016-10-26 13:51:40 +02:00
deve
8d270e5ff3
Fixed nitro bar for non-HD textures
2016-10-26 13:51:17 +02:00
Benau
e93e8b7708
Make animated mesh render separately in instanced rendering
...
Try to introduce mesh + render info hash in vao manager, without
copying the mesh
2016-10-26 14:25:48 +08:00
Benau
9bd4c87b9c
Fix leaking createTextBillboard
2016-10-26 09:21:17 +08:00
Benau
cc3ff7cf9f
Simplify calculation of transform
2016-10-26 09:08:10 +08:00
Benau
a38c8f0c19
Make billboard text display properly when viewing in any direction
2016-10-26 00:34:13 +08:00
hiker
e31a7ca4a8
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2016-10-25 10:05:28 +11:00
hiker
6a578e374f
Fix LAN handling when connecting via a WAN server.
2016-10-25 07:53:52 +11:00
Benau
68ea2ed3b2
Fix typo
2016-10-22 12:33:47 +08:00
Benau
cf557f6982
Fix release build
2016-10-22 10:46:30 +08:00
Benau
3e70fa27d9
Add doxygen for Font modules
...
Plus some coding-style cleanup
2016-10-22 00:01:48 +08:00
hiker
df21ba55b4
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2016-10-21 08:31:11 +11:00
Benau
7505630cd4
Add doxygen for Soccer and SpareTire AI
2016-10-21 01:38:30 +08:00
Benau
021509387d
Add doxygen for Arena and Battle AI
...
Plus some coding-style cleanup
2016-10-20 16:40:20 +08:00
Benau
b12f7a1079
Fix shaking u-turn
2016-10-19 00:37:29 +08:00
Benau
24f926b780
Merge remote-tracking branch 'origin/spare_tire_kart'
2016-10-18 14:32:44 +08:00
Benau
8eb8e805eb
Fix dropping of normal map wheel in battle mode
2016-10-18 14:18:51 +08:00
Benau
f1caba7932
Make ArenaAI reverse more naturally
2016-10-18 10:33:27 +08:00
Benau
9aa92cfe30
Fix profiling mode framerate regression
2016-10-18 09:55:30 +08:00
auria.mg
8c0fe53ff2
Fix texture mirroring on alpha blend/test shaders. See #2167
2016-10-17 19:46:21 -04:00
auria.mg
9d1b115e59
Don't call OpenAL's position method when audio is disabled
2016-10-17 19:15:28 -04:00
auria.mg
513e32d9ff
Fix bug that could cause reversible textures to be mirrorred twice when driving the track in reverse (see #2167 )
2016-10-17 19:09:01 -04:00
Deve
28f04b472b
Merge pull request #2654 from LoadingPleaseWait/redundant-includes
...
Remove duplicate include statements from kart.cpp
2016-10-17 11:02:38 +02:00
LoadingPleaseWait
eddf39b8a1
Remove duplicate include statements from kart.cpp
2016-10-17 03:36:29 -05:00
deve
5502fa4ebe
Declare custom alpha also when bindless sampler is enabled
2016-10-17 08:23:27 +02:00
Benau
caf095ed60
Add improvements from auria and devee
2016-10-17 09:13:07 +08:00
Benau
af223ddf24
Try to use sun color to determine custom alpha for ghost karts
...
This may need more adjustments, also add custom_alpha uniform float
to transparent fragment shader to remove duplicated shader
2016-10-17 01:03:10 +08:00
Benau
23a1b08efe
Allow normal map karts to be used in ghost race
...
Also split ghost karts out of additive shader, so fixed issues like
"drivers are facing backwards", "water in abyss affects ghost karts"
Todo: maybe transparency depend on current track color?
2016-10-16 15:40:40 +08:00
auria.mg
929b9b5c20
Stop world imer when game is paused
2016-10-15 20:28:48 -04:00
auria.mg
020edf1679
Add support for directional (forward-only or backwards-only) driveline segments
2016-10-15 18:56:13 -04:00
Benau
1f8149f138
Merge remote-tracking branch 'origin/skinned_mesh_normal_map'
2016-10-15 15:25:20 +08:00
Benau
604e454f33
Fix normal map in library and track objects if they are animated
2016-10-15 15:21:34 +08:00
Benau
efb6b7431a
Try to make skinned mesh work with normal map
2016-10-15 00:17:09 +08:00
hiker
35e382b893
Remove unnecessary request for server address,since it is now included
...
for each server in the list of all servers.
2016-10-14 18:08:39 +11:00
Benau
f70a64f61a
Fix controller and text billboard leaking in kart
2016-10-14 12:01:37 +08:00
Benau
e09fe6ff8a
Fix memory leak of mesh tool
2016-10-13 14:08:58 +08:00
hiker
62b9b93d10
Merge branch 'master' of github.com:supertuxkart/stk-code
2016-10-13 14:06:48 +11:00
hiker
85e0fed9b7
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2016-10-13 11:14:40 +11:00
hiker
83ffbd96e1
Better error message in case of a failure to creaet a server.
2016-10-12 17:21:15 +11:00
hiker
061827a1ac
Ported to use the new server (Issue65 branch).
2016-10-12 17:09:57 +11:00
