Commit Graph

2262 Commits

Author SHA1 Message Date
90bcdacfd8 Vec3 is copy 2019-09-06 12:04:20 +08:00
ca6734b5ba Merge branch 'pfauenauge/flying-rod-axe-pixart' into 'master'
Pixel art for axe and flying rod, shadow for zone names and death message

See merge request veloren/veloren!478
2019-09-05 17:28:33 +00:00
ed35360945 Pixel art for axe and flying rod, shadow for zone names and death message 2019-09-05 17:28:33 +00:00
cf2ec6a4a4 Merge branch 'master' into 'fix-jump-height'
# Conflicts:
#   common/src/sys/phys.rs
2019-09-05 13:07:46 +00:00
72f6145aaa Revert "Revert "Exponential interpolation for linear damping""
This reverts commit 8b9a3ae1df.
2019-09-05 18:24:38 +08:00
fd62f3e89d Revert "Exponential interpolation for linear damping"
This reverts commit 94b9f50efa.
2019-09-05 18:24:22 +08:00
f57493703a Format files 2019-09-05 03:11:18 -06:00
20dd9ef985 Get sound effects working 2019-09-05 03:08:09 -06:00
67933c856b Add soundcache
Still getting the stuttering. Time to rethink channels
2019-09-05 03:08:09 -06:00
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
18d84da929 Change footstep rate 2019-09-05 03:08:09 -06:00
dee9918975 Add positional audio
Orientation needs to be set now
2019-09-05 03:08:09 -06:00
7321488ff1 Add delay to walking sounds 2019-09-05 03:08:09 -06:00
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
aa91d0c084 Add play_music call to audiofrontend 2019-09-05 03:08:09 -06:00
5bdbbef3fe Remove audio/base.rs 2019-09-05 03:08:09 -06:00
b9bcbeea60 Add support for fading sounds 2019-09-05 03:08:09 -06:00
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
713c3c0e39 Exponential interpolation for linear damping
With an additional approximation to allow for the same size jumps given different framerates.
2019-09-05 17:07:15 +08:00
7c0aa9611c Use latest version of Rodio instead of custom branch 2019-09-05 03:04:53 -06:00
443716ad2d Merge branch 'imbris/ci_updates' into 'master'
Deny all warnings, Switch to cargo check in CI

See merge request veloren/veloren!476
2019-09-05 00:19:50 +00:00
80d0884492 Remove all warnings 2019-09-04 19:03:49 -04:00
cb0f9d6562 Reduce first person camera interpolation time 2019-09-04 22:05:59 +08:00
7f05952393 Add first person models 2019-09-04 22:05:59 +08:00
a29854f2c6 Deny all wanings, only use check in CI 2019-09-04 01:13:18 -04:00
425ef226de Merge branch 'imbris/char-creation' into 'master'
Segment combination for character creation

Closes #94

See merge request veloren/veloren!470
2019-09-04 03:25:09 +00:00
be6584399d Fix some warnings, cleanup comment 2019-09-03 23:09:29 -04:00
2946b452f4 Remove derpy eyes :( , fix undead eye indices, fmt 2019-09-03 23:06:15 -04:00
d052add569 fixing eyes, cleanup on offsets 2019-09-03 23:06:13 -04:00
9328ac4f72 tweaked hair colors, head offsets, skin colors 2019-09-03 23:06:11 -04:00
3707e49e01 Remove use of empty.vox 2019-09-03 23:06:09 -04:00
ef3ff6f21c Add pants coloring, chest and pants sliders 2019-09-03 23:06:06 -04:00
96cee60664 Add separate eye color lists for each race 2019-09-03 23:06:02 -04:00
ab715a2bbc hair and skin colours 2019-09-03 23:05:59 -04:00
a1c8a4a2f9 adjust how figure head coloring is done 2019-09-03 23:05:58 -04:00
f66cd1b9d3 model changes 2019-09-03 23:05:57 -04:00
0be9d41b0f Add basic index based coloring for figures 2019-09-03 23:05:56 -04:00
709ee178a3 proper head offsets, more options 2019-09-03 23:05:56 -04:00
d164ba4c0f added more races with head/hair/eye offsets 2019-09-03 23:05:55 -04:00
f263ecd880 Fix sliders, remove uneeded method, fix aspect ratio in character creation 2019-09-03 23:05:54 -04:00
6c47c458d8 Add ron file for head offsets, segment unionizer 2019-09-03 23:05:52 -04:00
afe3b32a9e Split up figure.rs 2019-09-03 23:05:50 -04:00
c37646e0e2 Add basic segment combination 2019-09-03 23:05:50 -04:00
2e8f94659e Save settings, start log, & set panic hook first 2019-09-03 23:05:47 -04:00
4747c09785 Merge branch 'imbris/tooltip-enhancements' into 'master'
Add ImageFrame widget, make tooltips use this, align ui to the pixels properly

See merge request veloren/veloren!474
2019-09-03 06:44:38 +00:00
37f4ba3f84 Merge branch 'which_object_spawned' into 'master'
Tells the user which object was spawned

See merge request veloren/veloren!368
2019-09-02 05:34:28 +00:00
f0d96d84fe Added unwrap_or to obj_str_opt in handle_object in case we don't return early in the _ => match arm 2019-09-02 01:22:09 -04:00
8fd9f1614b Changed Spawned object: to Spawned: in handle_object 2019-09-02 01:22:09 -04:00
3771a26e88 Tells the user which object was spawned 2019-09-02 01:22:08 -04:00
447ae91171 Merge branch 'chat_history' into 'master'
Basic chat window history functionality, closes #186

Closes #186

See merge request veloren/veloren!331
2019-09-02 05:12:23 +00:00