Commit Graph

5464 Commits

Author SHA1 Message Date
Imbris
0e4b31fb63 Merge branch 'imbris/random-fixes2' into 'master'
Random fixes 2.0

Closes #774 and #711

See merge request veloren/veloren!1396
2020-10-10 19:46:39 +00:00
Imbris
fa45edb541 Fix clippy, minor fmt, add TODO comments 2020-10-10 03:01:30 -04:00
Imbris
39f78e9116 Remove saves dir env var and setting from server settings and just always use saves as the dir name 2020-10-10 02:15:54 -04:00
Imbris
71251ca6a6 Change admins from Vec<String> into Hashset<Uuid>, add commands to server-cli-bin for adding and removing admins 2020-10-10 02:10:32 -04:00
Imbris
ca2bf937e6 Apply saves dir override when loading settings, change whitelist to a HashSet, let admins login even if they are not on the whitelist to reflect the comments in login code 2020-10-10 02:10:32 -04:00
Imbris
83fb26c4f9 Group editable server settings into one struct that is stored in the ecs, don't expose DataDir, use Uuid in the whitelist instead of usernames, replace Banlist record tuple with new type with named fields, remove commented code 2020-10-10 02:10:32 -04:00
Imbris
a3ee5a4006 Rename model_col -> highligh_col to better reflect its usage 2020-10-10 02:10:32 -04:00
Imbris
fb2cf1a292 Fix clippy warnings 2020-10-10 02:10:32 -04:00
Imbris
522880a0ab Update CI and docker files to work with changes to data folder structure 2020-10-10 02:10:32 -04:00
Imbris
308cca0dc9 Put server-cli specific settings in their own structure, serde_derive -> serde 2020-10-10 02:10:32 -04:00
Imbris
7c14a3f4a4 New userdata folder that holds voxygen settings and logs and server saves and settings, split up server settings file into parts that are persisted back to their files and parts that are read-only, misc fixes 2020-10-10 02:10:32 -04:00
Imbris
26d59a62fc Downgrade debug -> trace in persistence code 2020-10-10 02:10:32 -04:00
Imbris
66d2d636ee Add server-cli option to disable auth 2020-10-10 02:10:32 -04:00
Imbris
873ea1ec46 Make basic server-cli mode default to not reading input and add interactive option 2020-10-10 02:10:31 -04:00
Imbris
ef74d395a6 Improve figure and sprite highlighting 2020-10-10 02:10:31 -04:00
Imbris
6c43a7cdc5 Change projectiles to not be pushed back by collisions, moved group check into projectile system from physics system 2020-10-10 02:10:31 -04:00
Monty Marz
65f16ba4c1 Merge branch 'pfau/microscopic-fixes' into 'master'
Lanterns, Gliders, Quality Stat

See merge request veloren/veloren!1400
2020-10-07 02:23:20 +00:00
Monty Marz
2b800a2b63 make clippy happy
Delete glider.ron
2020-10-07 02:23:20 +00:00
Marcel
613b3b103f Merge branch 'undefined' into 'master'
Correction of errors

See merge request veloren/veloren!1421
2020-10-05 22:54:49 +00:00
Marcel
155e14a4bd Merge branch 'xvar/sigint-graceful-shutdown' into 'master'
Implemented graceful shutdown and fixed various TUI bugs

See merge request veloren/veloren!1423
2020-10-04 21:32:26 +00:00
Ben Wallis
51459c0733 Implemented graceful shutdown on SIGUSR1 signal. Added shutdown <seconds> TUI command. Added abortshutdown TUI command. Fixed a bug in TUI that caused a panic on quit in basic mode on windows. 2020-10-04 21:24:45 +01:00
Samuel Keiffer
8402f98261 Merge branch 'sam/sceptre-loot-fix' into 'master'
Loot table fix

See merge request veloren/veloren!1422
2020-10-04 14:54:35 +00:00
Sam
e501235265 Loot table fix 2020-10-04 08:52:19 -05:00
pablo saavedra soler
90e795fd9f I have corrected many errors in Spanish grammar and dialect in Latin America 2020-10-04 06:41:35 +00:00
Marcel
33be0a0e9f Merge branch 'mdroogle/interaction_hint' into 'master'
Add interaction hint #615

See merge request veloren/veloren!1394
2020-10-01 09:31:54 +00:00
Samuel Keiffer
a2daad8c76 Merge branch 'sam/sceptre-overhaul' into 'master'
Sceptre Rework

Closes #760

See merge request veloren/veloren!1345
2020-09-30 03:05:14 +00:00
Sam
47abf49751 Addressed comments 2020-09-29 20:48:23 -05:00
Sam
207586cfab Beam particles fixed/tweaked. 2020-09-29 19:48:17 -05:00
Sam
5f889773b5 Addressed comments 2020-09-29 19:48:17 -05:00
Sam
51141b2c1a Changelog line, final balance tweaks. 2020-09-29 19:48:16 -05:00
Sam
0b80257aa3 Add migration 2020-09-29 19:48:15 -05:00
Sam
56d2afc0dc Added keyframe support to basic beam state. Addressed some comments. 2020-09-29 19:48:15 -05:00
Sam
a8f31cbe6f Beam tick rate now more responsive when aiming. 2020-09-29 19:48:14 -05:00
Sam
506ad1e80e Improvements to beam collision. 2020-09-29 19:48:14 -05:00
Sam
ffe456c703 Fixed what broke after rebasing. 2020-09-29 19:48:13 -05:00
Sam
37fcfb8b6f Created manifest for database to filepath for items. 2020-09-29 19:48:12 -05:00
Sam
3d6c26a3c7 Fully separated sceptres from staves. 2020-09-29 19:48:12 -05:00
Sam
3e2e06f2f8 Projectile effects are now drained, so that the same projectile can't trigger it's effects on multiple enemies. 2020-09-29 19:48:11 -05:00
Sam
67eafdabd0 Separated out energy cost for healing so it's not based off of the energy regen from dealing damage. 2020-09-29 19:48:11 -05:00
Monty Marz
3734fafcd8 doubled energy consumption for M1 healing 2020-09-29 19:48:10 -05:00
Monty Marz
2a884df8de fix SCT decimals not being absolutes 2020-09-29 19:48:10 -05:00
Sam
5bd6f0e26f Addressed feedback in sceptre branch 2020-09-29 19:48:09 -05:00
Sam
de45784596 Addressed round of testing feedback. 2020-09-29 19:48:09 -05:00
Sam
18c2b850d3 Added healing healthsource logic to beam system. 2020-09-29 19:48:08 -05:00
Monty Marz
13d9b814ab separate sceptres from staffs, show values below 1.0 as decimals in the SCT, add starting sceptre
remove firebolt from starting sceptre
2020-09-29 19:48:07 -05:00
Sam
7e95a93434 Energy no longer regens when heal target is at full health. 2020-09-29 19:48:07 -05:00
Sam
07fd9ac023 Re-added necessary functionality to beam (heal, lifesteal, energy regen). 2020-09-29 19:48:06 -05:00
Sam
095433abcc Addressed comments. 2020-09-29 19:48:06 -05:00
Sam
799a6c1d1e Tweaked beam collision logic to be more accurate. 2020-09-29 19:48:05 -05:00
Sam
a679a34a7b Reverted changes to melee system that were added to when beam was initially in melee system. 2020-09-29 19:48:04 -05:00