|
|
e2bdf0dd6c
|
Added a lot of comments.
|
2019-08-11 13:37:04 +02:00 |
|
|
|
05cf8d190f
|
Adjusted default spawn height for now
|
2019-08-11 13:37:04 +02:00 |
|
|
|
a301908654
|
Fixed overflow in seed_expan
|
2019-08-11 13:36:14 +02:00 |
|
|
|
081dc6b7a6
|
Fixed diffuse_field
|
2019-08-11 13:36:14 +02:00 |
|
|
|
08b980038c
|
Improved worldgen seed expansion
|
2019-08-11 13:36:14 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
fc3df0498d
|
fix time overflow crash
|
2019-08-09 09:13:28 +00:00 |
|
|
|
66db9a6f09
|
Merge branch 'telastrus/auth' into 'master'
Server-side authentication
See merge request veloren/veloren!419
|
2019-08-09 01:37:44 +00:00 |
|
|
|
20cba432e7
|
swapped if for entry
|
2019-08-08 21:28:25 -04:00 |
|
|
|
7a0f780de7
|
created basic AuthProvider which we can change to suit our needs
|
2019-08-08 18:24:14 -04:00 |
|
|
|
35c89a5aaf
|
fixed the silent kick, made it actually proper
|
2019-08-08 17:58:36 -04:00 |
|
|
|
ff1f6f22b3
|
fixed chat-cli
|
2019-08-08 13:21:18 -04:00 |
|
|
|
accba8ea4f
|
Merge branch 'telastrus/vel-fix' into 'master'
velocity fix
See merge request veloren/veloren!423
|
2019-08-08 16:09:15 +00:00 |
|
|
|
62df0d3503
|
actually removed printlns
|
2019-08-08 12:09:14 -04:00 |
|
|
|
7e4e132307
|
ran cargo fmt
|
2019-08-08 12:05:38 -04:00 |
|
|
|
780076ea40
|
removed println statements
|
2019-08-08 12:03:12 -04:00 |
|
|
|
12a3258ee2
|
auth done, no popup yet
|
2019-08-08 12:01:15 -04:00 |
|
|
|
2f7648b9a6
|
90% there
|
2019-08-08 11:23:58 -04:00 |
|
|
|
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 |
|
|
|
25726babac
|
velocity fix
|
2019-08-08 10:42:23 -04:00 |
|
|
|
6a908250ee
|
Add a lantern strength limit to prevent shader overflows
|
2019-08-08 14:44:58 +02:00 |
|
|
|
608deba238
|
still compiles
|
2019-08-07 23:56:02 -04:00 |
|
|
|
74b42160ee
|
laying the groundwork
|
2019-08-07 15:42:44 -04:00 |
|
|
|
0c08b777b3
|
Added default explosion radius
|
2019-08-07 18:18:32 +01:00 |
|
|
|
345a5a9513
|
Added /explosion command
|
2019-08-07 18:17:04 +01:00 |
|
|
|
f14c787c85
|
Switched to EventBus system
|
2019-08-07 16:39:16 +01:00 |
|
|
|
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 |
|
|
|
2101f27ffb
|
Part 1 of implementing the social window
|
2019-08-07 13:14:26 +00:00 |
|
|
|
d58274b928
|
Added entity event system, fixed fall damage
|
2019-08-07 10:50:49 +01:00 |
|
|
|
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 |
|
|
|
b05f99d809
|
undo unnecessary pub mod
fixed comments
fixed other comment
|
2019-08-06 22:46:25 -04:00 |
|
|
|
687a042cfa
|
fall damage + velocity debug
|
2019-08-06 17:51:13 -04:00 |
|
|
|
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 |
|
|
|
c8ce4459e8
|
Collision fixes, better camera in build mode
|
2019-08-06 16:00:14 +01:00 |
|
|
|
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 |
|
|
|
71ba9deeca
|
Add a new dungeon, fixes for existing ones
|
2019-08-06 12:51:14 +03:00 |
|
|
|
17aae64bf5
|
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 |
|
|
|
a6691a3f58
|
Implement specifier syntax and cleanup
|
2019-08-06 08:31:48 +02:00 |
|
|
|
89ae781cd4
|
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 |
|
|
|
423d990132
|
reverted some unnecessary changes
corrected typo
ran cargo fmt
|
2019-08-05 19:41:31 -04:00 |
|
|
|
fe06ae6510
|
Added adjustable FOV slider
|
2019-08-05 12:37:52 -04:00 |
|
|
|
30e5cf5489
|
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 |
|
|
|
06048c1113
|
Fixes voxel errors in the human female hair
|
2019-08-04 18:55:20 +00:00 |
|
|
|
8b2c53c93b
|
really really fix .gitlab-ci windows release build wasnt uploading artifacts
|
2019-08-04 18:14:48 +02:00 |
|
|
|
893b4b066a
|
Merge branch 'zesterer/small-fixes' into 'master'
Stopped stars appearing in the day, better slerping
See merge request veloren/veloren!406
|
2019-08-04 15:00:15 +00:00 |
|
|
|
4a49335917
|
temp allor release builds to be generated
|
2019-08-04 16:55:09 +02:00 |
|
|
|
a82ae863f3
|
Improved orientation slerping
|
2019-08-04 15:51:17 +01:00 |
|
|
|
bbe32c062c
|
Merge branch 'fixci' into 'master'
prepare release builds in release branches
See merge request veloren/veloren!405
|
2019-08-04 14:34:34 +00:00 |
|
|
|
da7c3020a2
|
Stopped stars appearing in the day
|
2019-08-04 15:30:45 +01:00 |
|
