Commit Graph

35 Commits

Author SHA1 Message Date
jshipsey
a0785e693a shooting anim state, cast anim, small tweaks 2020-03-20 18:54:27 -04:00
timokoesters
df858cb370 Remove all warnings 2020-03-20 15:45:36 +01:00
jshipsey
50e96efe6b hammer go smash 2020-03-20 02:38:53 -04:00
jshipsey
93bea033d9 axe, hammer proper wields 2020-03-20 01:27:54 -04:00
timokoesters
4741e41230 Add support for different models per weapon type 2020-03-17 18:28:07 +01:00
jshipsey
bce9d4c24f animation corrections 2020-03-08 17:02:25 -04:00
Adam Whitehurst
54a7112ad9 resolve conflicts merging master -> clientstates 2020-03-07 12:49:48 -08:00
Adam Whitehurst
096d3b691e Merge master 2020-03-07 12:49:15 -08:00
Justin Shipsey
86e15695fc weapon control bone 2020-03-05 14:02:11 +00:00
timokoesters
0bc07a0835 Merge remote-tracking branch 'origin/master' into clientstates 2020-02-03 22:02:32 +01:00
Marcel Märtens
dae31ae5b6 apply new rustfmt - touching alot of files 2020-02-01 21:39:39 +01:00
Justin Shipsey
908e099aa5 minor anim tweaks 2020-01-29 06:38:08 +00:00
Justin Shipsey
64690279af new mobs
alligators
2020-01-26 00:22:48 +00:00
AdamWhitehurst
9c6ce9babd Begin implementing combat actions 2019-12-29 15:47:42 -08:00
Adam Whitehurst
92d99af53c feat: weapon-type dependent wield and attack durations
also some controller.rs cleanup
2019-12-03 06:30:08 +00:00
Adam Whitehurst
64a0d8d91f Make character anims conditional by Tool held 2019-11-10 15:36:47 -08:00
Justin Shipsey
27f3bebe40 Char overhaul and asset update 2019-10-02 10:05:17 +00:00
Joshua Barretto
3f2e22f039 Exponential interpolation for linear damping
With an additional approximation to allow for the same size jumps given different framerates.
2019-09-09 19:11:40 +00:00
jshipsey
2ca81323d5 added shoulder movement and fixed placement 2019-08-18 02:35:27 -04:00
jshipsey
02ac56d84d clearing animation warnings 2019-07-04 10:58:59 -04:00
jshipsey
2ce5c5881e combat run/jump/idle animation states 2019-06-30 18:53:44 -04:00
Monty Marz
cef52a0440 Char fixes 2019-06-28 14:45:02 +00:00
Justin Shipsey
4ac7307f8f minor main menu changes
made the settings button's text grey and removed hover/press image as long as it's not functional

changed server list placement and spacing
2019-06-28 08:24:13 +00:00
jshipsey
ecf0d9647c
added roll physics, improved anims for roll, glide, run, attached hands to torso 2019-06-16 19:59:12 +02:00
jshipsey
99b4406d79 cleared out unused animation variables 2019-06-13 00:14:06 -04:00
Cody
14ac5babd4 Removes most unused imports; changes some unused variables to underscores or provides a leading underscore; removes some unnecessary variables and mutable declarations; and performs other miscellaneous warning fixes. 2019-06-06 14:48:41 +00:00
Cody
75ca605f5d
Changes the physics misnomer Direction to Orientation and adjusts some ECS read_storage names. 2019-05-31 16:36:24 -04:00
jshipsey
6cb1a75b93 speed tweak
Former-commit-id: a3938ec59032794c7135facddecbf7131fb5262e
2019-05-27 19:48:44 -04:00
jshipsey
f9e2828de5 swing animation changes
Former-commit-id: 1bc70090e938c12d6e133683932b470be102aecd
2019-05-27 19:03:52 -04:00
jshipsey
5f22c4e26f swing animation
Former-commit-id: 19e2c32aa36e3890e35df87f01bb0aec4cc8cf9c
2019-05-27 18:54:09 -04:00
jshipsey
e84d19b5c8 fmt
Former-commit-id: d4c800b8c2e7667bb635de23c0f334bddd4b7a0d
2019-05-24 19:01:10 -04:00
jshipsey
98630b3692 attack state
Former-commit-id: 6d8a6b68aff7ae2439eb42b2cee017cec99d96df
2019-05-24 18:42:22 -04:00
jshipsey
ac41a2241c laying groundwork for combat anims, untangling skeleton
Former-commit-id: 442e7059ce0e62429c263fd0b95ee98b7d8bc0d2
2019-05-24 18:33:56 -04:00
jshipsey
a65d6e733f rotation simplification
Former-commit-id: 991b5710d14c27af8f34745caeef95df47be0bb0
2019-05-24 18:33:55 -04:00
jshipsey
5049b9a2ae attack state
Former-commit-id: 316d1dbb607688d88c067adc6498497aa67cb017
2019-05-24 18:33:55 -04:00