1023 Commits

Author SHA1 Message Date
Monty Marz
de70d04e06 Delete char window visuals, small scrolling fix for char creation background 2019-09-20 12:59:23 +00:00
Monty Marz
1cab8f638a Character assets Part 1 2019-09-18 16:46:12 +00:00
Imbris
75859c89ef Make some voxygen dependencies optional 2019-09-15 17:03:33 -04:00
Imbris
34577a7b86 Fix always returning the default settings 2019-09-12 23:37:28 -04:00
Arash Outadi
1451889365 Run cargo fmt 2019-09-12 22:47:51 -04:00
Arash Outadi
8ddac925a6 Add code path for invalid settings file 2019-09-12 22:47:50 -04:00
Joshua Barretto
e6d8b4b8d8 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
Joshua Barretto
89b637e94e Merge branch 'fix-jump-height' into 'master'
Fix jump height

See merge request veloren/veloren!485
2019-09-08 15:50:08 +00:00
Geno
58ad2e4d82 Footstep volume fix 2019-09-08 15:47:52 +00:00
Forest
a519727548 Bumped version 2019-09-08 11:15:46 -04:00
scott-c
5edd544f69 Fix performance regression; simplify FigureKey 2019-09-08 19:52:57 +08:00
Andrew Pritchard
32a8ceab94 Merge branch 'fix-jump-height' into 'fix-jump-height'
Fix jump height

See merge request veloren/veloren!477
2019-09-07 12:48:49 +00:00
Timo Koesters
f241bc6b82 Merge branch 'timo-attack' into 'master'
Fix wolfs not attacking and adjust movement while attacking

See merge request veloren/veloren!484
2019-09-07 10:25:57 +00:00
timokoesters
57111af0a7
Fix audio 2019-09-07 11:46:21 +02:00
haslersn
7ca6d8b5f2 voxygen: Make the Terrain struct generic 2019-09-06 15:43:31 +02:00
haslersn
351b8c91c7 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
Joshua Barretto
fa67696fcd Merge branch 'scott-c/first-person-model' into 'master'
Add first person models

See merge request veloren/veloren!443
2019-09-06 13:02:03 +00:00
scott-c
964f563c35 cleanup comment 2019-09-06 20:22:17 +08:00
scott-c
5f58224f82 Cleanup unused import 2019-09-06 19:35:47 +08:00
scott-c
7838cfa5b2 half camera height when rolling 2019-09-06 19:29:52 +08:00
Joshua Barretto
8ef13f72b7 Merge branch 'desttinghim/sound-effects' into 'master'
Sound Effects

Closes #163 and #97

See merge request veloren/veloren!473
2019-09-06 11:19:32 +00:00
scott-c
df6e611944 Hide player hands when rolling in first person 2019-09-06 19:12:46 +08:00
Louis Pearson
bd52829acb Removed unescessary if statements 2019-09-06 05:02:29 -06:00
scott-c
ad1bccfee0 Simplify model cache key, fixes performance issue 2019-09-06 18:59:05 +08:00
Louis Pearson
c407bc1c2b Change ear pos to Vec3 2019-09-06 04:44:15 -06:00
Louis Pearson
8a1010f9ac Cargo fmt 2019-09-06 04:38:02 -06:00
Louis Pearson
653c633677 Code cleanup 2019-09-06 04:36:42 -06:00
Louis Pearson
322c7ba2b7 Fix warnings 2019-09-06 04:25:17 -06:00
scott-c
84516afff1 Fix first person weapon visible while not wielding 2019-09-06 18:22:26 +08:00
Louis Pearson
561a58fb81 Fix settings move 2019-09-06 04:06:26 -06:00
Andrew Pritchard
c408c46448 Vec3 is apprently *not* Copy, Set near plane to 0.1 to prevent tirangle flickering 2019-09-06 13:24:42 +08:00
Monty Marz
ed35360945 Pixel art for axe and flying rod, shadow for zone names and death message 2019-09-05 17:28:33 +00:00
Louis Pearson
f57493703a Format files 2019-09-05 03:11:18 -06:00
Louis Pearson
20dd9ef985 Get sound effects working 2019-09-05 03:08:09 -06:00
Louis Pearson
67933c856b Add soundcache
Still getting the stuttering. Time to rethink channels
2019-09-05 03:08:09 -06:00
Louis Pearson
a5b9a2e02c Adds proper 3d sound?
Looks like loading the footstep files every time a sound is played
becomes a problem rather quickly.
2019-09-05 03:08:09 -06:00
Louis Pearson
18d84da929 Change footstep rate 2019-09-05 03:08:09 -06:00
Louis Pearson
dee9918975 Add positional audio
Orientation needs to be set now
2019-09-05 03:08:09 -06:00
Louis Pearson
7321488ff1 Add delay to walking sounds 2019-09-05 03:08:09 -06:00
Louis Pearson
f38d3781b3 Add footstep sounds, implement crude footstep sounding
Sounds are played every tick, which is not good.
2019-09-05 03:08:09 -06:00
Louis Pearson
aa91d0c084 Add play_music call to audiofrontend 2019-09-05 03:08:09 -06:00
Louis Pearson
5bdbbef3fe Remove audio/base.rs 2019-09-05 03:08:09 -06:00
Louis Pearson
b9bcbeea60 Add support for fading sounds 2019-09-05 03:08:09 -06:00
Louis Pearson
50015c8b9a Revamp AudioFrontend
audio::base had a lot of unnescessary abstractions and constructs.
The current code simplifies the API in a way that makes sense and
that will allow sound effects and fading to be added in an incremental
way.
2019-09-05 03:08:09 -06:00
Louis Pearson
7c0aa9611c Use latest version of Rodio instead of custom branch 2019-09-05 03:04:53 -06:00
scott-c
cb0f9d6562 Reduce first person camera interpolation time 2019-09-04 22:05:59 +08:00
scott-c
7f05952393 Add first person models 2019-09-04 22:05:59 +08:00
Imbris
be6584399d Fix some warnings, cleanup comment 2019-09-03 23:09:29 -04:00
Imbris
2946b452f4 Remove derpy eyes :( , fix undead eye indices, fmt 2019-09-03 23:06:15 -04:00
Imbris
3707e49e01 Remove use of empty.vox 2019-09-03 23:06:09 -04:00