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
jshipsey
6a57dd25d0
wielding
2021-02-27 01:42:45 -05:00
jshipsey
7cf723bb9d
gnome
2021-02-27 01:42:43 -05:00
jshipsey
266986626d
biped_small setup
2021-02-27 01:42:43 -05:00
Snowram
14c252d8b2
Merge branch 'snowram/turret' into 'master'
...
Object animation, beam fixes, turret implementation
See merge request veloren/veloren!1805
2021-02-23 20:16:56 +00:00
Imbris
f33d3873b4
Merge branch 'aweinstock/modular-weapon-rigging' into 'master'
...
Support modular weapon voxel meshes being made by assembling their components.
See merge request veloren/veloren!1806
2021-02-23 00:45:26 +00:00
Avi Weinstock
c3ac8a1b51
Support modular weapon voxel meshes being made by assembling their components.
2021-02-23 00:45:26 +00:00
Marcel
72bd0f42fc
Merge branch 'xMAC94x/prot_improvements' into 'master'
...
xMAC94x/prot_improvements
See merge request veloren/veloren!1796
2021-02-22 22:47:43 +00:00
Snowram
684961b15c
Adds look_dir to anims, humanoid heads pivot fixes
2021-02-22 20:00:06 +01:00
Marcel Märtens
1a7c179bbb
share tokio Runtime between Client and Server, name rayon Threadpool
2021-02-22 17:35:06 +01:00
Marcel Märtens
514d5db038
Update Network Protocol
...
- now last digit version is compatible 0.6.0 will connect to 0.6.1
- the TCP DATA Frames no longer contain START field, as it's not needed
- the TCP OPENSTREAM Frames will now contain the BANDWIDTH field
- MID is not Protocol internal
Update network
- update API with Bandwidth
Update veloren
- introduce better runtime and `async` things that are IO bound.
- Remove `uvth` and instead use `tokio::runtime::Runtime::spawn_blocking`
- remove futures_execute from client and server use tokio::runtime::Runtime instead
- give threads a Name
2021-02-22 17:34:55 +01:00
Snowram
4078eeb877
Various fixes to object animation, cleanup
2021-02-21 19:56:46 +01:00
Snowram
e7bbf3981d
Object animation
2021-02-21 19:17:44 +01:00
Sam
d4f509b3d0
Added hands field onto weapons.
2021-02-19 17:30:20 -05:00
Ludvig Böklin
0f1227ca7d
Use nlerp for interpolating rotations in animation
2021-02-15 11:01:59 +01:00
Ludvig Böklin
84990553e0
Use Ori for base rotation matrix
2021-02-13 11:02:50 +01:00
Ludvig Böklin
065e260e78
Code quality
2021-02-09 14:06:27 +01:00
Ludvig Böklin
fa78674840
Encourage migration towards using quaternion in animations
2021-02-09 13:52:44 +01:00
Ludvig Böklin
582ddfc3cd
Ori: add tests, rename to_vec() => look_vec(); Dir: add methods, normalize on rot
2021-02-09 13:52:03 +01:00
Ludvig Böklin
a1ff9ab83f
Redefine Ori as a quaternion
2021-02-05 09:33:14 +01:00
jiminycrick
a02444825d
Address some comments
...
Eliminated extra stagger state
Responding to more comments
Move poise character state changes to character behavior system
Move poise out of JoinTuple/Data
Finish up comments (various fixes)
2021-01-28 17:31:05 -08:00
jshipsey
d456271921
animal stuns
...
Fix rebase
2021-01-28 17:22:39 -08:00
jshipsey
29732bb763
starting stun anim
...
stagger anim, mirroring, bettern walk anim
wielding with stuns/stagger
Knockback fix
Added Poise documentation/comments
2021-01-28 17:22:37 -08:00
Snowram
8b06d844f7
Golem spinmelee anim
2021-01-21 01:23:10 +01:00
jshipsey
0b156542e4
roll keyframes
...
Changed roll to have non-fixed acceleration.
2021-01-19 08:08:21 -05:00
jshipsey
5d1993009f
keyframed axe spin
...
Fixed error in converting FK to entity_id from character_id.
Giant match statements in persistence.
Tweaked roll.
Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-19 08:08:18 -05:00
Ben Wallis
aef2637288
Refactored loadout to have public functions for each slot instead of requiring callers to use the _INDEX consts
2021-01-08 19:12:09 +00:00
Joshua Barretto
a4b9230f03
fixed Cargo.lock conflict
...
Fixed `crossbeam-queue` being referenced twice in the lockfile
2021-01-07 20:25:12 +00:00
Benoît du Garreau
0cf164f33a
Use assets_manager to load assets
2020-12-17 12:06:07 +01:00
Justin Shipsey
e7249210f6
accel based run
2020-12-16 08:07:38 +00:00
Snowram
96ed008348
Puts objects offsets into a .ron file
2020-12-14 02:43:49 +01:00
Marcel Märtens
ccb01e1898
adjust fmt and clippy after toolchain upgrade
2020-12-10 14:53:01 +01:00
Snowram
6713ac935f
Addressed comments
2020-12-08 23:04:21 +01:00
Snowram
2e8ac0688c
Adds accumulated velocity for animation
2020-12-08 23:03:41 +01:00
Snowram
f94a4ec90d
Improves fish_small, new npc
2020-12-08 23:03:39 +01:00
Snowram
72d73ecd38
Initial fish work
2020-12-08 23:03:38 +01:00
Marcel Märtens
e398cca53c
move common_state into common_sys
2020-12-01 13:46:28 +01:00
Marcel Märtens
add7922653
Move Systems out of common into common_sys
...
This requires to move `State` into a own crate called `common_state` which depends on `common` and `common_sys`
2020-12-01 13:44:07 +01:00
Samuel Keiffer
352917d9cb
Graying out skills with insufficient energy no longer dependent on hard-coded values
2020-11-27 16:27:09 +00:00
Sam
33e4448542
Replaced every unnecssary powf in the entire codebase with either powi or sqrt.
2020-11-24 18:28:24 -06:00
jiminycrick
aad9734055
Agent tactic refactoring
...
Lower theropods spawns
clippy, changelog
review response
2020-11-24 17:49:00 -06:00
jshipsey
d10dd83e5f
theropods in world, small tweaks
2020-11-24 17:48:51 -06:00
jshipsey
f411ff7e04
bunch of animations and more attacks
2020-11-24 17:48:51 -06:00
jshipsey
6f72e68ad6
hoof attack, tweaks
2020-11-24 17:48:50 -06:00
jshipsey
1f59ef92d8
species specific speeds, more animation
2020-11-24 17:48:48 -06:00
jshipsey
c07d8df58b
assigning weapons, building animations
...
ability mapping
2020-11-24 17:48:43 -06:00
jshipsey
e3e513cc11
initial quadlow ranged work
2020-11-24 17:48:27 -06:00
jshipsey
ae06016e9a
Wolf attacks and ai.
...
initial wolf dash testing
tool.rs
Wolf attack AI
2020-11-24 17:48:20 -06:00
Joshua Barretto
26fd40c0e3
Fmt, make clippy happy
2020-11-23 15:39:03 +00:00
Joshua Barretto
df1b19ed64
Light/glow temporal interpolation hack
2020-11-23 10:57:57 +00:00
Joshua Barretto
d7bbceca2d
Added light/glow map sample interpolation for entities
2020-11-23 10:57:56 +00:00
Joshua Barretto
27e7fd0727
Preserved light/glow maps to prevent sprites/entities being lit when they shouldn't be
2020-11-23 10:57:56 +00:00
Joshua Barretto
bcc220804a
Added exposure to settings
2020-11-23 10:57:55 +00:00
Snowram
d98bfa72ad
Improves bipedlarge and theropod anims, balance tweaks
2020-11-19 00:56:50 +01:00
Sam
9b0e1c8dfc
Slight balance tweaks.
2020-11-08 19:33:24 -06:00
Sam
8fa7e246e9
Minor tweaks.
2020-11-08 18:11:53 -06:00
jshipsey
0618de138e
rebase
2020-11-08 19:02:48 -05:00
jshipsey
20efc692fd
ranged
2020-11-08 18:52:22 -05:00
jshipsey
92aa6a1b12
axe basic
2020-11-08 18:51:35 -05:00
jiminycrick
33e87de17e
Initial combo melee for axe M1
2020-11-08 18:48:48 -05:00
AlKabir
9424ecfb4d
centering assets
2020-11-08 00:35:11 -06:00
AlKabir
6535deae9c
added two meat assets for mobs to drop
2020-11-07 23:34:20 -06:00
Imbris
133ba82a9b
Use item_definition_id for weapon asset mapping
2020-11-07 16:44:11 -06:00
Sam
a4046872b2
Yeeted from code files.
2020-11-07 15:53:10 -06:00
AlKabir
77f3c7e3c5
Minor combat fixes (see issue 785)
2020-11-07 18:00:07 +00:00
TheBoredProgrammer64
b2ec207979
Revert "Removed toolCategory"
...
This reverts commit 5b0ff408176ff00408cc90f2516a90d5cd303e56.
2020-11-06 15:33:20 +00:00
Sam
c48c022f7e
Separated out health from stats component.
2020-11-04 19:22:04 -06:00
Snowram
b47f42bad5
More biped_large work
2020-11-04 01:48:05 +01:00
unknown
14ec1b9f5f
starting to wire in new wield setup for bipedlarge
2020-11-04 01:48:05 +01:00
jshipsey
e928dbe4db
start cleanup
2020-11-04 01:48:04 +01:00
Marcel Märtens
153c6c3b13
Fixing Tarpaulin isn't easy.
...
So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version.
Then we had to update several dependencies, which broke:
- need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27
- use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23
- update conrod to use modern copypasta 0.7
- use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project.
- adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type.
It was called `convert_event`
- make a `simd` feature which is default and introduce conditional compiling.
AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS.
- tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-10-26 17:04:20 +01:00
Snowram
d5e60d93b4
Add missing biped_large anims
2020-10-19 16:20:59 +02:00
jshipsey
caa048b1d5
small fixes
2020-10-19 16:20:59 +02:00
jshipsey
65df398672
werewolf work
2020-10-19 16:20:58 +02:00
Snowram
588f66a1ee
Add treant npc
2020-10-19 16:20:58 +02:00
Snowram
58e2d3a4ad
More bipedlarge anim work
2020-10-19 16:20:58 +02:00
Snowram
c1c2c9dc07
Add bipedlarge spin and beta anims
2020-10-19 16:20:58 +02:00
unknown
94cbe3faf4
Better bipedlarge weild, charge and shoot anims
2020-10-19 16:20:58 +02:00
unknown
d2f91bc3a0
Assigns a ToolKind to bipedlarge weapons
2020-10-19 16:20:58 +02:00
jshipsey
6a744eed82
anims
2020-10-14 21:06:32 -05:00
Sam
256846a669
Initial implementation of new staff abilities.
2020-10-14 20:56:16 -05:00
jshipsey
521ffd64ba
cleanup
2020-10-14 12:50:33 -07:00
jshipsey
28eb58ddfa
anims
2020-10-14 12:50:33 -07:00
jshipsey
281155186f
hammer leap melee anim
2020-10-14 12:50:33 -07:00
jiminycrick
ae4b259250
Fix what broke during rebase
2020-10-14 12:50:32 -07:00
jiminycrick
431f99a791
Reducing the amount of data in character state
2020-10-14 12:50:32 -07:00
jiminycrick
05623eb8bd
Addressed comments
2020-10-14 12:50:32 -07:00
jiminycrick
04175bab09
Add skillbar stuff for 3rd skills
2020-10-14 12:50:32 -07:00
Imbris
308cca0dc9
Put server-cli specific settings in their own structure, serde_derive -> serde
2020-10-10 02:10:32 -04:00
Imbris
ef74d395a6
Improve figure and sprite highlighting
2020-10-10 02:10:31 -04:00
Monty Marz
2b800a2b63
make clippy happy
...
Delete glider.ron
2020-10-07 02:23:20 +00:00
Sam
56d2afc0dc
Added keyframe support to basic beam state. Addressed some comments.
2020-09-29 19:48:15 -05:00
Sam
ddbe871b50
Placeholder animation for beam attack.
2020-09-29 19:48:03 -05:00
Sam
6b23af6e0b
Tweaked particles. Added skill icons.
2020-09-29 19:47:58 -05:00
Sam
2ff59c9f60
Addressed comments
2020-09-21 17:55:29 -05:00
jshipsey
e79cef4824
dash animation
2020-09-21 17:38:55 -05:00
Sam
a8e834e754
Initial implementation of spin attack for sword.
2020-09-21 17:38:54 -05:00
Sam
b06ab250cc
Addressed first round of feedback on sword overhaul.
2020-09-21 17:38:52 -05:00
Sam
c99e4c3c18
Added swing duration to dash melee. Added framework for animation to be added.
2020-09-21 17:38:51 -05:00
Sam
04af75bf8d
Initial implementation of new dash melee.
2020-09-21 17:38:48 -05:00
jshipsey
a18c23025e
stage 2 and 3 anim
2020-09-21 17:38:46 -05:00
Sam
847bddbd89
Removed swing_frac, added a swing duration instead to allow for more utility in character state. Moved location of stage_section enum to wielding so it could more easily be used by other character states.
2020-09-21 17:38:46 -05:00
Sam
2ba9d1e54f
Added support for different swings in the combo melee having differnt fractions of time buildup duration is split.
2020-09-21 17:38:45 -05:00
jshipsey
2451a64b97
stage 2 animation
2020-09-21 17:38:44 -05:00
Sam
0ba5740265
Added enum for stage section instead of using 4 bools.
2020-09-21 17:38:43 -05:00
Sam
440e45f2bc
Did stuff to support addition of keyframes for combo melee animation.
2020-09-21 17:38:43 -05:00
Sam
aab56ea636
Animation time for combo melee now resets between stages.
2020-09-21 17:38:42 -05:00
Sam
cf573a42bd
Initial implementation of combo melee attack.
2020-09-21 17:38:41 -05:00
Sam
e39770d1d9
Golem now spawns in dungeon.
2020-09-19 14:40:20 -05:00
jshipsey
5bb45a4861
spawn tweaks, improved odonto
2020-09-17 22:32:11 -04:00
Snowram
62f6a5799a
Initial quadmed feed animation
2020-09-17 22:32:10 -04:00
jshipsey
789d93b52f
new models, shockwave anim
2020-09-17 22:32:10 -04:00
jshipsey
03b7320b4b
general housekeeping
2020-09-17 22:32:10 -04:00
jshipsey
06b39b9072
species specific improvement
2020-09-17 22:32:10 -04:00
jshipsey
3eeaf7e8c9
idle for theropod, corrections to swimming
2020-09-17 22:32:10 -04:00
jshipsey
cd6e1ad45f
haul out the critter skele, add theropod
2020-09-17 22:32:10 -04:00
jshipsey
b514fb4159
fix for animal attack motion bug
2020-09-17 22:32:09 -04:00
jshipsey
ecae71c016
gliders as items. anim improvements
2020-09-17 22:32:09 -04:00
jshipsey
7525479a4c
fit dt issue
2020-09-17 22:18:49 -04:00
jshipsey
bd1984bf28
golem addition, fix for axe attack
2020-09-17 22:18:49 -04:00
Ben Wallis
712f2e9c97
* Moved migrations to beginning of server initialisation
...
* Added migrations for entity ID changes to existing tables
2020-09-17 23:02:14 +00:00
Imbris
f39d1e9bb5
Use less verbose span names when the tracy feature is off
2020-09-07 00:59:16 -04:00
