jshipsey
175fea98ef
more cleanup, WIP fake swimming
2020-03-26 01:35:25 -04:00
jshipsey
c7d9b5ae0f
fixed critter animation
2020-03-25 01:29:55 -04:00
jshipsey
047f6b8a01
fixed swimming, better charge
2020-03-25 01:22:07 -04:00
jshipsey
a6537ed69b
starting foot movement with attacks, clearing some dead code
2020-03-25 00:15:06 -04:00
jshipsey
7a4f0fa9ac
climb fix, const tweak update, trying equip anims
2020-03-24 00:24:31 -04:00
jshipsey
eddf3ec658
raised run anim speed 20%
2020-03-22 21:32:34 -04:00
jshipsey
9cbbe0311f
rewrote the whole stupid skeleton to work much smarter
2020-03-22 16:06:53 -04:00
jshipsey
0773524031
wield idle, wield run
2020-03-22 11:55:28 -04:00
jshipsey
32c85d1bab
axe attack
2020-03-22 00:11:24 -04:00
jshipsey
14f560f21b
proper hammer smash, small tweaks
2020-03-21 15:47:16 -04:00
jshipsey
221f675217
spin attack
2020-03-21 14:54:29 -04:00
jshipsey
49986a0e09
bow work
2020-03-21 03:40:14 -04:00
Imbris
08db424169
Add safe_slerp function that ensures that slerping returns non-NaN normalized values
2020-03-21 00:53:41 -04:00
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
timokoesters
81591fcaf7
Make npcs attack again
2020-03-16 14:27:52 +01:00
timokoesters
aa963b7686
Merge remote-tracking branch 'origin/master' into clientstates
2020-03-15 15:27:06 +01:00
jshipsey
bce9d4c24f
animation corrections
2020-03-08 17:02:25 -04:00
Snow
72b2334434
more eagle adjustements
2020-03-08 15:07:47 +00:00
Adam Whitehurst
49c7143144
Clean up warnings
2020-03-07 13:03:10 -08: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
jshipsey
d4332c3138
eagle adjustments
2020-03-07 13:26:46 -05:00
Justin Shipsey
86e15695fc
weapon control bone
2020-03-05 14:02:11 +00:00
Justin Shipsey
5438514343
animation housekeeping
2020-02-25 06:47:56 +00:00
timokoesters
0bc07a0835
Merge remote-tracking branch 'origin/master' into clientstates
2020-02-03 22:02:32 +01:00
timokoesters
aeb37a1f33
improvement: char speed
2020-02-03 20:43:36 +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
timokoesters
76dfac7366
fix: rolling
2020-01-27 18:32:05 +01:00
Justin Shipsey
53e57cb5dc
quad_medium animation
2020-01-27 14:16:23 +00:00
Justin Shipsey
64690279af
new mobs
...
alligators
2020-01-26 00:22:48 +00:00
Adam Whitehurst
d82e93b39f
Merge master and build
2020-01-16 05:27:30 -08:00
Joshua Barretto
cfbf69ae89
Made rolling less slippy, added tilt
2019-12-30 15:16:21 +00:00
AdamWhitehurst
ba7ca785f6
Successful build
2019-12-30 05:56:42 -08: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
Treeco
7c17c45f47
made first person camera follow race heights, minor zoom chances
2019-12-01 19:05:28 +00:00
Adam Whitehurst
59826a364a
Remove unnecessary elided lifetimes
2019-11-11 08:26:44 -08:00
Adam Whitehurst
64a0d8d91f
Make character anims conditional by Tool held
2019-11-10 15:36:47 -08:00
soruh
e3bd152d24
update toolchain to nightly-2019-11-04
2019-11-04 18:26:32 +01:00
jshipsey
12f83cf270
rebase, small fixes
2019-10-25 22:20:38 -04:00
jshipsey
c5942dfcc9
purged references to npckind from anim files, removed warnings
2019-10-25 21:50:14 -04:00
jshipsey
2b5fd372c5
streamlined body part naming scheme, swapped quadruped to quadruped_small, rewrote mesh names to reflect body type instead of npckind. finally.
2019-10-25 21:50:14 -04:00
jshipsey
574f070758
added large bipeds, small birbs, small fish skeletons
2019-10-25 21:34:29 -04:00
jshipsey
644939810f
added dragon skeleton
2019-10-25 21:33:59 -04:00
jshipsey
54fc712076
fish_medium and bird_medium skelingtons
2019-10-25 21:33:02 -04:00
timokoesters
0a1e12c9ad
improvement: make debug items of type ItemKind::Tool
...
This way all items that can be held in a hand are tools
2019-10-24 23:55:24 +02:00
jshipsey
deadd665c8
tweaks animations to better align with true positions
2019-10-12 14:19:55 -04:00
Monty Marz
d82ec6715a
Item icons, chests and more
2019-10-09 19:28:05 +00:00
jshipsey
66e8f4c4bc
added bow wielding animations
2019-10-04 21:02:45 +02:00
Monty Marz
4c1eba1f3e
Assets update, aesthetics, minor fixes
2019-10-04 18:27:12 +00:00
Justin Shipsey
27f3bebe40
Char overhaul and asset update
2019-10-02 10:05:17 +00:00
Monty Marz
3a0131306f
Character assets Part 1
2019-09-18 16:46:12 +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
haslersn
1796c09ca1
common: Rework volume API
...
See the doc comments in `common/src/vol.rs` for more information on
the API itself.
The changes include:
* Consistent `Err`/`Error` naming.
* Types are named `...Error`.
* `enum` variants are named `...Err`.
* Rename `VolMap{2d, 3d}` -> `VolGrid{2d, 3d}`. This is in preparation
to an upcoming change where a “map” in the game related sense will
be added.
* Add volume iterators. There are two types of them:
* _Position_ iterators obtained from the trait `IntoPosIterator`
using the method
`fn pos_iter(self, lower_bound: Vec3<i32>, upper_bound: Vec3<i32>) -> ...`
which returns an iterator over `Vec3<i32>`.
* _Volume_ iterators obtained from the trait `IntoVolIterator`
using the method
`fn vol_iter(self, lower_bound: Vec3<i32>, upper_bound: Vec3<i32>) -> ...`
which returns an iterator over `(Vec3<i32>, &Self::Vox)`.
Those traits will usually be implemented by references to volume
types (i.e. `impl IntoVolIterator<'a> for &'a T` where `T` is some
type which usually implements several volume traits, such as `Chunk`).
* _Position_ iterators iterate over the positions valid for that
volume.
* _Volume_ iterators do the same but return not only the position
but also the voxel at that position, in each iteration.
* Introduce trait `RectSizedVol` for the use case which we have with
`Chonk`: A `Chonk` is sized only in x and y direction.
* Introduce traits `RasterableVol`, `RectRasterableVol`
* `RasterableVol` represents a volume that is compile-time sized and has
its lower bound at `(0, 0, 0)`. The name `RasterableVol` was chosen
because such a volume can be used with `VolGrid3d`.
* `RectRasterableVol` represents a volume that is compile-time sized at
least in x and y direction and has its lower bound at `(0, 0, z)`.
There's no requirement on he lower bound or size in z direction.
The name `RectRasterableVol` was chosen because such a volume can be
used with `VolGrid2d`.
2019-09-06 15:43:31 +02:00
jshipsey
b81cd6a8f9
combine character.action movement blocks
2019-08-30 22:51:46 -04:00
jshipsey
78bf7a0997
slowed movement for block/attack, cleaned up code, made foot speed velocity dependent, tweaked blocking animation
2019-08-30 22:50:53 -04:00
jshipsey
d84c07c1cb
fixed tiny feet in char creation
2019-08-30 22:50:53 -04:00
jshipsey
f8d0b1040a
readded cidle
2019-08-30 22:50:53 -04:00
jshipsey
bec942753e
some stuff fixed, other stuff still broken
2019-08-30 22:50:53 -04:00
jshipsey
e6197d4c10
separate static anims for feet (run/static)
2019-08-30 22:50:53 -04:00
timokoesters
84d0f61596
Make pipeline succeed
2019-08-26 14:05:17 +02:00
timokoesters
eb34e5bb27
fmt
2019-08-26 13:12:43 +02:00
jshipsey
39bd888a7c
idle block animation
2019-08-26 13:12:38 +02:00
jshipsey
2ca81323d5
added shoulder movement and fixed placement
2019-08-18 02:35:27 -04:00
Monty Marz
8c1d244bf8
New Female Danari and Elf models, Airblocks for tower ruins and witch house
2019-08-04 11:23:01 +00:00
jshipsey
13310ab9ca
improved animations and movement
2019-08-01 23:57:26 -04:00
Joshua Barretto
331b6c8b3a
Altered Item structure
2019-08-01 09:12:00 +01:00
Joshua Barretto
1dc654dde7
Added object entities
2019-07-21 19:22:49 +01:00
Monty Marz
ff6a72bc40
New orc head models
2019-07-14 14:34:47 +00:00
jshipsey
529281e2c3
removed weapon_id attribs, replaced with matches
2019-07-07 19:24:20 -04:00
jshipsey
12667b9172
fmt
2019-07-07 18:06:29 -04:00
jshipsey
5cd1bfb3d2
adds support for animation substates, animates run/idle/jump for hammer
2019-07-07 18:04:27 -04:00
jshipsey
02ac56d84d
clearing animation warnings
2019-07-04 10:58:59 -04:00
jshipsey
cc548eb669
glider animation fix
2019-06-30 18:53:45 -04:00
jshipsey
aea0d0002b
head position fixes
2019-06-30 18:53:45 -04:00
jshipsey
2ce5c5881e
combat run/jump/idle animation states
2019-06-30 18:53:44 -04:00
timokoesters
fe6f627d42
Clean up ecs actor body components
2019-06-29 01:49:33 +02: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
Joshua Barretto
25b48b9cf6
Removed dt debugging in animation code
2019-06-26 17:22:28 +01:00
timokoesters
7fc53db328
Fix fps dependent animation interpolation by using dt
2019-06-25 21:43:45 +02:00
jshipsey
8dd1e46883
run tweaks
2019-06-16 19:59:15 +02:00
jshipsey
ed2773fbca
changed hand motion on run animation
2019-06-16 19:59:15 +02:00
jshipsey
8e019cdbec
lowered roll duration
2019-06-16 19:59:14 +02:00
jshipsey
0c534efddd
adjusted v-tilt, roll speed, run animation tempo
2019-06-16 19:59:13 +02:00
jshipsey
e066d98762
slight roll tweak, altered speeds in physics
2019-06-16 19:59:13 +02:00
jshipsey
ecf0d9647c
added roll physics, improved anims for roll, glide, run, attached hands to torso
2019-06-16 19:59:12 +02:00
timokoesters
e2c81dd036
Fixes for .maybe() and animation
2019-06-16 19:57:04 +02:00
jshipsey
4de5489367
groundwork for role, crun, cidle
2019-06-16 19:57:04 +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
Joshua Barretto
9da2d82197
Added proper VD fog
2019-06-05 20:52:51 +01:00
Joshua Barretto
cd630b0816
Reduced threadpool threads to keep render thread smooth
2019-06-05 20:52:51 +01: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
Cody
a258be7aac
Fixes some typos, comment inconsistencies, and incorrect naming conventions.
2019-05-31 16:36:16 -04:00
