Monty Marz
06867348fc
Fix animals not attacking
2020-05-04 16:59:32 +00:00
Monty Marz
a52face268
Merge branch 'CapsizeGlimmer/functional_lanterns' into 'master'
...
Equipped lanterns now provide an illumination effect.
See merge request veloren/veloren!935
2020-05-04 15:15:31 +00:00
CapsizeGlimmer
fe9deb29af
Equipped lanterns now provide an illumination effect.
2020-05-04 15:15:31 +00:00
Acrimon
fedf38ae8e
Merge branch 'admin-command-limit' into 'master'
...
Fix #542 - Impose limits on admin commands
Closes #542
See merge request veloren/veloren!963
2020-05-04 11:34:25 +00:00
protheory8
c5765cbb3c
Fix #542 - Impose limits on admin commands
2020-05-04 14:50:58 +05:00
Justin Shipsey
205813f50c
Merge branch 'SFX-Update' into 'master'
...
Added new SFX and adjusted sfx.ron
See merge request veloren/veloren!961
2020-05-04 06:16:12 +00:00
Julian
caa1af418d
Added new SFX and adjusted sfx.ron
...
New SFX sounds.
add_item.wav (Better fitting pickup sound)
drop_item.wav (New sound for dropping items)
open_inventory.wav (The old pickup sound, can be used for opening the bag but needs to be implemented)
sword_in.wav (Better fitting sound)
sowrd_out.wav (Better fitting sound)
Fixed the drop sfx sound in sfx.ron
Its the drop_item sound instead of a grass moving step.
2020-05-03 21:52:11 +02:00
Monty Marz
5f9635823c
Merge branch 'cultists-hotfix' into 'master'
...
Shoulder offsets, meta.ron versioning
See merge request veloren/veloren!959
2020-05-01 21:27:12 +00:00
Monty Marz
20aee17e94
Shoulder offsets, meta.ron versioning
2020-05-01 21:27:12 +00:00
Monty Marz
bec2c26ade
Merge branch 'pfau/assets' into 'master'
...
Villagers and Cultists
See merge request veloren/veloren!957
2020-04-30 20:43:24 +00:00
Monty Marz
65151bf175
Villagers and Cultists
2020-04-30 20:43:24 +00:00
Monty Marz
46b8f49231
Merge branch 'zesterer/world-changes' into 'master'
...
Dungeon entrances
See merge request veloren/veloren!955
2020-04-29 15:36:57 +00:00
Pfauenauge90
6bdd8471a9
cleanup, more dungeon entrances
2020-04-29 17:01:35 +02:00
Joshua Barretto
3a07c69817
Updated changelog
2020-04-29 17:01:35 +02:00
Joshua Barretto
67bd4ba4c0
Better dungeon waypoint placement
2020-04-29 17:01:35 +02:00
Joshua Barretto
5219949e51
Fixed dungeon offsets
2020-04-29 17:01:34 +02:00
Joshua Barretto
70d798bafd
Added dungeon entrances
2020-04-29 17:01:34 +02:00
Joshua Barretto
d7a26284b1
Merge branch 'non-integer-offsets' into 'master'
...
Non integer offsets
See merge request veloren/veloren!956
2020-04-29 14:45:21 +00:00
Joshua Barretto
fde7e6fedc
Added 1 extra bit per figure vertex position component, resolved char screen bug
2020-04-29 15:22:08 +01:00
Marcel Märtens
1c5c0adf15
Allow for 0.5 offsets in figures
2020-04-29 14:10:46 +02:00
Justin Shipsey
da67b53acb
Merge branch 'snowram/animals' into 'master'
...
new animals
See merge request veloren/veloren!954
2020-04-28 03:13:23 +00:00
Justin Shipsey
61c0c2991d
new animals
2020-04-28 03:13:23 +00:00
Justin Shipsey
2ee86ff2c6
Merge branch 'slipped/attributes' into 'master'
...
skel attribute transfer
See merge request veloren/veloren!949
2020-04-27 05:11:34 +00:00
Justin Shipsey
cc989de3f5
skel attribute transfer
2020-04-27 05:11:34 +00:00
Joshua Barretto
f6b60fcf63
Merge branch 'zesterer/phys-fixes' into 'master'
...
Added Colliders, made projectiles point particles
See merge request veloren/veloren!947
2020-04-26 18:24:33 +00:00
Joshua Barretto
5bfeabd03a
Fixed unit tests
2020-04-26 18:50:21 +01:00
Joshua Barretto
f722a67911
fmt
2020-04-26 17:56:09 +01:00
Joshua Barretto
da11d54b6c
Fixed projectile solid collisions
2020-04-26 17:56:09 +01:00
Joshua Barretto
3370d0a08f
Stopped velocity when point particles hit walls
2020-04-26 17:56:09 +01:00
Joshua Barretto
0763e6250f
Fixed logic issue with sticky objects
2020-04-26 17:56:09 +01:00
Joshua Barretto
f4de3d0806
Added on_ceiling check for sticky entities
2020-04-26 17:56:09 +01:00
Joshua Barretto
f027114507
Added Colliders, made projectiles point particles
2020-04-26 17:56:09 +01:00
Monty Marz
7c4effd1a1
Merge branch 'pfau/ui-fixes' into 'master'
...
UI Fixes
See merge request veloren/veloren!946
2020-04-26 01:44:56 +00:00
Monty Marz
4f8076c2ba
UI Fixes
2020-04-26 01:44:56 +00:00
Justin Shipsey
95b04cc5fe
Merge branch 'slipped/golem' into 'master'
...
body/anim tweaks
See merge request veloren/veloren!945
2020-04-26 01:09:04 +00:00
Justin Shipsey
82bafaaef8
body/anim tweaks
2020-04-26 01:09:03 +00:00
Joshua Barretto
49a629c7ff
Merge branch 'zesterer/perf' into 'master'
...
Performance improvements, LoD system for terrain sprites and figures
See merge request veloren/veloren!944
2020-04-25 21:15:32 +00:00
Joshua Barretto
ff164e90e0
Updated changelog
2020-04-25 21:44:43 +01:00
Joshua Barretto
47732f91d6
Clean up reexport
2020-04-25 21:44:23 +01:00
Joshua Barretto
a3da70bca4
Prevented windows spawning inside houses
2020-04-25 21:44:23 +01:00
Joshua Barretto
b8a880b2ae
Better LoD variable names
2020-04-25 21:44:23 +01:00
Joshua Barretto
fe53dd1458
Better scaled rounding
2020-04-25 21:44:23 +01:00
Joshua Barretto
0a71e8cdaf
Added extra LoD level to terrain sprites
2020-04-25 21:44:23 +01:00
Joshua Barretto
6bfecfb577
Reduced scaling size inflation
2020-04-25 21:44:23 +01:00
Joshua Barretto
091933d5b0
Made GPU bone updates more conservative for moar fps
2020-04-25 21:44:23 +01:00
Joshua Barretto
b6b8b5363f
Squashed figure vertices for better performance
2020-04-25 21:44:23 +01:00
Joshua Barretto
0249facbd6
Reduced size of terrain sprite vertices
2020-04-25 21:44:23 +01:00
Joshua Barretto
3d5ca63a55
Added configurable sprite view distance, minor bug fixes
2020-04-25 21:44:23 +01:00
Joshua Barretto
382b0667c1
Implemented Treeco's z-only LoD suggestion
2020-04-25 21:44:23 +01:00
Joshua Barretto
ab2f1455a7
Harbarboofarfoobar
2020-04-25 21:44:23 +01:00
