Imbris
|
36efb11b03
|
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
|
7ba2efcde2
|
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
|
1355c1e8f5
|
Move tracy frame markers to proper locations, add a few spans
|
2020-11-22 14:22:39 -05:00 |
|
Imbris
|
82b95974f1
|
Log errors occuring when client keeps retrying connection to the server
|
2020-11-22 03:54:19 -05:00 |
|
Imbris
|
4e60d19762
|
Remove accidental leftover dbg
|
2020-11-22 02:58:44 -05:00 |
|
Snowram
|
23912bd5f2
|
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
|
8235e94aa4
|
Conversion to struct to please clippy
|
2020-11-21 15:42:43 +01:00 |
|
Snowram
|
a939eac30d
|
Refines spawn values, add gradients to debug_column
|
2020-11-21 14:33:35 +01:00 |
|
Snowram
|
2b08e8b931
|
Make /debug_column pick current location as default
|
2020-11-21 14:33:34 +01:00 |
|
Snowram
|
febe79e602
|
Added remaining creature spawns
|
2020-11-21 14:33:33 +01:00 |
|
Joshua Barretto
|
2ae51de7f0
|
Added more creature spawns
|
2020-11-21 14:33:32 +01:00 |
|
Joshua Barretto
|
bb6ca9fcba
|
Don't despawn entities so eagerly
|
2020-11-21 14:33:31 +01:00 |
|
Joshua Barretto
|
87edbf02ab
|
Random orientation for spawned NPCs
|
2020-11-21 14:33:31 +01:00 |
|
Joshua Barretto
|
97ec94fd3d
|
Initial NPC region spawning work
|
2020-11-21 14:33:30 +01:00 |
|
Imbris
|
2e94a63246
|
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
|
198c59d2df
|
Ubruntu/system independent itempaths
|
2020-11-21 04:08:11 +00:00 |
|
Imbris
|
e72c69ca41
|
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
|
ea275e320f
|
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
|
435d354dad
|
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
|
2b4e1ee964
|
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
|
c00720fb44
|
Swapped bool values, only_roll changed to attack_interrupts.
|
2020-11-20 11:54:56 -06:00 |
|
Sam
|
987df30dc4
|
Fixed audio test, added changelog line.
|
2020-11-20 11:50:01 -06:00 |
|
Sam
|
e62960e75d
|
Rolling can now interrupt any attack.
|
2020-11-20 11:30:48 -06:00 |
|
Monty Marz
|
dd338eb142
|
Update simple.rs
|
2020-11-20 17:56:26 +01:00 |
|
Joshua Barretto
|
8981dce4c9
|
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
|
9c1a8a7fc3
|
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
|
7a917f87e1
|
added norwegian
|
2020-11-20 16:49:32 +01:00 |
|
Marcel
|
d369e8a7c9
|
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
|
3ef00c4e76
|
Fix audio disabling
|
2020-11-19 10:46:31 -08:00 |
|
Justin Shipsey
|
ea72e0952d
|
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
|
9272eee55b
|
Switched out wind sfx
|
2020-11-18 17:07:40 -08:00 |
|
Snowram
|
d98bfa72ad
|
Improves bipedlarge and theropod anims, balance tweaks
|
2020-11-19 00:56:50 +01:00 |
|
Snowram
|
a773fd602a
|
Makes mindflayers spawn in dungeons
|
2020-11-19 00:53:21 +01:00 |
|
Snowram
|
b48de84f8c
|
Adds 3 new npcs
|
2020-11-19 00:53:17 +01:00 |
|
Snowram
|
44fe398ba3
|
Adds 2 new npcs, some models tweaks
|
2020-11-19 00:53:13 +01:00 |
|
Snowram
|
42d2108c39
|
Adds mindflayer npc
|
2020-11-19 00:53:09 +01:00 |
|
Snowram
|
9bfccd42d3
|
Adds new animals
|
2020-11-19 00:53:02 +01:00 |
|
Joshua Barretto
|
08c12b99f8
|
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
|
1ce3827e22
|
Address comment
|
2020-11-18 13:31:13 -08:00 |
|
jiminycrick
|
2d2f267907
|
Addressed comments and fixed pipeline
|
2020-11-18 13:31:13 -08:00 |
|
jiminycrick
|
3b47add55a
|
Fully move sfx away from ECS event bus
|
2020-11-18 13:31:13 -08:00 |
|
jiminycrick
|
b3aa454f8e
|
Initial work to move combat sfx to outcomes
|
2020-11-18 13:31:12 -08:00 |
|
jiminycrick
|
77d624f640
|
Made level up sounds use outcomes instead of emitting an event
|
2020-11-18 13:31:12 -08:00 |
|
jiminycrick
|
9c87345135
|
Moved functions to client out of audio and generalized non-positional ambient sfx
|
2020-11-18 13:31:12 -08:00 |
|
jiminycrick
|
a9711eea01
|
Beginning to address comments
|
2020-11-18 13:31:12 -08:00 |
|
jiminycrick
|
c44a9092d3
|
Biome definition tweaks and more sfx
|
2020-11-18 13:31:12 -08:00 |
|
jiminycrick
|
f0d14ebe20
|
fix rebase
|
2020-11-18 13:31:12 -08:00 |
|
jiminycrick
|
a684bc90fd
|
Quadraped footsteps and songs in biomes
|
2020-11-18 13:31:12 -08:00 |
|
jiminycrick
|
27dc43fe18
|
Audio test fixes
|
2020-11-18 13:31:12 -08:00 |
|
jiminycrick
|
ddd970b986
|
Even more clippy fixes
|
2020-11-18 13:31:12 -08:00 |
|