Snowram
3fa7d0b6d4
Add material and armor class tags
2021-06-07 11:00:31 +02:00
jshipsey
7a573efab7
proper recipes, tanning racks, various fixes
2021-06-07 11:00:14 +02:00
jshipsey
05de96c94b
ore deposits, flower drops
2021-06-07 10:59:50 +02:00
jshipsey
1c17d8fe5e
cave changes
2021-06-07 10:59:44 +02:00
jshipsey
754b60d810
crafting stations
2021-06-07 10:59:35 +02:00
Sam
2a07fad802
Removed armor stat hackery.
...
Added new armor stats to remaining armor items.
Fixed broken tests.
2021-06-07 10:59:26 +02:00
Sam
fa0fe38699
Fixed csv tools
2021-06-07 10:58:47 +02:00
Sam
855384fbeb
Crit power stat now functional, added comments on each stat field to better describe what the stat does and what values should be used.
2021-06-07 10:58:42 +02:00
Sam
c3b834ec15
Max energy stat functional.
2021-06-07 10:58:37 +02:00
Sam
6790b71d53
Energy recovery stat functional.
2021-06-07 10:58:32 +02:00
jshipsey
1b575a5a04
crafting item partial re-organization, armor recipes, some specific animal drops
2021-06-07 10:56:35 +02:00
Marcel
27e505e79d
Merge branch 'xMAC94x/log_spam' into 'master'
...
XMAC94x/log spam
See merge request veloren/veloren!2385
2021-06-07 07:55:27 +00:00
Imbris
0b92c72096
Make handling of shortcut keywords for commands clearer and revise a TODO related to how chat messages are stored and renamed with alias changes
2021-06-06 23:45:51 -04:00
Marcel Märtens
26160df8e5
adjust tracing
2021-06-06 19:31:25 +02:00
Marcel
521e1eacf3
Merge branch 'aweinstock/add-models-20210603' into 'master'
...
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.
See merge request veloren/veloren!2371
2021-06-06 16:56:21 +00:00
Snowram
edfe713076
Cyclops, basilisk, air balloon offsets
2021-06-06 14:12:08 +02:00
Sam
acf7ad27f1
Balance tweaks.
2021-06-05 17:15:04 -05:00
Sam
74b7039219
Yeti AI
2021-06-05 13:25:47 -05:00
Sam
93f90d514c
Particles for ice spikes
2021-06-04 18:17:15 -05:00
Sam
81f7e690fd
Snowball attack.
2021-06-04 18:17:15 -05:00
Sam
a82984b925
Added base ability set
2021-06-04 18:17:14 -05:00
Sam
eaf87a53bb
Final tweaks.
2021-06-03 21:39:47 -05:00
Sam
5bf99eac11
Added totem ability, totem ai, totem ability set, particles for totem abilities, and totem voxel model.
2021-06-03 21:39:15 -05:00
Sam
ac2f097d80
Tidal warrior AI.
2021-06-03 21:39:14 -05:00
Sam
c81e1534f7
First 3 abilities for tidal warrior functional. Added bubble particles.
2021-06-03 21:39:13 -05:00
Avi Weinstock
05c699878f
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.
2021-06-03 19:24:34 -04:00
Marcel Märtens
affb9730a8
use criterion groups and fix tracing to much on wgpu
2021-06-03 22:37:17 +02:00
Imbris
7da6b5e59d
Fix ProfSpan constructor being private
2021-06-03 00:10:06 -04:00
Imbris
c2da81cf18
Move pipeline creation into the background, still needs Drawer modications and UI to display status
2021-06-02 23:59:51 -04:00
Imbris
a1fac487e4
Suppress wgpu_core::device info logging
2021-06-02 23:59:48 -04:00
Samuel Keiffer
4b359b8ca4
Merge branch 'aweinstock/price-equality' into 'master'
...
Add a manifest for making different items count as the same item for the purpose of pricing.
See merge request veloren/veloren!2360
2021-06-02 23:48:45 +00:00
Samuel Keiffer
9a31d77f0a
Merge branch 'tygyh/default-loadout' into 'master'
...
LoadoutBuilder refactoring
See merge request veloren/veloren!2361
2021-06-02 23:42:39 +00:00
Samuel Keiffer
d235e98efe
Merge branch 'aweinstock/agent-pid' into 'master'
...
Implement PID controllers and use them to stabilize Agent airship flight.
See merge request veloren/veloren!2356
2021-06-02 23:15:08 +00:00
Avi Weinstock
054fb1d763
Add a manifest for making different items count as the same item for the purpose of pricing.
2021-06-02 19:12:51 -04:00
juliancoffee
1fc3fce970
Move warning-supressing from global onto function
2021-06-03 01:58:34 +03:00
juliancoffee
00714db492
Implement Choice of Choice in loadout files
2021-06-02 18:35:22 +03:00
juliancoffee
674a7f41bd
Using clippy::pedantic and improve asset tests
...
- Turned clippy::pedantic on for loadout_builder.rs and applied some
proposition
- Check for invalid weights in loadout files
2021-06-02 17:54:14 +03:00
Marcel
f988584337
Merge branch 'revert-c6e200a3' into 'master'
...
Add a configuration Option to opt-in Quic backend
See merge request veloren/veloren!2318
2021-06-02 14:27:13 +00:00
juliancoffee
952156ad99
Add ability to override weapon in loadout assets
2021-06-02 17:17:19 +03:00
juliancoffee
3c66e62fe0
Decompose LoadoutBuilder::from_asset_expect
...
- Introduce apply_asset_expect() to mutate passed builder and complete it
from asset
- Remove runtime panic from choosing item
- Rewrite defaults() to load from asset
2021-06-02 17:17:19 +03:00
Dr. Dystopia
641ccd5282
Replace object initialization with read from file
2021-06-02 17:17:19 +03:00
Imbris
3a1a65b134
Remove stabilized or_patterns feature
2021-06-01 13:19:20 -04:00
Imbris
23eca4c3f6
Re-disable incremental just for common-systems, small fix in plugin
...
crate, more new clippy fixes
2021-05-31 20:44:57 -04:00
Imbris
48ebb10d50
Update toolchain
2021-05-31 20:44:57 -04:00
Samuel Keiffer
9637d874ab
Merge branch 'adam/frozen-debuff' into 'master'
...
Frozen Debuff
See merge request veloren/veloren!2357
2021-05-30 22:39:11 +00:00
Adam Whitehurst
daa18dd92a
fix: remove limit
2021-05-30 13:42:47 -07:00
Adam Whitehurst
2e74348813
refactor: variable names
2021-05-30 13:40:25 -07:00
Adam Whitehurst
9e7937d98f
refactor: BuffKind::Frozen comment
2021-05-30 13:39:18 -07:00
Adam Whitehurst
98fdf5c3e1
fix: more succinct checked_tick_attack
2021-05-30 13:36:18 -07:00
Adam Whitehurst
6dc1c05089
fix: better scaling
2021-05-30 13:06:01 -07:00
Adam Whitehurst
66cf4ab74c
fix: name
2021-05-30 12:56:26 -07:00
Ygor Souza
d890a58b93
Reset on_ceiling state
...
Previously, the on_ceiling state would remain true for the entire
lifetime of the entity after it touched the ceiling once.
2021-05-30 21:49:11 +02:00
Adam Whitehurst
6b1351bdc3
feat: impl attack speed modifier
2021-05-30 12:39:30 -07:00
Adam Whitehurst
0b92cc5732
feat: tick_attack utils
2021-05-30 12:39:00 -07:00
Avi Weinstock
e09ae8ad83
Address MR 2356 comments.
2021-05-30 13:36:25 -04:00
Avi Weinstock
5164b1a539
Add comments to the PID controller code.
2021-05-30 13:36:25 -04:00
Avi Weinstock
8b20175b6e
Implement PID controllers and use them to stabilize Agent airship flight.
2021-05-30 13:36:25 -04:00
Adam Whitehurst
eea7eead2e
wip: impl Stats::attack_speed_modifier
2021-05-30 09:40:11 -07:00
Adam Whitehurst
e06bd0eaa3
feat: BuffKind::Frozen
2021-05-30 08:51:47 -07:00
Avi Weinstock
d38db15411
Fixed entities with voxel colliders being off by one physics tick for collision.
2021-05-28 20:25:57 -04:00
Avi Weinstock
3684cf0454
Fix economy data not properly being used to price trades, resulting in default prices being applied at most towns.
...
Also add an exporter from econsim results to sqlite to aid in debugging the economy (which revealed this bug).
2021-05-28 15:09:29 -04:00
Avi Weinstock
7a97fbb5cf
Add zoom scaling as well as FOV scaling to ChargedRanged, and restore the old zoom afterwards.
2021-05-26 09:34:08 -04:00
Avi Weinstock
4d7828ec94
Make the camera zoom as the bow (or any ChargedRanged attack) is charging.
2021-05-26 09:34:07 -04:00
Justin Shipsey
d7c7f6bf5d
Merge branch 'sam/rework-bow' into 'master'
...
Bow Rework
See merge request veloren/veloren!2310
2021-05-26 04:44:09 +00:00
Justin Shipsey
1074352ca4
Merge branch 'juliancoffee/dungeon_chests' into 'master'
...
dungeon chests
See merge request veloren/veloren!2342
2021-05-24 23:05:20 +00:00
juliancoffee
c618ec7222
fmt
2021-05-25 01:23:32 +03:00
juliancoffee
940655dcb6
Adding different chests for each dungeon
2021-05-24 23:00:44 +03:00
Marcel
80b8561317
Merge branch 'lboklin/wing-clip' into 'master'
...
Fix higher than intended drag for winged entities
See merge request veloren/veloren!2336
2021-05-24 11:42:12 +00:00
juliancoffee
e248e795a1
fixing tests
2021-05-24 00:06:03 +03:00
juliancoffee
d80a45a066
Fix species tests for random body_type and fmt
2021-05-23 22:59:48 +03:00
juliancoffee
457e5b14d8
Add tests for validation assets
2021-05-23 22:27:33 +03:00
juliancoffee
8c1643cad9
Switch to using EquipSlot key instead of String
2021-05-23 21:37:41 +03:00
juliancoffee
22b1880ae5
LoadoutBuilder efactoring
2021-05-23 20:29:19 +03:00
Sam
0961f00c7c
Updated comments in states code.
2021-05-23 11:41:09 -05:00
juliancoffee
00b182c183
Remove unused LoadoutConfig-s
2021-05-23 19:19:20 +03:00
juliancoffee
6656cfe010
Add directory hierarchy
2021-05-23 19:19:20 +03:00
juliancoffee
cbdb7dc1c1
add TODO about tests
2021-05-23 19:19:20 +03:00
juliancoffee
0722861364
Move loadout config handling to .ron files
2021-05-23 19:19:20 +03:00
juliancoffee
f0692c491b
Implement random choosing of item from loadout
2021-05-23 19:19:20 +03:00
juliancoffee
a8699cfa15
Add support for .ron loadouts
2021-05-23 19:19:20 +03:00
James Melkonian
419cd2a5e4
Don't modify position in glide character state
2021-05-23 07:26:11 +00:00
Ludvig Böklin
a2afb75c83
Birds don't have wings
2021-05-23 08:17:49 +02:00
hqurve
854930bc1a
Item pickups are shown in separate window and "inventory-full" messages are shown above the item attempted to be picked up
2021-05-22 20:47:08 +00:00
Sam
7828112486
Balance tweaks.
2021-05-22 15:00:05 -05:00
Sam
0592d14d04
Fix
2021-05-22 13:29:03 -05:00
Samuel Keiffer
9f1bb37b70
Merge branch 'lboklin/bird-drag' into 'master'
...
Adjusted masses; less excessive knockbacks; prevent loot shooting off
See merge request veloren/veloren!2307
2021-05-22 17:56:14 +00:00
Ludvig Böklin
46d1bb5f18
Adjusted masses; less excessive knockbacks; prevent loot shooting off
2021-05-22 17:56:13 +00:00
Samuel Keiffer
e543941073
Merge branch 'juliancoffee/boss_armour' into 'master'
...
Boss armor
See merge request veloren/veloren!2327
2021-05-22 17:42:27 +00:00
Sam
f993f28eff
Various tweaks.
2021-05-22 12:41:47 -05:00
juliancoffee
ca6266e780
Fix skill presets, add tests
2021-05-22 12:33:22 -05:00
Sam
1014ac45bf
Made new skills for reworked bow.
...
Created migration to reset bow skills.
2021-05-22 12:33:21 -05:00
Sam
3f16d15bbb
Reworked bow
2021-05-22 12:33:20 -05:00
Monty Marz
30bcc6aaa3
Ferocious armour for t5-dungeon minibosses
2021-05-22 10:55:36 +00:00
juliancoffee
7dc50891d2
Add placeholders for bosses armour
2021-05-22 00:20:56 +03:00
juliancoffee
312a01122a
Add tests to loadout builder
2021-05-21 23:36:09 +03:00
Samuel Keiffer
a0599ac046
Merge branch 'sam/extra-equip-slots' into 'master'
...
Added Extra Loadout Slots
See merge request veloren/veloren!2295
2021-05-21 20:28:53 +00:00
Marcel
99304ffddd
Revert "Merge branch 'sharp/revert-quinn' into 'master'"
...
This reverts merge request !2315
2021-05-21 10:41:16 +02:00
Ludvig Böklin
270f89db6b
Disable glider input until keys are pressed again after deploy
2021-05-20 12:13:59 +02:00
Sam
3a004d9d4c
Removed commented code
2021-05-17 16:48:56 -05:00
Joshua Yanovski
3679cb75bc
Revert "Merge branch 'xMAC94x/quic_enablement' into 'master'"
...
This reverts commit 04d8ddf25e
, reversing
changes made to 9dcf7a9d26
.
2021-05-17 08:32:12 -07:00
Marcel
04d8ddf25e
Merge branch 'xMAC94x/quic_enablement' into 'master'
...
Add a configuration Option to opt-in Quic backend
See merge request veloren/veloren!2268
2021-05-17 12:02:55 +00:00
Sam
93b5e674f6
Fixed comments and some functionality.
2021-05-16 21:35:17 -05:00
Ben Wallis
fcf4ab7619
main/offhand weapon swap check refactor
2021-05-16 21:07:36 -05:00
Sam
ad0c247838
Removed special case for equipping a weapon that is no longer needed.
2021-05-15 15:16:39 -05:00
Sam
5cc6168553
Unequipping a mainhand weapon now moves offhand weapon into mainhand.
2021-05-15 15:16:39 -05:00
Sam
19926a2322
Swapping weapon sets is now functional. (Though very hacky?)
2021-05-15 15:16:39 -05:00
Sam
23cc3d671b
Now allows weapons to be swapped between the mainhand and offhand slot. (Probably hacky?)
2021-05-15 15:16:38 -05:00
Sam
6b153bcf47
Enforced certain invariants in how an item was equipped into the loadout:
...
- a 2h weapon can only be equipped in a mainhand slot if the offhand slot is empty
- a 1h weapon can only be equipped in an offhand slot if the mainhand slot has a 1h weapon
- 2h weapons can never be equipped in an offhand slot
Fixed some tests
2021-05-15 15:16:38 -05:00
Sam
9173dca03f
Added equip slots for other weapons.
2021-05-15 15:16:37 -05:00
holychowders
d5f3ba77d4
Make NPCs Aware of Sound - See Issue #913
2021-05-15 19:36:27 +00:00
Marcel
7d5ca0e7bf
Revert "Merge branch 'snowram/hacky-mount' into 'master'"
...
This reverts merge request !2219
2021-05-14 13:43:20 +00:00
Snowram
8745fb803a
Use Body to determine mountee offsets
2021-05-14 00:11:54 +02:00
Snowram
b063ec5a8f
Clean unused mount offset
2021-05-14 00:11:46 +02:00
Snowram
486fbf940e
Anims export a transform for mounts
2021-05-14 00:11:37 +02:00
Snowram
026ba616ff
Expose the mounting bone to the mounter anims
2021-05-14 00:11:28 +02:00
Snowram
e4f3064b8a
Collar can make QuadMeds mountable, state + offsets
2021-05-14 00:11:15 +02:00
James Melkonian
4d4bc132f4
Campfires can set things on fire and water puts it out
2021-05-13 05:34:51 +00:00
Marcel
607f8b289b
Merge branch 'alphyr/guess_image_format' into 'master'
...
Guess image format from file extension
See merge request veloren/veloren!2260
2021-05-12 18:41:22 +00:00
Joshua Yanovski
3869cdf1d2
Don't remesh chunk vertex data on sprite update.
...
This results in an extremely visually noticeable improvement in latency
when adding or removing sprite data and makes the game feel more
responsive.
This happens, for instance, when picking up a sprite like an apple or
flower from the environment. We check to make sure that for items
with lighting (like Velorite) or changes that otherwise affect meshing
(like changing from fluid to nonfluid) this doesn't trigger.
2021-05-11 12:58:15 -07:00
James Melkonian
f76b61ac17
Make merchants /tell instead of /say
2021-05-11 17:26:22 +00:00
Sam
7f6c6c5603
Fixed offsets for laser and rocket attacks of clay golem.
2021-05-10 18:54:04 -05:00
Sam
0d53e790fd
Made golem laser spawn based off of orientation rather than look_dir. Additional balance tweaks.
2021-05-10 18:54:00 -05:00
Sam
fca56be4c0
Balance tweaks
2021-05-10 18:53:52 -05:00
Sam
d14fd59711
Increased exp of clay golems.
2021-05-10 18:53:51 -05:00
Sam
9bbdc26089
Added haniwa sentries to level 3 dungeons.
2021-05-10 18:53:50 -05:00
Snowram
47a2bf7de8
Adds haniwa sentry object
2021-05-10 18:53:48 -05:00
Sam
c67c56d194
Dungeon placement. Tweaks to melee.
2021-05-10 18:53:47 -05:00
Sam
9f8aeb91c0
Added armor, more ai tweaks.
2021-05-10 18:53:46 -05:00
Sam
1c8db241e2
Golem AI
2021-05-10 18:53:43 -05:00
Sam
5fa4358e74
Clay golem attacks done.
2021-05-10 18:53:01 -05:00
Marcel Märtens
2ea5fd876b
cleanup error codes
2021-05-10 12:59:44 +02:00
Joshua Yanovski
0cf0f59fa7
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
e7587c4d9d
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
a86c3af42b
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
6c9a2663ba
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
1ae105125d
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
1dfcdce1c0
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
d3be89f5eb
Add species to /spawn auto-complete
2021-05-09 20:43:13 +03:00
Benoît du Garreau
2718fdb1ca
Only load images as PNG
2021-05-09 19:02:48 +02:00
juliancoffee
3d011098b8
style convention
2021-05-09 19:05:01 +03:00
juliancoffee
2035c041f9
add authors
2021-05-09 13:12:26 +03:00
juliancoffee
359a46d6f2
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
9af0b6dd12
Search for assets in workspace root
2021-05-09 13:12:26 +03:00
juliancoffee
735e8ab4ec
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
2ea69a6180
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
1c22a2b3fd
/skill_preset command
2021-05-08 15:47:09 +00:00
Avi Weinstock
7ec7540be4
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
a5b7e34bf8
Fix #1105 : Move server event so it does not emit constantly during build up
2021-05-07 15:40:11 -07:00
Adam Strauss
3d17fde537
Implement #1105 : Rolling removes burning debuff
2021-05-07 15:38:41 -07:00
Snowram
831bfd0be9
Snowram/craft mats
2021-05-07 17:03:45 +00:00
Samuel Keiffer
a2999ce96f
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
e4cda4309e
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
346eb48a27
Move weapon tactics to functions and take target body into attack radius consideration
2021-05-06 21:17:05 +00:00
Benoît du Garreau
77b086c242
Guess image format from file extension
2021-05-06 17:49:25 +02:00
Marcel
91f76d3b00
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
8196fd8b35
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
efed14ccf9
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
dc7e45c8bd
Rebalancing
2021-05-05 14:43:56 -04:00
Daniel Mizerski
b34704ea3f
(Wiring) OnDeath
2021-05-05 19:08:18 +02:00
Marcel Märtens
4cfdbdd069
use a constant for recommended_threads
2021-05-05 14:35:06 +02:00
Marcel Märtens
0142cf37f0
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
6e3a74b476
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
fb940ad27a
Merge branch 'sam/minotaur' into 'master'
...
Overhauled Minotaur
See merge request veloren/veloren!2193
2021-05-04 16:26:08 +00:00
Imbris
217502d516
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
f1681f465f
(Wiring) Change Sticky to be handled by physics (but with disabled force on it)
2021-05-04 17:33:42 +02:00
Sam
062c290e49
Made buff commands exhaustive
2021-05-04 09:54:28 -04:00
Sam
2652660a58
Addressed comments and more testing feedback.
2021-05-04 08:45:14 -04:00
Sam
240a8e577d
Minor balancing tweaks.
2021-05-04 08:45:13 -04:00
Sam
5c241850f1
Added sfx. Addressed comments.
2021-05-04 08:45:12 -04:00
Sam
48fa4e7c1f
Balancing.
2021-05-04 08:45:11 -04:00
Sam
7ac1488181
Added kit for testing tier 4 dungeons.
2021-05-04 08:45:11 -04:00
Sam
164fd0de04
Particles for frenzy buff and ground cleave.
2021-05-04 08:45:10 -04:00
Sam
2290a22a15
Gave minotaur AI.
2021-05-04 08:45:09 -04:00
Sam
811f1fadb2
Replaced action_timer with action_state so there are additional fields.
2021-05-04 08:45:09 -04:00
jshipsey
c886accaf1
anims
2021-05-04 08:45:08 -04:00
Sam
d1139c3b7c
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
160bd3ef0c
Crippling strike now functional. Crippled debuff added.
2021-05-04 08:45:05 -04:00
juliancoffee
b81981f805
Draft implementation
2021-05-03 22:07:09 +03:00
Samuel Keiffer
771a8db2a8
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
610c529c42
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
efa4f9fe0a
Experiment with const fn
lanczos lookup tables, enable weighted average interpolation for now.
2021-05-03 00:09:44 -04:00
Avi Weinstock
be39054767
Make terrain compression a checkbox instead of a bandwidth (throughput?) heuristic.
2021-05-03 00:09:44 -04:00
Avi Weinstock
b15913560b
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
Avi Weinstock
c199d12f2d
Address MR 2207 review comments.
...
- Add metrics for which branch of the compression heuristic was taken.
- Reduce the threshold for the heuristic.
- Deduplicate code for dealing with lazy messages.
- Make jpeg dependency only scoped to the compression benchmark.
- Remove commented code.
2021-05-03 00:09:24 -04:00
Avi Weinstock
30cae40b82
Add a bandwidth-based heuristic for chunk compression.
2021-05-03 00:09:24 -04:00
Avi Weinstock
cdc2eccda8
Improve quadpng
by adding WidePacking
, which makes a wider image, which is faster due to PNG compressing by row. Heuristically switch between quadpng and deflate based on chunk height to reduce variance.
2021-05-03 00:09:24 -04:00
Avi Weinstock
dffc7db8f5
Add matplotlib
graph generation to the compression benchmarks.
2021-05-03 00:09:24 -04:00
Avi Weinstock
0f4315c98b
Remove a use of inline_tweak and use TallPacking
instead of GridLtrPacking
in common_net::msg::server
.
2021-05-03 00:09:24 -04:00
Mckol
c913b9b858
Added Lanczos interpolation for QuadPng
...
Should support arbitrary scales (N).
Does support arbitrary Lanczos a parameters (currently 2)
and sample sizes (currently 5x5).
2021-05-03 00:09:24 -04:00
Avi Weinstock
fe0f331a19
Add 5x5 manhattan blur effect to quadpng, and omit interpolation at chunk borders.
2021-05-03 00:09:24 -04:00
Avi Weinstock
c2fd5e807d
Experiment with 256-color palette "tripng" encoding, and Lanczos interpolation for "quadpng".
2021-05-03 00:09:24 -04:00
Avi Weinstock
a220cc569e
Add resolution downscaling to QuadPng's color channel, and use half-resolution QuadPng ingame.
2021-05-03 00:09:24 -04:00
Avi Weinstock
f81539cb00
Get PngPngPngJpeg terrain working in the actual game.
2021-05-03 00:09:24 -04:00
Avi Weinstock
a9a943c19a
Move compression helpers to common_net::msg::compression
and experiment with more image formats at more site kinds.
2021-05-03 00:09:24 -04:00
jshipsey
63fdc4f590
animal adjustments
2021-05-02 23:17:58 -04:00
James Melkonian
f553700e8c
Add map markers for lakes and mountains
2021-05-03 02:00:23 +00:00
Daniel Mizerski
7faa0d3cd9
Add fundamentals for wiring system.
2021-05-02 22:38:44 +02:00
jshipsey
769e21104e
higher health lower damage
2021-05-01 12:29:28 -04:00
jshipsey
dc5a38f1e8
ori addition to combomelee
2021-05-01 12:29:28 -04:00
Ludvig Böklin
d7ef414f59
Fix glider pitching down when trying to take off
2021-05-01 15:35:26 +02:00
Sam
d500a00414
Made naming of fields more explicit.
2021-05-01 09:25:56 -04:00
Sam
708cb12086
Fixed tests.
2021-05-01 09:25:55 -04:00
Sam
d3d4ee8bb0
Formatting stuffs.
2021-05-01 09:25:53 -04:00
Sam
3cb0ee98c8
Removed all unique and simple tool kinds.
2021-05-01 09:25:51 -04:00
Sam
a35b8b4aad
Removed ability set as field on items.
2021-05-01 09:25:49 -04:00
Ludvig Böklin
cc7f0f3ac2
Fix ori
2021-04-30 17:37:51 +02:00
DaforLynx
7334cce426
Poise (stun) SFX and fix for town music
2021-04-29 23:36:22 +00:00
Samuel Keiffer
e177aebd9e
Merge branch 'lboklin/lower-zero-lift-drag' into 'master'
...
Lower zero-lift drag
See merge request veloren/veloren!2223
2021-04-29 19:11:12 +00:00
Justin Shipsey
baf749c03e
Merge branch 'lboklin/object-masses' into 'master'
...
Define more accurate masses for objects
See merge request veloren/veloren!2220
2021-04-29 19:04:48 +00:00
Ludvig Böklin
c4444a908a
Lower zero-lift drag
2021-04-29 19:22:09 +02:00
Synis
4e4818ca9e
Query spatial grid for beam and aura system
...
fmt
2021-04-29 14:23:02 +02:00
Ludvig Böklin
6b52ea89b4
Add more specific masses to objects
2021-04-29 11:46:03 +02:00
Ben Wallis
b0aca9a348
Merge branch 'xvar/item-serialization' into 'master'
...
Changed Item serialization to not send ItemDef struct across the network
See merge request veloren/veloren!2215
2021-04-28 20:50:32 +00:00
Ben Wallis
14caae3667
Changed Item serialization to only send item_definition_id across the network rather than the whole ItemDef
2021-04-28 21:00:25 +01:00
DaforLynx
2e0272ce28
Town music
2021-04-28 05:07:59 +00:00
Ludvig Böklin
34660462e9
Glider physics
2021-04-27 14:41:48 +00:00
jshipsey
f845f2bd11
fix glide wield
2021-04-26 23:17:04 -04:00
Sam
1a7779beb3
Added angle check for new npcs.
2021-04-25 22:19:30 -04:00
jshipsey
a0a75b1921
comments
2021-04-25 22:02:32 -04:00
jshipsey
2c74a86170
skill adjustments, ori changes
2021-04-25 22:02:32 -04:00
jshipsey
c01fd86f44
ori fixes
2021-04-25 22:02:30 -04:00
Joshua Barretto
c6d1963f10
Merge branch 'zesterer/small-fixes' into 'master'
...
Small fixes
See merge request veloren/veloren!2201
2021-04-25 23:03:23 +00:00
Joshua Barretto
94b6fa6da3
Don't use movement efficiency for orientation
2021-04-25 23:00:30 +01:00
Joshua Barretto
3af4793762
Minor control over velocity when in the air
2021-04-25 22:37:25 +01:00
Marcel
35584d0344
Merge branch 'xMAC94x/reduce_deps' into 'master'
...
remove some unused deps Yuri found
See merge request veloren/veloren!2197
2021-04-25 20:22:31 +00:00
Marcel Märtens
1842b2d6eb
remove some unused deps Yuri found
2021-04-25 20:18:20 +02:00
Sam
6848851dc3
Cleaned up tweaks in ui and allowed sfx choosing to scale to amount of sfx variants provided.
2021-04-25 13:09:10 -04:00
Sam
372eff2a02
Initial SCT implementation to display blocks.
2021-04-25 13:09:09 -04:00
Sam
d2d8d43410
Addressed testing feedback.
...
Particles better.
2021-04-25 13:09:08 -04:00
Sam
b9d6bd2fd2
Parrying no longer requires releasing the block button, and instead can parry if block happened in buildup.
2021-04-25 13:09:07 -04:00
Sam
288a6f3a82
Blocking now works if no weapon is equipped in main hand.
...
Added temp sfx for blocking and parrying.
Added temp particles for successful parry.
Tweaked values of default block ability.
2021-04-25 13:09:02 -04:00
Sam
f5ec23df48
Parrying
2021-04-25 13:08:42 -04:00
Sam
91c6288213
Melee weapons can now block.
2021-04-25 13:08:42 -04:00
Sam
0170a38ebc
Removed unwraps in buffs
2021-04-25 12:01:21 -04:00
Snowram
c16ec43938
Body specific beam offsets
2021-04-25 04:07:12 +02:00
Snowram
8f54a0bf31
More phoenix AI work
...
More phoenix AI work
2021-04-25 04:07:12 +02:00
Snowram
8cf8e51962
Phoenix npc + AI (WIP)
2021-04-25 04:07:11 +02:00
Snowram
ab26efa970
Improves bird_large anims
2021-04-25 04:07:09 +02:00
Snowram
bd84677906
Day period dependant wildlife spawns
2021-04-25 02:14:51 +02:00
Snowram
fd177c9669
Breathe and stun anims
2021-04-25 02:14:50 +02:00
Snowram
eb98360183
Cockatrice bird_large conversion
2021-04-25 02:14:50 +02:00
Snowram
bc95484863
Swaps bird_small skeleton to a new bird_large
2021-04-25 02:14:49 +02:00
Ada Lovegirls
01c30868eb
Add option to load English string as fallback if string missing
2021-04-24 14:39:35 +00:00
Ygor Souza
71b8426592
Add basic distance check to shockwave hit test
...
Before checking if the entity hitbox intersects the shockwave shell, we
do a basic check that the entity is close enough to be hit, considering
its radius.
This fixes the unlimited vertical range problem, since the distance is
measured in 3D.
2021-04-24 03:09:45 +02:00
Ygor Souza
e59f1e8d28
Skip physics pass for arrows stuck on surfaces
...
This keeps the arrow velocity from changing, which is what was causing
the ProjectileHit outcome to be pushed multiple times for the same
arrow, since the outcome checks if the arrow velocity is above a given
threshold.
2021-04-22 23:03:04 +02:00
Marcel
e14f8b9745
Merge branch 'aweinstock/deflate-terrain' into 'master'
...
Compress terrain chunks with deflate. Includes a benchmark showing that this...
See merge request veloren/veloren!2166
2021-04-22 17:12:53 +00:00
Monty Marz
b69eb61e7b
Add handles to lanterns, fix cooking pot scale
2021-04-22 17:12:07 +00:00
jshipsey
9d82b20891
remove 0.8, add snow's mixed_vel idea for other bodies
2021-04-22 00:04:39 -04:00
Dominik Broński
1d25016459
Merge branch 'lboklin/arrow-turret-drag-fix' into 'master'
...
Fix ArrowTurret drag coefficient
See merge request veloren/veloren!2175
2021-04-21 20:17:44 +00:00
Imbris
51c0f8733c
Quick physics perf fix
2021-04-21 14:03:23 -04:00
Imbris
1af4a04231
Revert "Merge branch 'revert-b10718c5' into 'master'"
...
This reverts merge request !2172
2021-04-21 17:10:13 +00:00
Joshua Barretto
880236f223
Merge branch 'zesterer/lanterns' into 'master'
...
Made characters carry lanterns higher when possible
See merge request veloren/veloren!2169
2021-04-21 16:40:20 +00:00
Ludvig Böklin
37713cb4ad
Fix ArrowTurret drag coefficient
2021-04-21 18:26:23 +02:00
Imbris
68539a751b
Merge branch 'revert-b10718c5' into 'master'
...
Revert "Merge branch 'imbris/agent-opt' into 'master'"
See merge request veloren/veloren!2172
2021-04-21 15:06:35 +00:00
Imbris
699a5493ec
Merge branch 'lboklin/simplify-buoyancy' into 'master'
...
Simplify buoyancy for performance reasons
See merge request veloren/veloren!2171
2021-04-21 15:06:31 +00:00
Joshua Barretto
ed7cc12213
Made characters carry lanterns higher when possible
2021-04-21 15:59:29 +01:00
Ludvig Böklin
a1744182b3
Simplify buoyancy for performance reasons
2021-04-21 16:19:02 +02:00
Ludvig Böklin
6e364665cb
Prevent drag forces from causing something to come to a complete stop
2021-04-21 16:13:51 +02:00
Imbris
fd672980c4
Revert "Merge branch 'imbris/agent-opt' into 'master'"
...
This reverts merge request !2024
2021-04-21 14:10:06 +00:00
Avi Weinstock
308ad4d81e
Cleanup errors introduced in rebase.
2021-04-20 23:34:17 -04:00
Avi Weinstock
15e32e5655
Move terrain compression code to common_net and disable redundant LZ4 compression on the terrain stream.
2021-04-20 23:24:24 -04:00
Avi Weinstock
6d9de520f3
Compress terrain chunks with deflate. Includes a benchmark showing that this makes them around 70% smaller, and is the same speed as LZ4.
2021-04-20 23:23:53 -04:00
Imbris
76ff00757f
Appease clippy, add CHANGELOG entry
2021-04-20 15:29:20 -04:00
Imbris
e17477979f
Remove extra chunk cloning and parallelize serialization in the server terrain sys
2021-04-20 15:25:05 -04:00
Imbris
e750c9d570
Switch agent target search to use a spatial grid, add convience method for querying the aabr of a circle
2021-04-20 15:25:04 -04:00
Imbris
a76fdbc325
Expose CachedSpatialGrid resource that is updated by the physics system, move BuildAreas into its own module, removed unused ExecMode
2021-04-20 15:25:04 -04:00
Imbris
26222a0a2d
Rename common-sys to common-systems and rearrange common-state slightly
2021-04-20 15:25:04 -04:00
Ludvig Böklin
762c68cfbb
Basic fluid dynamics and physical properties for entities
2021-04-20 17:38:19 +02:00
Joshua Barretto
bcf9a8089f
Merge branch 'better-crafting' into 'master'
...
Crafting station sprites in towns
See merge request veloren/veloren!2160
2021-04-20 15:08:36 +00:00
Joshua Barretto
68004bc39c
Made cooking pots glow
2021-04-20 15:39:46 +01:00
Joshua Barretto
a19212daf7
Fix block-snapping at low framerates
2021-04-20 14:59:59 +01:00
Joshua Barretto
9ff7db9b1c
Account for FP imprecision in block-hopping
2021-04-20 14:54:21 +01:00
Joshua Barretto
36e95e0c03
Cleaned up client-side recipe handling
2021-04-20 12:33:22 +01:00
Monty
86445af09c
change cauldron spawning
...
cooking pot height
fmt
fmt, changelog
2021-04-20 02:48:13 +02:00
Monty
a4d56e7843
more sprite stuff and crafting UI update
...
fix item images
fix CR display
2021-04-20 02:46:06 +02:00
Monty
a1fe7c12c3
fmt, add sprites
2021-04-20 02:46:04 +02:00
Joshua Barretto
5598d07944
Added crafting stations
2021-04-20 02:45:59 +02:00
Marcel Märtens
7348e399e0
only have 1 Fn passed to tick fn
2021-04-20 01:49:45 +02:00
Marcel Märtens
485a477503
include origin into system name
2021-04-20 01:30:27 +02:00
Marcel Märtens
425063e24e
remove authc from common::net
2021-04-20 01:30:23 +02:00
Marcel Märtens
5862920f32
seperate sys/state
2021-04-20 01:30:17 +02:00
Joshua Barretto
4ad5257e40
Rebalanced mist
2021-04-19 22:26:56 +01:00
Joshua Barretto
ed20a66b20
Fixed block-snapping
2021-04-19 21:46:51 +01:00
Joshua Barretto
b700d9a641
Merge branch 'zesterer/econ-tweaks' into 'master'
...
Limit trading currency to sane amounts
See merge request veloren/veloren!2154
2021-04-19 10:46:17 +00:00
Joshua Barretto
324148d9a3
Limit trading currency to sane amounts
2021-04-19 10:04:28 +01:00
Sam
ce7581037c
Overhauled dash melee.
2021-04-18 18:36:12 -04:00
Joshua Barretto
cb817c0313
Merge branch 'zesterer/econ-tweaks' into 'master'
...
Rebalanced economy somewhat
See merge request veloren/veloren!2148
2021-04-18 21:20:49 +00:00
Samuel Keiffer
60d38cc03b
Merge branch 'aweinstock/dodgesplosion' into 'master'
...
Unlock dodge roll iframes and staff explosion by default.
See merge request veloren/veloren!2146
2021-04-18 20:46:15 +00:00
Avi Weinstock
0404250300
Unlock dodge roll iframes and staff explosion by default.
2021-04-18 16:16:06 -04:00
Joshua Barretto
352fce239e
Allow trading items not sold by merchants
2021-04-18 20:07:00 +01:00
Joshua Barretto
cac9ac6807
Trading stock limits
2021-04-18 18:58:26 +01:00
Samuel Keiffer
1892ec571d
Merge branch 'sam/permanent-spawn-safezone' into 'master'
...
Safezone is now permanently in existence at spawn.
See merge request veloren/veloren!2144
2021-04-17 23:44:10 +00:00
Sam
416fe5c2af
Safezone is now permanently in existence at spawn.
2021-04-17 17:33:54 -04:00
Ben Wallis
0e83de205b
Changed plugin load errors to debug and reworded plugin init/load error messages
2021-04-17 22:04:14 +01:00
Ben Wallis
a4cdb89987
Implemented inventory sorting
2021-04-17 22:04:08 +01:00
Avi Weinstock
af47c0dc21
Added /server_physics
admin command.
2021-04-17 13:44:22 -04:00
Samuel Keiffer
c962c5f12e
Merge branch 'gGmMsS/Burning' into 'master'
...
Added burning debuff for Staff M2
See merge request veloren/veloren!2134
2021-04-15 23:51:33 +00:00
Imbris
85ee4c8cd1
Merge branch 'aweinstock/server-authoritative-physics' into 'master'
...
Aweinstock/server authoritative physics
See merge request veloren/veloren!2126
2021-04-15 22:24:00 +00:00
gGmMsS123
d5a887f195
m2 staff
2021-04-16 00:48:20 +03:00
gGmMsS123
e33961e1fa
M2 Staff Final Touch
2021-04-16 00:34:24 +03:00