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,475 Commits 151 Branches 18 Tags 2.1 GiB
5b716515bb
Commit Graph

2475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Acrimon
fea6b2e776 Fixed overflow in seed_expan 2019-08-11 13:36:14 +02:00
Acrimon
8cb48804c2 Fixed diffuse_field 2019-08-11 13:36:14 +02:00
Acrimon
393ac4610c Improved worldgen seed expansion 2019-08-11 13:36:14 +02:00
Joshua Barretto
d5aee13c91 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
Joshua Barretto
64f05b9e09 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
Songtronix
612a3df528 fix time overflow crash 2019-08-09 09:13:28 +00:00
Joshua Barretto
2191921721 Merge branch 'telastrus/auth' into 'master' 
Server-side authentication

See merge request veloren/veloren!419
 2019-08-09 01:37:44 +00:00
telastrus
79b5c177cd swapped if for entry 2019-08-08 21:28:25 -04:00
telastrus
eadf3a7671 created basic AuthProvider which we can change to suit our needs 2019-08-08 18:24:14 -04:00
telastrus
07d3384b01 fixed the silent kick, made it actually proper 2019-08-08 17:58:36 -04:00
telastrus
3a9bbc4927 fixed chat-cli 2019-08-08 13:21:18 -04:00
Forest Anderson
5cca883c3f Merge branch 'telastrus/vel-fix' into 'master' 
velocity fix

See merge request veloren/veloren!423
 2019-08-08 16:09:15 +00:00
telastrus
66e254db7f actually removed printlns 2019-08-08 12:09:14 -04:00
telastrus
35a3f67e19 ran cargo fmt 2019-08-08 12:05:38 -04:00
telastrus
58e8bd4af9 removed println statements 2019-08-08 12:03:12 -04:00
telastrus
de2082469d auth done, no popup yet 2019-08-08 12:01:15 -04:00
telastrus
f2ed2870c6 90% there 2019-08-08 11:23:58 -04:00