6052 Commits

Author SHA1 Message Date
jiminycrick
3ba860366b Dungeon and cave specific music 2020-11-18 13:31:12 -08:00
jiminycrick
47b4eb63a8 Remove ambient channel system in favor of sfx system 2020-11-18 13:31:12 -08:00
jiminycrick
b5cca04947 Owls, campfires, and better bird sfx handling 2020-11-18 13:31:12 -08:00
jiminycrick
303a7d4a9b fixed false audio track lengths 2020-11-18 13:31:12 -08:00
jiminycrick
318590bba1 Night time sfx and swimming 2020-11-18 13:31:12 -08:00
jiminycrick
d7861b68b1 Bird calls from trees 2020-11-18 13:31:12 -08:00
jiminycrick
963781e9e3 Really broken block sfx pushed so others can see 2020-11-18 13:31:12 -08:00
jiminycrick
1ae5352789 Sfx from blocks 2020-11-18 13:31:12 -08:00
jiminycrick
1066af6087 Fading music/ambient sounds decently upon biome transition 2020-11-18 13:31:11 -08:00
jiminycrick
2c9fe94c96 Switch music at biome transitions 2020-11-18 13:31:11 -08:00
jiminycrick
66dc884fd5 Initial biome specific music and ambient sound channel 2020-11-18 13:31:11 -08:00
Imbris
8d02ebf61e Fix issues with not being able to grab highlighted apples by unifying distance checking 2020-11-17 23:06:02 -05:00
Joshua Barretto
dd6d81dace Merge branch 'snowram/eye-sight' into 'master'
Move eye sight and scale in body.rs

See merge request veloren/veloren!1519
2020-11-18 00:13:14 +00:00
Snowram
39479863f5 Addressed more comments 2020-11-17 23:54:01 +01:00
Snowram
dd58784336 Makes basic beam Y offset depend on body scale 2020-11-17 23:27:13 +01:00
Snowram
9966f08e78 Addressed comments 2020-11-17 23:27:13 +01:00
Snowram
4034f7e790 Move eye sight and scale in body.rs, mounts tweaks 2020-11-17 23:27:13 +01:00
Imbris
0592cdf1ee Merge branch 'xvar/move-waypoint-persistence-to-stats-table' into 'master'
Moved waypoint persistence to new waypoint column on stats table

See merge request veloren/veloren!1531
2020-11-17 09:02:42 +00:00
Ben Wallis
4730b5f023 Moved waypoint persistence to new waypoint column on stats table 2020-11-17 07:51:50 +00:00
Samuel Keiffer
5189394cbb Merge branch 'knarkzel/fix-op-hammer' into 'master'
Don't allow spamming hammer or bow special when stamina is 0

See merge request veloren/veloren!1530
2020-11-16 16:45:57 +00:00
Knarkzel
d91577c481 added to changelog 2020-11-16 17:01:55 +01:00
Knarkzel
497c873a3b dont allow spam op hammer when stamina is 0 2020-11-16 17:00:04 +01:00
Imbris
8f12e0b221 Merge branch 'imbris/temp-fix' into 'master'
Temp fix for the /home command

See merge request veloren/veloren!1528
2020-11-16 02:58:28 +00:00
Imbris
3bf9cac0e6 Temp fix for the home command 2020-11-15 20:40:12 -05:00
Samuel Keiffer
b8a6b82fad Merge branch 'knarkzel/persist-combo-roll' into 'master'
added persistent combo after roll when rolling mid-combo, Closes #826

Closes #826

See merge request veloren/veloren!1524
2020-11-16 00:10:18 +00:00
Marcel
882c03af2e Merge branch 'xvar/fix-network-tests-firewall-prompts' into 'master'
Replaced usage of 0.0.0.0 with 127.0.0.1 in network tests to prevent firewall prompts when running tests on Windows

See merge request veloren/veloren!1525
2020-11-15 22:50:22 +00:00
Odd-Harald Lillestø Myhren
7d9c5f3d8c Merge branch 'master' into 'knarkzel/persist-combo-roll'
# Conflicts:
#   CHANGELOG.md
2020-11-15 22:37:30 +00:00
Knarkzel
8503158efb add new was_combo field to test 2020-11-15 23:49:01 +01:00
Joshua Barretto
78f1aea40e Merge branch 'zesterer/resolution-scaling' into 'master'
Upscaling support

See merge request veloren/veloren!1523
2020-11-15 22:18:35 +00:00
Joshua Barretto
49348f928d Upscaling support 2020-11-15 22:18:35 +00:00
Knarkzel
1cbfcd2a0e added persistent combo roll entry to changelog 2020-11-15 23:12:05 +01:00
Ben Wallis
8e9cfb0d06 Replaced usage of 0.0.0.0 with 127.0.0.1 in network tests to prevent firewall prompt on Windows when running tests 2020-11-15 22:10:31 +00:00
Knarkzel
a522f13415 added persist combo counter on roll when mid-combo 2020-11-15 23:08:14 +01:00
Samuel Keiffer
3821f93def Merge branch 'sam/knockback-fix' into 'master'
Campfire knockback fix

See merge request veloren/veloren!1522
2020-11-15 18:12:21 +00:00
Sam
2f22deefda Campfires can no longer be yeeted by arrows. 2020-11-15 11:13:03 -06:00
Imbris
af573fe489 Merge branch 'imbris/fix-font-selection' into 'master'
Properly use localization specified fonts, fix swedish translation by adding...

Closes #834

See merge request veloren/veloren!1521
2020-11-15 03:18:29 +00:00
Imbris
d8d7ede9c8 Properly use localization specified fonts, fix swedish translation by adding other fonts to the font mapping list 2020-11-14 21:31:31 -05:00
Joshua Barretto
3fc9f6221a Merge branch 'treeco/home-removes-waypoint' into 'master'
Made home command reset waypoint to world spawn

See merge request veloren/veloren!1520
2020-11-15 02:12:12 +00:00
Imbris
610e74e7e7 Merge branch 'imbris/save-selected-char' into 'master'
Save the selected character, deselect character when deleting, auto select newly created character

See merge request veloren/veloren!1516
2020-11-15 01:40:44 +00:00
Treeco
4ed20a8b8d Made home command reset waypoint to world spawn 2020-11-15 01:06:27 +00:00
Imbris
dab3f01c20 Save the selected character, deselect character when deleting, auto select newly created character 2020-11-14 19:17:42 -05:00
Imbris
71e6001994 Merge branch 'imbris/fix-torvus' into 'master'
Send ability map from the server to the client on connection instead of loading from the assets

See merge request veloren/veloren!1518
2020-11-14 22:15:03 +00:00
Imbris
a5a51b91ef Send ability map from the server to the client on connection instead of loading from the assets 2020-11-14 16:07:07 -05:00
Joshua Barretto
f52ec169c2 Merge branch 'xvar/fix-character-switch-persistence' into 'master'
Fixed character data not being persisted on character switch

See merge request veloren/veloren!1515
2020-11-14 15:02:12 +00:00
Ben Wallis
896a703717 Fixed character data not being persisted on character switch 2020-11-14 13:36:54 +00:00
Samuel Keiffer
bc874905de Merge branch 'jasonkjl72/axe-spin-adjustment' into 'master'
Make Axe Spin More Realistic

Closes #827

See merge request veloren/veloren!1510
2020-11-14 04:15:50 +00:00
Imbris
797a115fad Merge branch 'imbris/fix-7' into 'master'
Fix panic on minimizing window before the game starts up

See merge request veloren/veloren!1514
2020-11-14 03:30:13 +00:00
Imbris
201a6c6799 Merge branch 'imbris/fix-6' into 'master'
Fix issue where ui scale in the login menu was not updated when changed in-game

Closes #578

See merge request veloren/veloren!1513
2020-11-14 02:49:41 +00:00
Jason Lee
10189aad74 Make Axe Spin More Realistic 2020-11-13 21:49:12 -05:00
Imbris
521e54353c Fix panic on minimizing window before the game starts up 2020-11-13 21:09:19 -05:00