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

2618 Commits

Author SHA1 Message Date
Joshua Yanovski
2015f34985 Merge branch 'sharp/modtools' into 'master' 
Added non-admin moderators and timed bans.

See merge request veloren/veloren!2276
 2021-05-10 04:54:06 +00:00
Joshua Yanovski
3f8d2f95be Added non-admin moderators and timed bans. 
The security model has been updated to reflect this change (for example,
moderators cannot revert a ban by an administrator).  Ban history is
also now recorded in the ban file, and much more information about the
ban is stored (whitelists and administrators also have extra
information).

To support the new information without losing important information,
this commit also introduces a new migration path for editable settings
(both from legacy to the new format, and between versions).  Examples
of how to do this correctly, and migrate to new versions of a settings
file, are in the settings/ subdirectory.

As part of this effort, editable settings have been revamped to
guarantee atomic saves (due to the increased amount of information in
each file), some latent bugs in networking were fixed, and server-cli
has been updated to go through StructOpt for both calls through TUI
and argv, greatly simplifying parsing logic.
 2021-05-09 21:19:16 -07:00
Samuel Keiffer
f0cc0b57ed Merge branch 'aweinstock/mindflayerfixes-202105' into 'master' 
Mindflayer AI improvments

See merge request veloren/veloren!2285
 2021-05-10 02:54:21 +00:00
Samuel Keiffer
4259de3b26 Merge branch 'aws107/roll-to-remove-burning' into 'master' 
Implement #1105: Rolling removes burning debuff

Closes #1105

See merge request veloren/veloren!2271
 2021-05-10 02:40:08 +00:00
Avi Weinstock
6ac0f6fdd9 Change agent's condition field back to a bool (from bitflags) and add a separate int_counter field. 2021-05-09 18:09:53 -04:00
Avi Weinstock
7103467d1a Add a purple fireball to mindflayer and have it shoot it a few times before teleporting, and fix mindflayer AI's husk summons. 2021-05-09 18:09:31 -04:00
juliancoffee
4ac795c982 Add species to /spawn auto-complete 2021-05-09 20:43:13 +03:00
juliancoffee
85e879a549 style convention 2021-05-09 19:05:01 +03:00
juliancoffee
7bec0bc529 add authors 2021-05-09 13:12:26 +03:00
juliancoffee
ab2ee20ba3 Fix tests 
1) Use more correct way to look for `assets` dir
2) Rename veloren_common::assets to veloren_common_assets in doc-tests
 2021-05-09 13:12:26 +03:00
juliancoffee
d4fd0d6b96 Search for assets in workspace root 2021-05-09 13:12:26 +03:00
juliancoffee
5bd4dcc167 Extract common/src/assets.rs to own crate 
This gives us ability to use assets-related code in i18n without
depending on whole veloren-common
 2021-05-09 13:12:26 +03:00
Marcel
7e85e35ff9 Merge branch 'aweinstock/fix-bow-20210507' into 'master' 
Make projectiles function properly if they hit a wall in the same tick as an entity.

See merge request veloren/veloren!2275
 2021-05-08 15:47:12 +00:00
Illia Denysenko
ac1b01c636 /skill_preset command 2021-05-08 15:47:09 +00:00
Avi Weinstock
be8a509ef2 Make projectiles function properly if they hit a wall in the same tick as an entity. 2021-05-07 23:20:57 -04:00
Adam Strauss
32ae8420fe Fix #1105: Move server event so it does not emit constantly during build up 2021-05-07 15:40:11 -07:00
Adam Strauss
0e6f9a5599 Implement #1105: Rolling removes burning debuff 2021-05-07 15:38:41 -07:00
Snowram
9d4d6a066a Snowram/craft mats 2021-05-07 17:03:45 +00:00
Samuel Keiffer
67eff3d351 Merge branch 'aweinstock/damage-types' into 'master' 
Add `DamageKind`, and make piercing damage partially ignore damage resistence.

See merge request veloren/veloren!2262
 2021-05-06 22:22:49 +00:00
Avi Weinstock
ff83cf752b Add DamageKind, and make piercing damage partially ignore damage resistence. 
- Tweak bow/staff M1 stats.
 2021-05-06 17:39:06 -04:00
James Melkonian
d849bf7d29 Move weapon tactics to functions and take target body into attack radius consideration 2021-05-06 21:17:05 +00:00
Marcel
8e4fb87500 Merge branch 'xMAC94x/fixDisconnectMetrics' into 'master' 
instead of manually trying to sync disconnect metrics we now pass a Reason to...

See merge request veloren/veloren!2259
 2021-05-06 11:32:37 +00:00
Marcel Märtens
ab33b8cc3d instead of manually trying to sync disconnect metrics we now pass a Reason to the handle_disconnect. 
There we make sure that the disconnect only happens once and decrease the respective Metrics.
Also added more reasons
 2021-05-06 11:43:10 +02:00
Marcel
fd43e7bccd Merge branch 'duelsik/wiring-on-death' into 'master' 
(Wiring) OnDeath

See merge request veloren/veloren!2256
 2021-05-06 09:00:50 +00:00
Sam
a29b3dfcfa Rebalancing 2021-05-05 14:43:56 -04:00
Daniel Mizerski
4b5934c29a (Wiring) OnDeath 2021-05-05 19:08:18 +02:00
Marcel Märtens
af7091182e use a constant for recommended_threads 2021-05-05 14:35:06 +02:00
Marcel Märtens
87cf347377 limit tokio threads to 1/4 of num_cpus 
make sure that rayon has at least 2 threads even on 1cpu systems to increase stability
 2021-05-04 21:06:11 +02:00
Marcel Märtens
9fefdcbbca rayon::join creates a global threadpool, which is only used in /world 
instead just use the same threadpool for everything
helps with debugging problems with GDB
using threadpool.install() to also be used when `into_par_iter()` is called
 2021-05-04 21:06:07 +02:00
Samuel Keiffer
101fb498a5 Merge branch 'sam/minotaur' into 'master' 
Overhauled Minotaur

See merge request veloren/veloren!2193
 2021-05-04 16:26:08 +00:00
Imbris
4a0b6b7b2b Merge branch 'duelsik/wiring-sticky-trigger' into 'master' 
(Wiring) Change Sticky to be handled by physics (but with disabled force on it)

See merge request veloren/veloren!2241
 2021-05-04 16:15:19 +00:00
Daniel Mizerski
766c58e6e7 (Wiring) Change Sticky to be handled by physics (but with disabled force on it) 2021-05-04 17:33:42 +02:00
Sam
344e8c8a67 Made buff commands exhaustive 2021-05-04 09:54:28 -04:00
Sam
0831970615 Addressed comments and more testing feedback. 2021-05-04 08:45:14 -04:00
Sam
1d3e831268 Minor balancing tweaks. 2021-05-04 08:45:13 -04:00
Sam
74a68e24d5 Added sfx. Addressed comments. 2021-05-04 08:45:12 -04:00
Sam
777eb2ee6a Balancing. 2021-05-04 08:45:11 -04:00
Sam
f491854699 Added kit for testing tier 4 dungeons. 2021-05-04 08:45:11 -04:00
Sam
bb98b021da Particles for frenzy buff and ground cleave. 2021-05-04 08:45:10 -04:00
Sam
445af44dfa Gave minotaur AI. 2021-05-04 08:45:09 -04:00
Sam
3aa462ed48 Replaced action_timer with action_state so there are additional fields. 2021-05-04 08:45:09 -04:00
jshipsey
8860e60415 anims 2021-05-04 08:45:08 -04:00
Sam
2e97fad3d8 Added frenzy ability to minotaur. 
Added self-buff character state.
Added frenzied buff kind.
Added better comments on each buff kind.
 2021-05-04 08:45:07 -04:00
Sam
c79c929e9f Crippling strike now functional. Crippled debuff added. 2021-05-04 08:45:05 -04:00
juliancoffee
000f90c8bf Draft implementation 2021-05-03 22:07:09 +03:00
Samuel Keiffer
a0899db36a Merge branch 'slipped/oritweak' into 'master' 
ori tweaks, animal adjusts

See merge request veloren/veloren!2234
 2021-05-03 18:49:22 +00:00
Samuel Keiffer
7b82e9b1f4 Merge branch 'sam/ability-sets' into 'master' 
Allow Specification of Custom Ability Sets per Weapon

See merge request veloren/veloren!2231
 2021-05-03 17:50:11 +00:00
Avi Weinstock
729dc180e8 Experiment with const fn lanczos lookup tables, enable weighted average interpolation for now. 2021-05-03 00:09:44 -04:00
Avi Weinstock
bb7dbe245d Make terrain compression a checkbox instead of a bandwidth (throughput?) heuristic. 2021-05-03 00:09:44 -04:00
Avi Weinstock
d858c629ce Optimize CompressedData with Vec::with_capacity, and move obsolete formats from common_net into the compression benchmark. 2021-05-03 00:09:24 -04:00