Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,803 Commits 151 Branches 18 Tags
Commit Graph

5803 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Barretto
f74dfbb9b6 Initial NPC region spawning work 2020-11-21 14:33:30 +01:00
Imbris
62be9ec225 Merge branch 'ubruntu/system-independent-itempaths' into 'master' 
Ubruntu/system independent itempaths

See merge request veloren/veloren!1538
 2020-11-21 04:08:12 +00:00
ubruntu
b0aa0574a1 Ubruntu/system independent itempaths 2020-11-21 04:08:11 +00:00
Imbris
dcdfde18dc Merge branch 'imbris/fix-apple-bug' into 'master' 
Fix issues with not being able to grab highlighted apples by unifying distance checking

Closes #820

See merge request veloren/veloren!1532
 2020-11-21 02:55:09 +00:00
Imbris
925a7af09c Rename pos fields of Cube and Cylinder for enhanced clarity and added a few tests to the find_dist module 2020-11-20 20:51:44 -05:00
Samuel Keiffer
fa75636f9e Merge branch 'sam/interrupting-rolls' into 'master' 
Rolling can now interrupt any attack.

See merge request veloren/veloren!1537
 2020-11-20 18:37:44 +00:00
Monty Marz
ba72a0b877 Merge branch 'disable-camera-turning-in-char-selection-until-the-world-is-ready-for-it-' into 'master' 
Disable cam rotation in char selection until we have generated world in the background

See merge request veloren/veloren!1536
 2020-11-20 18:11:46 +00:00
Sam
62c5233b09 Swapped bool values, only_roll changed to attack_interrupts. 2020-11-20 11:54:56 -06:00
Sam
aa13610cf1 Fixed audio test, added changelog line. 2020-11-20 11:50:01 -06:00
Sam
abc1dd9997 Rolling can now interrupt any attack. 2020-11-20 11:30:48 -06:00
Monty Marz
46f33cdc64 Update simple.rs 2020-11-20 17:56:26 +01:00
Joshua Barretto
7c1b7d1fb0 Merge branch 'Awkor/rotate-camera-character-selection' into 'master' 
Implement #334 - Enable camera rotation in character selection screen

Closes #334

See merge request veloren/veloren!1377
 2020-11-20 16:32:39 +00:00
Joshua Barretto
121254f317 Merge branch 'knarkzel/add-norwegian' into 'master' 
RE: Add Norwegian language

See merge request veloren/veloren!1535
 2020-11-20 15:50:20 +00:00
Knarkzel
b2c298a64d added norwegian 2020-11-20 16:49:32 +01:00
Marcel
f698719e1f Merge branch 'james/audio-fix' into 'master' 
Fix audio disabling

See merge request veloren/veloren!1534
 2020-11-20 00:39:39 +00:00
jiminycrick
b669b8d82e Fix audio disabling 2020-11-19 10:46:31 -08:00
Justin Shipsey
699f0d9af7 Merge branch 'snowram/new-npcs' into 'master' 
Adds new npcs

See merge request veloren/veloren!1496
 2020-11-19 06:04:42 +00:00
jiminycrick
159b725220 Switched out wind sfx 2020-11-18 17:07:40 -08:00
Snowram
c53aff7ba7 Improves bipedlarge and theropod anims, balance tweaks 2020-11-19 00:56:50 +01:00
Snowram
e561172c49 Makes mindflayers spawn in dungeons 2020-11-19 00:53:21 +01:00
Snowram
377eac27a9 Adds 3 new npcs 2020-11-19 00:53:17 +01:00
Snowram
10577e7e90 Adds 2 new npcs, some models tweaks 2020-11-19 00:53:13 +01:00
Snowram
ab63e4cd0c Adds mindflayer npc 2020-11-19 00:53:09 +01:00
Snowram
14f6f9165f Adds new animals 2020-11-19 00:53:02 +01:00
Joshua Barretto
8bb140e998 Merge branch 'james/biome-specific-music' into 'master' 
Biome/site specific music and ambient sfx

See merge request veloren/veloren!1488
 2020-11-18 22:53:33 +00:00
jiminycrick
969c6f005c Address comment 2020-11-18 13:31:13 -08:00
jiminycrick
f0eb58d88d Addressed comments and fixed pipeline 2020-11-18 13:31:13 -08:00
jiminycrick
080bd7c679 Fully move sfx away from ECS event bus 2020-11-18 13:31:13 -08:00
jiminycrick
41d3322fb2 Initial work to move combat sfx to outcomes 2020-11-18 13:31:12 -08:00
jiminycrick
9c2f8100a3 Made level up sounds use outcomes instead of emitting an event 2020-11-18 13:31:12 -08:00
jiminycrick
3f18fc8d02 Moved functions to client out of audio and generalized non-positional ambient sfx 2020-11-18 13:31:12 -08:00
jiminycrick
2ca7bde156 Beginning to address comments 2020-11-18 13:31:12 -08:00
jiminycrick
4745d01515 Biome definition tweaks and more sfx 2020-11-18 13:31:12 -08:00
jiminycrick
ed162f3d05 fix rebase 2020-11-18 13:31:12 -08:00
jiminycrick
e440679252 Quadraped footsteps and songs in biomes 2020-11-18 13:31:12 -08:00
jiminycrick
ec25229e6e Audio test fixes 2020-11-18 13:31:12 -08:00
jiminycrick
373081b0a9 Even more clippy fixes 2020-11-18 13:31:12 -08:00
jiminycrick
9be8517d51 More clippy fixes 2020-11-18 13:31:12 -08:00
jiminycrick
ce0fd60fc8 Fix rebase 2020-11-18 13:31:12 -08:00
jiminycrick
30a2476223 Comment out audio device picker 2020-11-18 13:31:12 -08:00
jiminycrick
b27182d68a Clippy fixes 2020-11-18 13:31:12 -08:00
jiminycrick
e3dd47cd74 Getting merge ready minus device picker 2020-11-18 13:31:12 -08:00
jiminycrick
67443fba16 Wind transition smoothing 2020-11-18 13:31:12 -08:00
jiminycrick
9779cb82f2 Underwater and cave reverb 2020-11-18 13:31:12 -08:00
jiminycrick
26465197cb Broken wind implementation 2020-11-18 13:31:12 -08:00
jiminycrick
f3253d858f Snow footsteps 2020-11-18 13:31:12 -08:00
jiminycrick
24f76406a8 River water sfx 2020-11-18 13:31:12 -08:00
jiminycrick
64c299abb4 Re-added device selector to settings with new rodio 2020-11-18 13:31:12 -08:00
jiminycrick
a02a5d63c3 Hackily upgraded rodio and cpal to 0.13 2020-11-18 13:31:12 -08:00
jiminycrick
ca7399b547 Made biome probabilities neater 2020-11-18 13:31:12 -08:00