5820 Commits

Author SHA1 Message Date
Joshua Barretto
e9110f27f2 Merge branch 'zesterer/fix-entity-despawning' into 'master'
Allow entities to despawn without a home chunk

See merge request veloren/veloren!1544
2020-11-23 16:14:13 +00:00
Joshua Barretto
dfeae0f6fc Allow entities to despawn without a home chunk 2020-11-23 15:16:07 +00:00
Joshua Barretto
97b9c32110 Merge branch 'knarkzel/fix-npc-spawn' into 'master'
Fix bug that caused campfires and other stuff to duplicate

See merge request veloren/veloren!1543
2020-11-22 21:03:06 +00:00
Odd-Harald Lillestø Myhren
23e213cd4a Fix bug that caused campfires and other stuff to duplicate 2020-11-22 21:03:06 +00:00
Imbris
1cb57dda8a Merge branch 'imbris/spiff-up' into 'master'
Fix some things

See merge request veloren/veloren!1541
2020-11-22 20:49:20 +00:00
Imbris
4f622b122e Attempt to fix ui bug with changing screens causing inventory slots and such to disappear, presumably due to dpi differences 2020-11-22 14:22:39 -05:00
Imbris
1df4e8098b Move tracy frame markers to proper locations, add a few spans 2020-11-22 14:22:39 -05:00
Imbris
d3f766aa3f Log errors occuring when client keeps retrying connection to the server 2020-11-22 03:54:19 -05:00
Imbris
94ff6e6596 Remove accidental leftover dbg 2020-11-22 02:58:44 -05:00
Snowram
df5ae483df Merge branch 'zesterer/better-npc-spawning' into 'master'
Initial NPC region spawning work

See merge request veloren/veloren!1418
2020-11-21 15:54:50 +00:00
Monty Marz
a2d3d167fd Conversion to struct to please clippy 2020-11-21 15:42:43 +01:00
Snowram
6f57aa890e Refines spawn values, add gradients to debug_column 2020-11-21 14:33:35 +01:00
Snowram
7bb37bc0c3 Make /debug_column pick current location as default 2020-11-21 14:33:34 +01:00
Snowram
782c1e759d Added remaining creature spawns 2020-11-21 14:33:33 +01:00
Joshua Barretto
7c3f77868e Added more creature spawns 2020-11-21 14:33:32 +01:00
Joshua Barretto
0ce3e19297 Don't despawn entities so eagerly 2020-11-21 14:33:31 +01:00
Joshua Barretto
972bc8e5e2 Random orientation for spawned NPCs 2020-11-21 14:33:31 +01:00
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