Commit Graph

1884 Commits

Author SHA1 Message Date
27824c636e Replace view distance culling with frustum culling 2019-08-16 21:45:10 +08:00
685a31a747 remove palette dependency 2019-08-16 00:01:20 -04:00
bdbe967a88 Fix typo, move shaders back out of subfolders 2019-08-15 23:59:10 -04:00
1037dece2f Lighter 2019-08-15 23:59:09 -04:00
093f6baa8d Tweak lighting 2019-08-15 23:59:09 -04:00
ec28d628bd Improve colors 2019-08-15 23:59:09 -04:00
8c99796e1d Increase saturation of some colors 2019-08-15 23:56:15 -04:00
189a9058e2 update ci for new shader position 2019-08-15 23:56:14 -04:00
d1e017557b move conversion to fragment shader 2019-08-15 23:56:14 -04:00
3988daed39 Add srgb converion in shaders 2019-08-15 23:56:14 -04:00
d71cc31e29 Handle errors in file watching 2019-08-15 23:56:13 -04:00
35d490bc1e Move shaders, start asset reloading system 2019-08-15 23:56:12 -04:00
89b90ca79e Merge branch 'xacrimon/fast-chan-mpsc-bad' into 'master'
Switch mpsc and std mutexes to faster alternatives.

See merge request veloren/veloren!440
2019-08-15 22:54:21 +00:00
7453e7f288 [Common] Switch mutexes and channels. 2019-08-16 00:19:54 +02:00
4c575c14ff [Server] Switched mpsc for crossbeam::channel. 2019-08-16 00:10:46 +02:00
dc1e4d1ae8 [Voxygen] Switch mutexes to parking_lot and channels to crossbeam. 2019-08-16 00:07:09 +02:00
34ac18dbe4 Merge branch 'qutrin/admin-perms' into 'master'
Admin Permissions system

See merge request veloren/veloren!424
2019-08-15 15:30:44 +00:00
892855a348 Add needs_admin bool to check if the commands needs admin perms 2019-08-15 16:33:40 +02:00
28c47663d0 Give singleplayer its own server settings 2019-08-14 17:51:59 +02:00
e07762d134 Fix spawn command, properly search for admins 2019-08-14 17:30:36 +02:00
1f5817a80b Add Admins field to the settings file 2019-08-14 17:30:36 +02:00
7fa5403aeb Add AdminPerms component, make some commands require it 2019-08-14 17:30:36 +02:00
3afb1b3f3e Merge branch 'gitignore/envrc' into 'master'
gitignore: Add .envrc (direnv config file)

See merge request veloren/veloren!433
2019-08-14 14:47:32 +00:00
73f490d628 gitignore: Add .envrc (direnv config file) 2019-08-14 14:58:41 +02:00
abfaca6b80 Merge branch 'telastrus/first-person' into 'master'
added first person switch

See merge request veloren/veloren!425
2019-08-13 17:54:13 +00:00
e8342cd4a3 added first person switch 2019-08-13 17:54:13 +00:00
03855f127c Merge branch 'xacrimon/fxhash-is-very-bad' into 'master'
Switch all usages of HashMap/HashSet to use hashbrown

See merge request veloren/veloren!430
2019-08-11 20:49:10 +00:00
20bd2e0fce Switched over the last std hashset. 2019-08-11 22:39:41 +02:00
7c8487ed76 Finished switch to hashbrown. 2019-08-11 22:38:28 +02:00
bd4119a6cd Use hashbrown instead of fxhashmap in world. 2019-08-11 22:10:36 +02:00
9c0a6caafb Migrate client to hashbrown. 2019-08-11 21:54:20 +02:00
058ecb8ada Use hashbrown in voxygen instead of a billion different shitty maps. 2019-08-11 21:52:23 +02:00
9515f047b9 Switch to hashbrown in server. 2019-08-11 21:48:02 +02:00
30454cc36b Merge branch 'xacrimon/worldgen-seed-expansion' into 'master'
Better worldgen seed expansion

See merge request veloren/veloren!410
2019-08-11 11:59:51 +00:00
6be5daef1a Formatted code. 2019-08-11 13:37:04 +02:00
b560fccdb1 Cleaned up seed generation in worldsim. 2019-08-11 13:37:04 +02:00
ac2b30b31b Rewrite diffusion function. Now has potential for a full avalanche. 2019-08-11 13:37:04 +02:00
46ee5c41ea Greatly simplified seed expansion. 2019-08-11 13:37:04 +02:00
964e81732f Improved some comments. 2019-08-11 13:37:04 +02:00
f640681f8c Fixed comment typo. 2019-08-11 13:37:04 +02:00
e2bdf0dd6c Added a lot of comments. 2019-08-11 13:37:04 +02:00
05cf8d190f Adjusted default spawn height for now 2019-08-11 13:37:04 +02:00
a301908654 Fixed overflow in seed_expan 2019-08-11 13:36:14 +02:00
081dc6b7a6 Fixed diffuse_field 2019-08-11 13:36:14 +02:00
08b980038c Improved worldgen seed expansion 2019-08-11 13:36:14 +02:00
e49de7f63b Merge branch 'zesterer/small-fixes' into 'master'
Added entity event system, fixed fall damage

See merge request veloren/veloren!418
2019-08-09 23:56:49 +00:00
46285f6346 Merge branch 'songtronix/hotfix-crash' into 'master'
fix time overflow crash

See merge request veloren/veloren!422
2019-08-09 09:13:28 +00:00
fc3df0498d fix time overflow crash 2019-08-09 09:13:28 +00:00
66db9a6f09 Merge branch 'telastrus/auth' into 'master'
Server-side authentication

See merge request veloren/veloren!419
2019-08-09 01:37:44 +00:00
20cba432e7 swapped if for entry 2019-08-08 21:28:25 -04:00