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,957 Commits 151 Branches 18 Tags
Commit Graph

1957 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Acrimon
f640681f8c Fixed comment typo. 2019-08-11 13:37:04 +02:00
Acrimon
e2bdf0dd6c Added a lot of comments. 2019-08-11 13:37:04 +02:00
Acrimon
05cf8d190f Adjusted default spawn height for now 2019-08-11 13:37:04 +02:00
Acrimon
a301908654 Fixed overflow in seed_expan 2019-08-11 13:36:14 +02:00
Acrimon
081dc6b7a6 Fixed diffuse_field 2019-08-11 13:36:14 +02:00
Acrimon
08b980038c Improved worldgen seed expansion 2019-08-11 13:36:14 +02:00
Joshua Barretto
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
Joshua Barretto
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
Songtronix
fc3df0498d fix time overflow crash 2019-08-09 09:13:28 +00:00
Joshua Barretto
66db9a6f09 Merge branch 'telastrus/auth' into 'master' 
Server-side authentication

See merge request veloren/veloren!419
 2019-08-09 01:37:44 +00:00
telastrus
20cba432e7 swapped if for entry 2019-08-08 21:28:25 -04:00
telastrus
7a0f780de7 created basic AuthProvider which we can change to suit our needs 2019-08-08 18:24:14 -04:00
telastrus
35c89a5aaf fixed the silent kick, made it actually proper 2019-08-08 17:58:36 -04:00
telastrus
ff1f6f22b3 fixed chat-cli 2019-08-08 13:21:18 -04:00
Forest Anderson
accba8ea4f Merge branch 'telastrus/vel-fix' into 'master' 
velocity fix

See merge request veloren/veloren!423
 2019-08-08 16:09:15 +00:00
telastrus
62df0d3503 actually removed printlns 2019-08-08 12:09:14 -04:00
telastrus
7e4e132307 ran cargo fmt 2019-08-08 12:05:38 -04:00
telastrus
780076ea40 removed println statements 2019-08-08 12:03:12 -04:00
telastrus
12a3258ee2 auth done, no popup yet 2019-08-08 12:01:15 -04:00
telastrus
2f7648b9a6 90% there 2019-08-08 11:23:58 -04:00
Forest Anderson
e63f80cd0f Merge branch 'qutrin/lantern-limit' into 'master' 
Add a lantern strength limit to prevent shader overflows

Closes #219

See merge request veloren/veloren!421
 2019-08-08 15:07:58 +00:00
telastrus
25726babac velocity fix 2019-08-08 10:42:23 -04:00
Piotr Korgól
6a908250ee Add a lantern strength limit to prevent shader overflows 2019-08-08 14:44:58 +02:00
telastrus
608deba238 still compiles 2019-08-07 23:56:02 -04:00
telastrus
74b42160ee laying the groundwork 2019-08-07 15:42:44 -04:00
Joshua Barretto
0c08b777b3 Added default explosion radius 2019-08-07 18:18:32 +01:00
Joshua Barretto
345a5a9513 Added /explosion command 2019-08-07 18:17:04 +01:00
Joshua Barretto
f14c787c85 Switched to EventBus system 2019-08-07 16:39:16 +01:00
Marcel
a59fcc18df Merge branch 'pfauenauge/social-window' into 'master' 
Part 1 of implementing the social window

See merge request veloren/veloren!415
 2019-08-07 13:14:26 +00:00
Monty Marz
2101f27ffb Part 1 of implementing the social window 2019-08-07 13:14:26 +00:00
Joshua Barretto
d58274b928 Added entity event system, fixed fall damage 2019-08-07 10:50:49 +01:00
Forest Anderson
18f5504efc Merge branch 'telastrus/fall-damage' into 'master' 
Rudimentary fall damage

See merge request veloren/veloren!417
 2019-08-07 02:51:43 +00:00
telastrus
b05f99d809 undo unnecessary pub mod 
fixed comments

fixed other comment
 2019-08-06 22:46:25 -04:00
telastrus
687a042cfa fall damage + velocity debug 2019-08-06 17:51:13 -04:00
Joshua Barretto
5504e5be0e Merge branch 'zesterer/small-fixes' into 'master' 
Collision fixes, better camera in build mode

See merge request veloren/veloren!416
 2019-08-06 15:13:57 +00:00
Joshua Barretto
c8ce4459e8 Collision fixes, better camera in build mode 2019-08-06 16:00:14 +01:00
Joshua Barretto
6616690f66 Merge branch 'vechro/dungeons' into 'master' 
Add a new dungeon, fixes for existing ones

See merge request veloren/veloren!414
 2019-08-06 10:21:39 +00:00
Vechro
71ba9deeca Add a new dungeon, fixes for existing ones 2019-08-06 12:51:14 +03:00