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,000 Commits 151 Branches 18 Tags 2.1 GiB
b063694d05
Commit Graph

2000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Forest Anderson
d6a2129c84 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
09b15e5278 velocity fix 2019-08-08 10:42:23 -04:00
Piotr Korgól
9f2d66b025 Add a lantern strength limit to prevent shader overflows 2019-08-08 14:44:58 +02:00
telastrus
6d94d43021 still compiles 2019-08-07 23:56:02 -04:00
telastrus
157c4816b3 laying the groundwork 2019-08-07 15:42:44 -04:00
Joshua Barretto
e6f384fc11 Added default explosion radius 2019-08-07 18:18:32 +01:00
Joshua Barretto
5b62531da3 Added /explosion command 2019-08-07 18:17:04 +01:00
Joshua Barretto
192f5d355f Switched to EventBus system 2019-08-07 16:39:16 +01:00
Marcel
2eac162ee4 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
aac53f9311 Part 1 of implementing the social window 2019-08-07 13:14:26 +00:00
Joshua Barretto
98a913195b Added entity event system, fixed fall damage 2019-08-07 10:50:49 +01:00
Forest Anderson
2fb8306b98 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
e4f2c73b85 undo unnecessary pub mod 
fixed comments

fixed other comment
 2019-08-06 22:46:25 -04:00
telastrus
0eafd42c0f fall damage + velocity debug 2019-08-06 17:51:13 -04:00
Joshua Barretto
8b4b1163d4 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
73a44d0fb1 Collision fixes, better camera in build mode 2019-08-06 16:00:14 +01:00
Joshua Barretto
cbae0d753f 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
595f9ac3d2 Add a new dungeon, fixes for existing ones 2019-08-06 12:51:14 +03:00
Marcel
86be3fccfc Merge branch 'timo-cleanup' into 'master' 
Implement specifier syntax and cleanup

See merge request veloren/veloren!413
 2019-08-06 06:52:24 +00:00
timokoesters
1227596406 Implement specifier syntax and cleanup 2019-08-06 08:31:48 +02:00
Forest Anderson
3d38dbb45a Merge branch 'telastrus/add-adjustable-fov' into 'master' 
Add adjustable fov

See merge request veloren/veloren!411
 2019-08-05 23:48:41 +00:00
telastrus
4dcb53bdb8 reverted some unnecessary changes 
corrected typo

ran cargo fmt
 2019-08-05 19:41:31 -04:00
telastrus
c098a5efd7 Added adjustable FOV slider 2019-08-05 12:37:52 -04:00
Timo Koesters
ade0724baf Merge branch 'human-female-hair-fix' into 'master' 
Fixes voxel errors in the human female hair

See merge request veloren/veloren!407
 2019-08-04 18:55:20 +00:00
Monty Marz
ad5608b3f5 Fixes voxel errors in the human female hair 2019-08-04 18:55:20 +00:00