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

17248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deve
3add543a22 Fixed conflict between GLES2 headers included in irrlicht and GLES3 headers included in STK. 
There is one minor difference in one declaration, which is probably an inconsistency in these headers. But it may cause compilation errors on some compiler versions.
 2016-11-30 21:31:29 +01:00
Benau
acf0ac909f And a correct ifdef for bindless texture 2016-11-30 15:00:08 +08:00
Benau
9e8fb63dc4 Fix AZDO with colorization 
Also re-arrange texture layer
 2016-11-30 13:52:06 +08:00
hiker
b0294060dc Support direct connection to LAN server using command line option, 
based on Benau's fix_2446 branch.
 2016-11-30 09:07:27 +11:00
Benau
5884d7b9d8 Avoid using matrix4 calculation 2016-11-28 15:44:14 +08:00
hiker
5fc4531c01 Updated finite state machine graph. 2016-11-28 18:39:18 +11:00
hiker
70c203cc3f Updated and fixed server documentation. 2016-11-28 18:20:41 +11:00
hiker
9c2b17602d Added documentation for cliebt lobby. 2016-11-28 18:09:38 +11:00
Benau
497b7e3f14 Use reference when possible 2016-11-28 13:34:45 +08:00
Benau
45c5b0ffd6 Improved colorization in instanced rendering 2016-11-28 13:08:27 +08:00
Benau
decf3b9715 4 bindless textures + texture translation + colorization in vao 2016-11-28 10:47:14 +08:00
Benau
60908c3e1d Try to use vec2 for texture translation only 
In stk, only setTextureTranslate is used which modify 8,9 of
matrix array. Also don't update it when it is identity.
 2016-11-28 10:41:27 +08:00
deve
716c19325f Update common irrlicht files with modifications from Android branch. 
- Added a function in GLES driver, which allows to re-create EGL surface when it's lost after resume event
- Some additional events/keycodes
- Fixed compilation with missing sys/sysctl.h header
 2016-11-28 01:56:52 +01:00
hiker
21ca9b40f0 Merge branch 'master' of github.com:supertuxkart/stk-code 2016-11-28 12:46:00 +11:00
hiker
aa36f7856f Fixed compiler warnings. 2016-11-28 09:03:56 +11:00
hiker
de0f153f0c Renamted SynchronizationProtocol to LatencyProtocol. 2016-11-28 08:45:17 +11:00
Benau
3e938a79be Fix #2676 by moving rsm matrix to be assigned lastly 2016-11-27 11:21:16 +08:00
auria.mg
decaac85d9 Tweak item collision box, fixes #2678 2016-11-26 19:01:38 -05:00
Benau
0298d48e24 Try to use the internal template to colorize objects 
Todo: instanced version
 2016-11-27 01:14:40 +08:00
Benau
9b15bd2c63 Remove useless extern BoundingBox 2016-11-26 10:10:10 +08:00
Benau
a9a6ec0b7f Use the old unrolling draw mesh for RSM shaders on GL3 
Todo: fix CustomUnrollArgs for rsm shaders
 2016-11-26 00:06:22 +08:00
Benau
f7e0babe02 Fix global illumination on instanced rendering 2016-11-26 00:03:22 +08:00
Benau
df6ab0a7fd Fix god rays regression 2016-11-25 20:44:44 +08:00
hiker
6053ad207f Don't use the SynchronisationProtocol for startup state changes at all. 
It is now totally optional, and only estimates the latency between the
server and all clients (and this value is not even used).
 2016-11-25 22:17:24 +11:00
Benau
5ca5dc3b3e Clean up culling code 2016-11-25 16:45:00 +08:00
Benau
0c091125b0 Remove const cast in three strikes battle 2016-11-25 12:38:08 +08:00
Benau
fe371a28b5 Add non-const function for STK usage 2016-11-25 12:37:40 +08:00
hiker
18f14ae142 Fixed compiler warnings. 2016-11-24 17:48:23 +11:00
hiker
b1afac23a7 Moved creation of the race protocols into lobby, so SynchronizationProtocol 
is not involved in the race start anymore.
 2016-11-24 08:56:30 +11:00
hiker
617e1c538d Merge remote-tracking branch 'origin/master' into nw 2016-11-23 21:58:00 +11:00
hiker
414b0e0633 Fixed sending 'client ready' twice. 2016-11-23 18:50:44 +11:00
hiker
dd515292ee Fixed deadlock (in case of protocol error). 2016-11-23 18:40:56 +11:00
hiker
62da83317e Fixedc compilation, renamed LobbyRoomProtocol to LobbyProtocol. 2016-11-23 18:39:59 +11:00
Benau
a2bb0487b1 Disable backface culling when set in the material. 2016-11-23 15:16:19 +08:00
hiker
2c7e7d8722 Merge remote-tracking branch 'origin/master' into nw 2016-11-23 17:16:42 +11:00
Benau
eb84de2666 Fix #2491 2016-11-23 10:11:08 +08:00
hiker
026e1623ec Renamed ServerLobbyRoomProtocol to just ServerLobby, ClientLobbyRoomProtocol 
to ClientLobby, and LobbyRoomProtocol to Lobbyprotocol.
 2016-11-23 09:39:33 +11:00
deve
7f251fdf79 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-11-22 09:16:59 +01:00
deve
467760f248 Remove illogical #ifdef 2016-11-22 08:29:18 +01:00
hiker
09eae7e25f Removed StartGameProtocol, and added the necessary states to the 
Lobby rooms. Added documentation of the FSM for the ServerLobby.
 2016-11-22 17:57:15 +11:00
Benau
61a00a9068 Fix transparent displacement rendering with advanced pipeline off 
Allowing them to render using the same custom alpha uniform used
by ghost karts, fixed #2459.
 2016-11-22 12:34:48 +08:00
Benau
c1e931f5ba Merge branch 'legacy_opengl' 2016-11-22 09:23:17 +08:00
Benau
690d36271d Try to fix LOD in legacy pipeline 2016-11-22 00:51:10 +08:00
deve
e9f3fd4806 Fixed compilation with missing vidmode headers after some modifications in our CGUIEditBox. 2016-11-21 08:37:20 +01:00
Benau
befa2394a8 Some improvement to #2667 2016-11-21 11:58:46 +08:00
Benau
72ff03c024 Fix light in legacy pipeline 2016-11-21 11:10:40 +08:00
Benau
de95db5c93 Avoid creating new glyph page too many times 2016-11-20 10:08:59 +08:00
Benau
9734c2e890 Fix crash in billboard text when using legacy opengl 
Notice: freetype glyph metrics are not supported
 2016-11-19 15:59:58 +08:00
Benau
a52c4699a1 Add back normal map renderer for legacy opengl 
Fixed transparent issue
 2016-11-19 14:21:56 +08:00
Benau
f853255204 Merge branch 'fix_1704' 2016-11-18 09:51:34 +08:00