samuncle
ae0b1136f5
better shader for underwater vegetation
2016-12-09 11:38:56 -05:00
hiker
dbfaf2105b
Merge remote-tracking branch 'origin/master' into nw
2016-12-08 13:36:36 +11:00
hiker
fed12f774c
Fixed potential deadlock, made debug output more useful.
2016-12-08 09:46:44 +11:00
Deve
66f57ada61
Fixed a crash when GLES device is re-created
2016-12-07 00:08:16 +01:00
hiker
32daf4ce29
Removed unused functions.
2016-12-07 09:34:33 +11:00
Deve
5fad8a135e
Destroy egl context on exit
2016-12-06 23:32:04 +01:00
Deve
c013fcea61
Allow to log messages to file on android
2016-12-06 23:31:49 +01:00
hiker
95e627c004
Fixed pi compilation.
2016-12-07 00:28:36 +11:00
hiker
63fe4373a8
Removed unnecessary #ifdef.
2016-12-06 21:50:23 +11:00
hiker
8b806dd35a
Fixed compiler warnings.
2016-12-06 18:46:03 +11:00
hiker
1939075a1b
Merge remote-tracking branch 'origin/master' into nw
2016-12-06 18:45:17 +11:00
hiker
fdfb56ddf8
Fix server-only compilation.
2016-12-06 18:10:31 +11:00
hiker
746bac00ce
Merge remote-tracking branch 'origin/new-pi' into nw
2016-12-06 09:26:07 +11:00
hiker
526b2a8f0d
Added two more graph connections.
2016-12-06 09:22:13 +11:00
hiker
79ad569542
Only allow LAN connections for LAN servers (previously anyone with
...
the IP address could connect, even from the outside). Added new
--public-server command line option to enable public WAN server.
2016-12-06 09:10:05 +11:00
Deve
23883b83c1
Fixed a crash on startup.
...
As written in the documentation: "The returned modifiers string is owned by Xlib and should not be modified or freed by the client."
2016-12-04 23:23:09 +01:00
Deve
c0cd915716
Minor fixes in file manager.
...
The listFiles function returns absolute paths, so the condition if ((*i)=="..") doesn't have a sense. I added a check for absolute paths (file == name + "/.."). Btw. what about Windows? Does it return 'name + "\\.." ' or so?
I also enabled recursive removing of directories on Android. It is needed for example when you have already installed STK with extracted data files, and then you want to upgrade STK to newer version.
2016-12-04 22:22:42 +01:00
Deve
419e9e5351
Some minor modifications that make merging with master easier
2016-12-04 15:11:48 +01:00
Benau
2c8b31379b
Don't push color info for shadow and rsm
2016-12-04 13:41:28 +08:00
Benau
ed43d16a1c
Allow alpha test shader to be colorizable
2016-12-04 13:21:39 +08:00
Benau
2a50149e62
Remove TODOs about splatting
...
Splatting will be drawn using non-instanced shader only, it's only
used one place (in overworld) and may be removed eventually
2016-12-04 11:48:52 +08:00
Benau
902f4e20a5
Leave the loop as soon as one material is colorizable
2016-12-04 11:15:32 +08:00
Benau
2d980264b4
Update LOD to support colorization
2016-12-04 10:47:08 +08:00
Benau
7d5f786da8
Make grass shader colorizable
2016-12-04 00:59:09 +08:00
Benau
31b6a0a4b1
Try to fix gcc build
2016-12-03 16:06:46 +08:00
Benau
4261a96d06
Fix inconsistency between grass shader and the instanced version
...
1. Assign the missing depth stencil texture (dtex)
2. Correct the movement and color
2016-12-03 15:54:59 +08:00
Benau
79136e0289
Fix GLES
2016-12-03 14:10:07 +08:00
Benau
332811af84
Merge branch 'improve_instanced_rendering'
2016-12-03 09:17:15 +08:00
Benau
6a3ad6605b
Try to fix release build
2016-12-02 21:00:34 +08:00
Benau
c7d025d81d
Fix binding texture error with AZDO
...
See specification of bindless textures for details
2016-12-02 20:09:08 +08:00
Benau
bfc006b979
Fix wrong texture units
2016-12-02 19:26:40 +08:00
Benau
4fbce474c5
Fix ambient light on track not updated
2016-12-02 19:17:55 +08:00
hiker
8bd3e35c7b
Removed some of the debug output of the latency protocol.
2016-12-02 09:26:03 +11:00
hiker
e3e072557c
Fixed deadlock when more than one client was used.
2016-12-02 09:16:51 +11:00
hiker
ee63f2c456
Support --port command line option to change a client or servers
...
port number.
2016-12-01 22:29:23 +11:00
hiker
09ca38d36e
Renamed handleLANRequest to HandleDirectSocketRequest, since the code
...
can also be used to connect to a public server (outside of the server's LAN).
2016-12-01 10:11:50 +11:00
hiker
fc5cecceae
Use the port number from the config instead of hard coded one.
2016-12-01 09:55:39 +11:00
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
