Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,845 Commits 151 Branches 18 Tags
Commit Graph

1845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Acrimon
86d8178f38 Removed unsafe. 2019-08-19 00:55:04 +02:00
Acrimon
e98a58d831 Cleaner solution. 2019-08-19 00:46:24 +02:00
Acrimon
a4c950424c Ran fmt. 2019-08-19 00:20:56 +02:00
Acrimon
da31643b86 Fixed seed expansion for noise seeding. 2019-08-19 00:19:51 +02:00
Joshua Barretto
e074de9336 Merge branch 'qutrin/adminify-command' into 'master' 
Add adminify command to temporarily give admin perms

See merge request veloren/veloren!444
 2019-08-17 21:46:02 +00:00
Piotr Korgól
84ad0a1a86 Add adminify command to temporarily give admin perms 2019-08-17 23:35:01 +02:00
Imbris
0d6e1999ff Merge branch 'imbris/srgb' into 'master' 
Handle srgb values more accurately, Load shaders at runtime + hotloading

Closes #79

See merge request veloren/veloren!412
 2019-08-16 22:44:14 +00:00
Joshua Barretto
bf27fa724a Merge branch 'scott-c/cull-entities-outside-viewport' into 'master' 
Scott c/cull entities outside viewport

Closes #207

See merge request veloren/veloren!442
 2019-08-16 16:47:02 +00:00
scott-c
cf8f2e1abc cargo fmt 2019-08-17 00:11:06 +08:00
scott-c
06a912c2e5 unwrap_or instead of map_or 2019-08-17 00:08:09 +08:00
scott-c
287cf5cb77 use entity scale as hitbox for frustrum culling 2019-08-16 23:39:07 +08:00
scott-c
27824c636e Replace view distance culling with frustum culling 2019-08-16 21:45:10 +08:00
Imbris
685a31a747 remove palette dependency 2019-08-16 00:01:20 -04:00
Imbris
bdbe967a88 Fix typo, move shaders back out of subfolders 2019-08-15 23:59:10 -04:00
Imbris
1037dece2f Lighter 2019-08-15 23:59:09 -04:00
Imbris
093f6baa8d Tweak lighting 2019-08-15 23:59:09 -04:00
Imbris
ec28d628bd Improve colors 2019-08-15 23:59:09 -04:00
Imbris
8c99796e1d Increase saturation of some colors 2019-08-15 23:56:15 -04:00
Imbris
189a9058e2 update ci for new shader position 2019-08-15 23:56:14 -04:00
Imbris
d1e017557b move conversion to fragment shader 2019-08-15 23:56:14 -04:00
Imbris
3988daed39 Add srgb converion in shaders 2019-08-15 23:56:14 -04:00
Imbris
d71cc31e29 Handle errors in file watching 2019-08-15 23:56:13 -04:00
Imbris
35d490bc1e Move shaders, start asset reloading system 2019-08-15 23:56:12 -04:00
Marcel
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
Acrimon
7453e7f288 [Common] Switch mutexes and channels. 2019-08-16 00:19:54 +02:00
Acrimon
4c575c14ff [Server] Switched mpsc for crossbeam::channel. 2019-08-16 00:10:46 +02:00
Acrimon
dc1e4d1ae8 [Voxygen] Switch mutexes to parking_lot and channels to crossbeam. 2019-08-16 00:07:09 +02:00
Joshua Barretto
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
Piotr Korgól
892855a348 Add needs_admin bool to check if the commands needs admin perms 2019-08-15 16:33:40 +02:00
Piotr Korgól
28c47663d0 Give singleplayer its own server settings 2019-08-14 17:51:59 +02:00
Piotr Korgól
e07762d134 Fix spawn command, properly search for admins 2019-08-14 17:30:36 +02:00
Piotr Korgól
1f5817a80b Add Admins field to the settings file 2019-08-14 17:30:36 +02:00
Piotr Korgól
7fa5403aeb Add AdminPerms component, make some commands require it 2019-08-14 17:30:36 +02:00
Marcel
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
haslersn
73f490d628 gitignore: Add .envrc (direnv config file) 2019-08-14 14:58:41 +02:00
Marcel
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
Geno
e8342cd4a3 added first person switch 2019-08-13 17:54:13 +00:00
Joshua Barretto
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
Acrimon
20bd2e0fce Switched over the last std hashset. 2019-08-11 22:39:41 +02:00
Acrimon
7c8487ed76 Finished switch to hashbrown. 2019-08-11 22:38:28 +02:00
Acrimon
bd4119a6cd Use hashbrown instead of fxhashmap in world. 2019-08-11 22:10:36 +02:00
Acrimon
9c0a6caafb Migrate client to hashbrown. 2019-08-11 21:54:20 +02:00
Acrimon
058ecb8ada Use hashbrown in voxygen instead of a billion different shitty maps. 2019-08-11 21:52:23 +02:00
Acrimon
9515f047b9 Switch to hashbrown in server. 2019-08-11 21:48:02 +02:00
Joshua Barretto
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
Acrimon
6be5daef1a Formatted code. 2019-08-11 13:37:04 +02:00
Acrimon
b560fccdb1 Cleaned up seed generation in worldsim. 2019-08-11 13:37:04 +02:00
Acrimon
ac2b30b31b Rewrite diffusion function. Now has potential for a full avalanche. 2019-08-11 13:37:04 +02:00
Acrimon
46ee5c41ea Greatly simplified seed expansion. 2019-08-11 13:37:04 +02:00
Acrimon
964e81732f Improved some comments. 2019-08-11 13:37:04 +02:00