Jonathan Berglin
596307c9b7
Remove unused clippy suppressions
2021-12-05 17:59:02 +00:00
Marcel Märtens
086f9737e4
move server.voxel for airship to common
2021-11-15 16:39:39 +01:00
Ben Wallis
022c1417b6
EXP on kill is now shared between damage contributors. A "damage contributor" is either an individual entity, or a group - depending if the attacker is in a group. This means that not only does the "killing blow" no longer get 100% of EXP, but multiple groups and individuals all receive their fair share of EXP on death (assuming they are still within range of the entity when it dies).
...
Damage from a given individual or group only counts towards a kill for 10 minutes since that individual or group's last damage to the entity - after this period their damage contribution is removed. This avoids the list of damage contributors growing excessively large for an entity that does a lot of combat but never dies.
EXP sharing within groups is unchanged - the difference is simply that the input to this calculation may be less than 100% of the base EXP reward for the kill if other individuals or groups contributed damage.
2021-11-13 20:46:45 +00:00
Joshua Barretto
c0bf9503bd
Addressed review issues, added cloning docs to BodySpec::Manifests
2021-11-13 17:20:23 +00:00
Joshua Barretto
657ac45288
Updated changelog
2021-11-13 17:13:09 +00:00
Joshua Barretto
46ec4203a2
Arbitrary volume airships
2021-11-13 17:13:08 +00:00
jshipsey
c2b7d3bb44
good hat rendering
2021-10-30 23:42:16 -04:00
jshipsey
a05c1ea4c5
switch to new matcell variant
2021-10-30 23:42:15 -04:00
jshipsey
3915aa7aac
support for hollow voxels ty zesterer
2021-10-30 23:42:14 -04:00
jshipsey
5cc54b34bd
headbands
2021-10-30 23:42:13 -04:00
Bryant Deters
b2bd43f4d3
Sneak with weapons drawn
2021-10-18 14:53:55 -05:00
Snowram
3c2de422db
Adds Xtilt to BirdLarge skeleton
2021-09-21 15:31:46 +02:00
jshipsey
1ad107f4a7
animation tweaks
2021-09-21 15:30:43 +02:00
Imbris
a77f981b15
Disable visuals that block seeing camera clipping since they cause flickering, raise max zoom cap with camera, fix overflow issue
2021-09-10 12:16:55 -04:00
jshipsey
523a15e5cc
more spots
2021-09-04 00:18:58 -04:00
Sam
44c3b0f153
Added attack hook event, attacks now cancel item use and sprite interaction.
2021-08-31 13:37:32 -04:00
Sam
513982ca43
Fixed compile error when importing sprite position.
2021-08-31 13:36:05 -04:00
jshipsey
3ddcde645f
anim basics
2021-08-31 13:36:04 -04:00
Samuel Keiffer
d5feca45c5
Merge branch 'pacmanmati/veloren-pacmanmati/1224-consolidate-redundant-stage-sections' into 'master'
...
Consolidate redundant stage sections
See merge request veloren/veloren!2748
2021-08-10 01:23:26 +00:00
Sam
52ee598cf1
Consolidated Use into Action as well.
2021-08-09 10:31:17 -04:00
pacmanmati
5f37509a78
#1224 - Replace redundant StageSection: Swing, Shoot, Cast with Action
2021-08-09 10:27:53 -04:00
Ludvig Böklin
ebf489984c
Improve gliding
...
- make glider dimensions a factor of body height
- increase glider dimensions across the board
- remove delay from transition into glide
- enable glider control while wielding glider
- improve glide wield animation
2021-08-09 10:06:16 +01:00
Imbris
6cabd74871
Make bloom optional with a config option that is not exposed in the UI (to give artists time to refine bloom before exposing the option)
2021-08-01 18:50:38 -04:00
Imbris
b984bf006f
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--match_single_binding)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::match_single_binding)]' error supressions
See merge request veloren/veloren!2674
2021-07-25 17:24:22 +00:00
Joshua Barretto
37077b5703
Merge branch 'Resolve-unused-clippy-supressions' into 'master'
...
Resolve unused clippy supressions
See merge request veloren/veloren!2673
2021-07-24 20:44:06 +00:00
Dr. Dystopia
c79975dc5d
Resolve all '#[allow(clippy::match_single_binding)]' error supressions
2021-07-24 22:11:50 +02:00
Dr. Dystopia
70d0840e96
Resolve unused '#[allow(clippy::unnecessary_wraps)]' error supressions
2021-07-24 20:14:26 +02:00
Joshua Barretto
6dfa233cc4
Fixed bad non-humanoid lantern offset
2021-07-24 15:05:36 +01:00
Imbris
3e6fd0ee1d
Setup animation mount points for quadruped medium, update offsets in
...
common for new quadruped mediums, properly transform the offset in the
mount system using ori, fix issue with composing in the base ori with
the mounting bone ori in voxygen.
2021-07-18 15:09:36 -04:00
Imbris
6a15501b27
Add Body as a parameter to compute_matrices and start to pull whole body scaling out of the animation files
2021-07-18 15:09:34 -04:00
Imbris
b2bf83e200
Rework mounting animation so that full hierarchies of animation transforms can be applied to the mounter, factor out some common code in figure/mod.rs
2021-07-18 15:04:02 -04:00
Snowram
09cbb90f61
Make the mounter animations dependant of the mountee animation
2021-07-18 15:03:57 -04:00
Imbris
ec342a2338
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--redundant_pattern_matching)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::redundant_pattern_matching)]' error supressions
See merge request veloren/veloren!2622
2021-07-18 12:26:44 +00:00
Dr. Dystopia
9c6cdbba71
Resolve all '#[allow(clippy::redundant_pattern_matching)]' error supressions
2021-07-17 17:12:29 +02:00
Avi Weinstock
13fc4de561
Add per-species head offsets.
2021-07-16 19:22:28 -04:00
Avi Weinstock
0a33c98268
Basic implementation of hat visuals.
2021-07-16 18:49:40 -04:00
Samuel Keiffer
f38cde9d40
Merge branch 'knightresspaladin/healing-aura' into 'master'
...
Knightresspaladin/healing aura
See merge request veloren/veloren!2587
2021-07-16 21:32:03 +00:00
Dr. Dystopia
5cc2fc8182
Resolve all '#[allow(clippy::or_fun_call))]' error supressions
2021-07-15 13:49:59 +02:00
Marcel Märtens
db8aedd363
fmt after applying clippy fixes after toolchain update
2021-07-12 12:09:27 +02:00
Marcel Märtens
9b3b21f368
fix clippy warnings
2021-07-12 12:09:09 +02:00
Knightress Paladin
146f86be2c
Removed references to Healing Beam, which Healing Aura is replacing
2021-07-10 21:39:11 -07:00
Samuel Keiffer
0151e5aeed
Merge branch 'potion-animations' into 'master'
...
Consumable Animations
See merge request veloren/veloren!2512
2021-06-29 16:36:41 +00:00
Sam
4cdf081a40
Removed potential for accessing OOB index and panicking in animations for combo melee.
...
Made only entities with a character state component emit a death outcome on death.
2021-06-29 06:20:26 -05:00
jshipsey
37c6fe9ee8
anims
2021-06-29 05:59:02 -05:00
Snowram
47cc040301
Adds SpriteSummon animation
2021-06-23 22:38:16 -05:00
Sam
763461ebef
Ensnaring vines now ensnare you.
2021-06-23 22:38:16 -05:00
Joshua Barretto
288f2c13d4
Enable strafing in first-person mode
2021-06-21 13:27:19 +01:00
Avi Weinstock
cb0566299a
Make tornado (and empty models in general) work on WGPU.
2021-06-15 09:49:13 +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
864f230a3c
Yeti combat anims
2021-06-06 00:17:23 +02:00
jshipsey
ca43a0058a
some animation
2021-06-03 21:39:17 -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
Imbris
8403e4c483
address/remove TODOs, fix comment typos, enable wgpu/trace feature by default (So no recompile is needed to collect an API trace)
2021-06-03 00:10:06 -04:00
Imbris
2da58029b9
Make models require a non-zero amount of vertices
2021-06-03 00:10:06 -04:00
Imbris
93ad05d237
Fix most of the cargo check warnings
2021-06-03 00:10:05 -04:00
Imbris
c532f50e64
Remove wgpu patch/update wgpu, rebase fixes, remove use of deprecated
...
vek functions for left, right, up, down, forward_rh, forward_lh
2021-06-02 23:59:49 -04:00
Imbris
fce14fbaa9
Avoid extra set_pipeline calls
2021-06-02 23:59:48 -04:00
Capucho
23f1144fe2
Fix the shadow drawing code
...
Very poorly optimized
2021-06-02 23:59:48 -04:00
Capucho
c22dc6697c
Reenable non-player figure drawing
2021-06-02 23:59:48 -04:00
Capucho
1083d04c73
Reenable terrain rendering
...
Refractor col lights
2021-06-02 23:59:48 -04:00
Capucho
0db2a35955
Fix the orientation of the rendering
...
Reenable the rendering of the player
2021-06-02 23:59:47 -04:00
Capucho
1668e834f8
Renable the figure and terrain drawing code (not working yet)
2021-06-02 23:59:47 -04:00
Imbris
124d69d7ad
Render Ui
2021-06-02 23:59:45 -04:00
Imbris
fd0c4c166a
migrate cloud pipeline, migrate iced renderer, rebase fixes
2021-06-02 23:56:43 -04:00
Imbris
d9c523ba0d
Make compile through various changes, update wgpu to latest git
2021-06-02 23:56:43 -04:00
Capucho
8c3995298b
More fixes
2021-06-02 23:56:43 -04:00
Capucho
8c6e43572f
Switched from zerocopy to bytemuck
...
Fixing errors
2021-06-02 23:56:40 -04:00
Avi Weinstock
5aa98d18e3
Depend on crossbeam-utils and crossbeam-channel instead of crossbeam in voxygen.
2021-06-02 00:39:58 -04:00
Sam
3f16d15bbb
Reworked bow
2021-05-22 12:33:20 -05:00
Sam
9173dca03f
Added equip slots for other weapons.
2021-05-15 15:16:37 -05: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
jshipsey
770d07ac90
anims
2021-05-10 18:54:03 -05:00
Sam
5fa4358e74
Clay golem attacks done.
2021-05-10 18:53:01 -05:00
jshipsey
c886accaf1
anims
2021-05-04 08:45:08 -04:00
Sam
d500a00414
Made naming of fields more explicit.
2021-05-01 09:25:56 -04:00
Sam
914d78b4a9
Removed clone in animations. Added GATs to animations to do so.
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
Ludvig Böklin
34660462e9
Glider physics
2021-04-27 14:41:48 +00:00
jshipsey
fad31bd7ab
anim
2021-04-25 13:08:43 -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
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
0f6b902924
Idle, run, vel/ori aware fly anims
2021-04-25 02:14:49 +02:00
Snowram
bc95484863
Swaps bird_small skeleton to a new bird_large
2021-04-25 02:14:49 +02:00
Monty Marz
b69eb61e7b
Add handles to lanterns, fix cooking pot scale
2021-04-22 17:12:07 +00:00
jshipsey
2f523f5aa0
formatting
2021-04-22 00:04:39 -04:00
jshipsey
0962fe72f2
fix for 1h on back
2021-04-22 00:04:39 -04:00
jshipsey
9d82b20891
remove 0.8, add snow's mixed_vel idea for other bodies
2021-04-22 00:04:39 -04:00
Joshua Barretto
81ba200e48
Improve dynamic light reflection for hill climbing
2021-04-21 17:10:53 +01:00
Joshua Barretto
ed7cc12213
Made characters carry lanterns higher when possible
2021-04-21 15:59:29 +01:00
Ludvig Böklin
762c68cfbb
Basic fluid dynamics and physical properties for entities
2021-04-20 17:38:19 +02:00
Marcel Märtens
5862920f32
seperate sys/state
2021-04-20 01:30:17 +02:00
Sam
c88df846a7
Fixes animation parameters so a 2h weapon in the offhand slot doesn't look wonky.
2021-04-14 17:38:37 -04:00
jshipsey
808634aa75
addressing commments
2021-04-13 20:19:35 -04:00
jshipsey
a7f5b90f0e
2h/1h bug fix, staggers
2021-04-13 20:19:35 -04:00
jshipsey
ea9b871374
loot tables, clippy, animation tweaks
2021-04-13 20:18:59 -04:00
jshipsey
42460f7e65
spins, combos
2021-04-13 20:18:59 -04:00
jshipsey
529f8eb5a6
more setups. chargeswing/dash anims
2021-04-13 20:18:59 -04:00
jshipsey
9a26024acb
alpha attacks
2021-04-13 20:18:59 -04:00
jshipsey
b53e1653f6
initial wield testing
2021-04-13 20:18:58 -04:00
Joshua Yanovski
1bdf3b13a8
Mesh sprites in the background.
...
This makes the delay afetr selecting a character before logging into the
game much shorter, in the common case. It still doesn't handle things
perfectly (it blocks creating Terrain::new if it's not finished, and it
could be faster due to working in the background), but it's still a lot
better than it was before.
To improve sprite meshing performance, we also apply the terrain
flat_get optimizations to sprites. Though I didn't initially know how
much of an impact it would have, it feels significantly faster to me,
though being able to parallelize it would be ideal.
2021-04-10 17:51:42 +02:00
jshipsey
558c82ee54
flayer anims
2021-03-27 21:05:16 -04:00
Justin Shipsey
f57af6f776
Merge branch 'slipped/animtweaks' into 'master'
...
airship movement bits
See merge request veloren/veloren!1967
2021-03-22 08:49:04 +00:00
jshipsey
31747d8ff1
airship movement bits
2021-03-21 21:43:49 -04:00
Sam
f342be71a1
Fixed pick animation
2021-03-21 15:29:17 -04:00
Marcel Märtens
a286eb084a
create a wrapper around rayon, slowjobpool, that spawns on rayon but drop feed it
2021-03-16 13:31:04 +01:00
Joshua Barretto
6f10a56589
Optimised entity sync code, increased animation throttling distance
2021-03-16 02:49:33 +00:00
Joshua Barretto
0312c06295
Fixed sliding when wielding
2021-03-15 14:18:56 +00:00
Avi Weinstock
a32be4ac5a
Address MR 1888 review comments.
...
- Delete obsolete symbolic links.
- Add suggested comments.
- Remove dead code.
2021-03-14 23:17:28 -04:00
Avi Weinstock
aa56166c80
Fix fmt and clippy, and rename {psdr,psdw} to {read,write} in physics.
2021-03-14 23:17:26 -04:00
Joshua Barretto
afd99788b2
Made animations and friction ground-relative
2021-03-14 23:09:52 -04:00
Avi Weinstock
e9aab63a04
Account for model translation in the physics. The voxel collider still needs to be north-aligned for now.
2021-03-14 23:09:52 -04:00
Avi Weinstock
bcd3799395
Airship fixes: figure culling, player hitbox bounds w.r.t. airships, physics state unioning.
2021-03-14 23:09:51 -04:00
Avi Weinstock
5d85775dcf
Airship progress: now possessable, and physics kind of works (desyncs from the visuals by a shift + scale, and rotation isn't done at all yet, but the contours are correct).
2021-03-14 23:09:51 -04:00
Avi Weinstock
8b9e84972a
Draft of airships (spawn command, visuals, some physics refactoring, no collision yet).
2021-03-14 23:09:49 -04:00
Snowram
60dd47cdea
Theropod charge attack
2021-03-14 18:10:40 +01:00
jshipsey
49f496e290
intitial values
2021-03-12 00:58:12 -05:00
Sam
c13e84aff5
Aura duration separated from cast duration in aura state
...
Healing beam now requires combo > 0 to enter character state
Removed last vestiges of old sceptre abilities
Combo extended to most other attacks
Cast aura state renamed to basic aura
2021-03-09 18:02:00 -05:00
Sam
c5f74e528d
Animation for cast aura, combo information passed to skillbar.
2021-03-09 17:59:40 -05:00
Sam
b6f4543a14
Fixed beam offsets, told healing beam to use beam animation.
2021-03-09 17:59:40 -05:00
Marcel Märtens
4ebfbdde0f
Move Specs code to own common_ecs create, put tracy and macros into common_base
2021-03-09 00:54:01 +01:00
Joshua Barretto
100cafa91b
Directional baked lights for figures
2021-03-07 14:25:01 +00:00
Joshua Yanovski
2dd7089e52
Bring vek up to date so we can bump rustc (hopefully).
2021-03-04 05:46:59 +01:00
Snowram
7f2276324e
Reduces the instances of f64 in anims
2021-02-27 23:21:03 +01:00
jshipsey
b4627dfe19
look-based anims
2021-02-27 16:19:33 -05:00
Sam
238fcaf5f1
Particle rebase fixes
2021-02-27 01:42:47 -05:00
jshipsey
51bc74b2a5
visual weapon variation, adjust minotaur dash, keyframed golem quake
2021-02-27 01:42:47 -05:00
jshipsey
16a44cd532
minotaur moves, added claygolem
2021-02-27 01:42:47 -05:00
jshipsey
417f4638ed
balance pass 2
2021-02-27 01:42:47 -05:00
jshipsey
79ec9115f5
rebase, yeti in dungeon
2021-02-27 01:42:47 -05:00
jshipsey
e06ebf3507
initial balance
2021-02-27 01:42:47 -05:00
jshipsey
30af3a4493
dash, spin, jump changes
2021-02-27 01:42:46 -05:00
jshipsey
ce3b2141e1
theropod retrofit, some more moves
2021-02-27 01:42:46 -05:00
jshipsey
5792faa992
some new moves, combine biped weapons into one file
2021-02-27 01:42:46 -05:00
jshipsey
57d5e90ddd
full bipedsmall armor swaps
2021-02-27 01:42:46 -05:00
jshipsey
130d51786a
golem retrofit
2021-02-27 01:42:46 -05:00
jshipsey
aa4237b019
BL improvements, various fixes
2021-02-27 01:42:45 -05:00
jshipsey
e4e25e20c9
rebase
2021-02-27 01:42:45 -05:00
jshipsey
0dc8b2e482
rendering
2021-02-27 01:42:45 -05:00
jshipsey
ca3248cc93
new dungeon setups, new npcs, weapon specific loadouts, anims
2021-02-27 01:42:45 -05:00
jshipsey
ac16a8900d
bow
2021-02-27 01:42:45 -05:00
jshipsey
66664f3f89
the stabs
2021-02-27 01:42:45 -05:00
