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
2,242 Commits 151 Branches 18 Tags 2.1 GiB
6dbeda3267
Commit Graph

2242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Acrimon
6b59f0bc9a Fixed seed expansion for noise seeding. 2019-08-19 00:19:51 +02:00
Joshua Barretto
66dc78a4ce 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
586bf5faff Add adminify command to temporarily give admin perms 2019-08-17 23:35:01 +02:00
Imbris
f12821db35 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
e9fc2789d1 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
fce74c6218 cargo fmt 2019-08-17 00:11:06 +08:00
scott-c
2fabdfe0eb unwrap_or instead of map_or 2019-08-17 00:08:09 +08:00
scott-c
dc73e4ffb7 use entity scale as hitbox for frustrum culling 2019-08-16 23:39:07 +08:00
scott-c
f312299e62 Replace view distance culling with frustum culling 2019-08-16 21:45:10 +08:00
Imbris
5054f1e87d remove palette dependency 2019-08-16 00:01:20 -04:00
Imbris
d89fff1499 Fix typo, move shaders back out of subfolders 2019-08-15 23:59:10 -04:00
Imbris
d99a4f8d39 Lighter 2019-08-15 23:59:09 -04:00
Imbris
6a477d6b69 Tweak lighting 2019-08-15 23:59:09 -04:00
Imbris
be0e0e52a8 Improve colors 2019-08-15 23:59:09 -04:00
Imbris
9dbdd51777 Increase saturation of some colors 2019-08-15 23:56:15 -04:00
Imbris
722ba8da20 update ci for new shader position 2019-08-15 23:56:14 -04:00
Imbris
bdd7b2c22d move conversion to fragment shader 2019-08-15 23:56:14 -04:00
Imbris
c09eb77149 Add srgb converion in shaders 2019-08-15 23:56:14 -04:00
Imbris
43ec7b200b Handle errors in file watching 2019-08-15 23:56:13 -04:00
Imbris
cb25c45dec Move shaders, start asset reloading system 2019-08-15 23:56:12 -04:00
Marcel
68df43045c 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
42e065d425 [Common] Switch mutexes and channels. 2019-08-16 00:19:54 +02:00
Acrimon
593deb828b [Server] Switched mpsc for crossbeam::channel. 2019-08-16 00:10:46 +02:00
Acrimon
fda47fc322 [Voxygen] Switch mutexes to parking_lot and channels to crossbeam. 2019-08-16 00:07:09 +02:00
Joshua Barretto
ef81e8efdc 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
a777b67b2d Add needs_admin bool to check if the commands needs admin perms 2019-08-15 16:33:40 +02:00
Piotr Korgól
0221de484e Give singleplayer its own server settings 2019-08-14 17:51:59 +02:00
Piotr Korgól
8ec0a06bbe Fix spawn command, properly search for admins 2019-08-14 17:30:36 +02:00
Piotr Korgól
6882170d6f Add Admins field to the settings file 2019-08-14 17:30:36 +02:00
Piotr Korgól
98c0692260 Add AdminPerms component, make some commands require it 2019-08-14 17:30:36 +02:00
Marcel
d4fd5d9e4e 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
683936a0b5 gitignore: Add .envrc (direnv config file) 2019-08-14 14:58:41 +02:00
Marcel
f4aa053b53 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
a9f20148a4 added first person switch 2019-08-13 17:54:13 +00:00
Joshua Barretto
a8e0d6943f 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
4f3b49ef8b Switched over the last std hashset. 2019-08-11 22:39:41 +02:00
Acrimon
b4a46f3e6e Finished switch to hashbrown. 2019-08-11 22:38:28 +02:00
Acrimon
ed4909670d Use hashbrown instead of fxhashmap in world. 2019-08-11 22:10:36 +02:00
Acrimon
22f318833c Migrate client to hashbrown. 2019-08-11 21:54:20 +02:00
Acrimon
0bbef0d851 Use hashbrown in voxygen instead of a billion different shitty maps. 2019-08-11 21:52:23 +02:00
Acrimon
4f2d99f809 Switch to hashbrown in server. 2019-08-11 21:48:02 +02:00
Joshua Barretto
4b333ed89f 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
51a4e358dd Formatted code. 2019-08-11 13:37:04 +02:00
Acrimon
7b8a7a410d Cleaned up seed generation in worldsim. 2019-08-11 13:37:04 +02:00
Acrimon
cdf4c26be7 Rewrite diffusion function. Now has potential for a full avalanche. 2019-08-11 13:37:04 +02:00
Acrimon
00b5a4a58e Greatly simplified seed expansion. 2019-08-11 13:37:04 +02:00
Acrimon
d840ca72e3 Improved some comments. 2019-08-11 13:37:04 +02:00
Acrimon
5eee2622cb Fixed comment typo. 2019-08-11 13:37:04 +02:00
Acrimon
dcc19e2d04 Added a lot of comments. 2019-08-11 13:37:04 +02:00
Acrimon
1c22f380b0 Adjusted default spawn height for now 2019-08-11 13:37:04 +02:00