Commit Graph

391 Commits

Author SHA1 Message Date
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