Commit Graph

3918 Commits

Author SHA1 Message Date
Acrimon
a22a71fd32 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
31c0457913 Fix #542 - Impose limits on admin commands 2020-05-04 14:50:58 +05:00
Justin Shipsey
c3c907f36d 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
cf9820e204 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
40ab94673e 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
f5c2341167 Shoulder offsets, meta.ron versioning 2020-05-01 21:27:12 +00:00
Monty Marz
250e4b3043 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
c792cc05a9 Villagers and Cultists 2020-04-30 20:43:24 +00:00
Monty Marz
dc95efa95b Merge branch 'zesterer/world-changes' into 'master'
Dungeon entrances

See merge request veloren/veloren!955
2020-04-29 15:36:57 +00:00
Pfauenauge90
1211a59f91 cleanup, more dungeon entrances 2020-04-29 17:01:35 +02:00
Joshua Barretto
2eac00405d Updated changelog 2020-04-29 17:01:35 +02:00
Joshua Barretto
44fc88b4d1 Better dungeon waypoint placement 2020-04-29 17:01:35 +02:00
Joshua Barretto
3e86b20c2c Fixed dungeon offsets 2020-04-29 17:01:34 +02:00
Joshua Barretto
d0b1c9eb6f Added dungeon entrances 2020-04-29 17:01:34 +02:00
Joshua Barretto
00f0a011de 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
1e91f7a0ab Added 1 extra bit per figure vertex position component, resolved char screen bug 2020-04-29 15:22:08 +01:00
Marcel Märtens
83af40a460 Allow for 0.5 offsets in figures 2020-04-29 14:10:46 +02:00
Justin Shipsey
19ce03d9ed Merge branch 'snowram/animals' into 'master'
new animals

See merge request veloren/veloren!954
2020-04-28 03:13:23 +00:00
Justin Shipsey
171e865f57 new animals 2020-04-28 03:13:23 +00:00
Justin Shipsey
303967a6f7 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
b4af588a00 skel attribute transfer 2020-04-27 05:11:34 +00:00
Joshua Barretto
dcc20590bf 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
390e46b752 Fixed unit tests 2020-04-26 18:50:21 +01:00
Joshua Barretto
bd58be9f58 fmt 2020-04-26 17:56:09 +01:00
Joshua Barretto
bd2093c819 Fixed projectile solid collisions 2020-04-26 17:56:09 +01:00
Joshua Barretto
58b30c4518 Stopped velocity when point particles hit walls 2020-04-26 17:56:09 +01:00
Joshua Barretto
b750b2b00c Fixed logic issue with sticky objects 2020-04-26 17:56:09 +01:00
Joshua Barretto
8e0f40c71e Added on_ceiling check for sticky entities 2020-04-26 17:56:09 +01:00
Joshua Barretto
eb23b0b2bd Added Colliders, made projectiles point particles 2020-04-26 17:56:09 +01:00
Monty Marz
6d7cb8654d 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
4521791591 UI Fixes 2020-04-26 01:44:56 +00:00
Justin Shipsey
1e64b1be5b 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
6fa13bcb7e body/anim tweaks 2020-04-26 01:09:03 +00:00
Joshua Barretto
e690efe717 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
237da2134d Updated changelog 2020-04-25 21:44:43 +01:00
Joshua Barretto
d2ab29b8bd Clean up reexport 2020-04-25 21:44:23 +01:00
Joshua Barretto
a1983712d3 Prevented windows spawning inside houses 2020-04-25 21:44:23 +01:00
Joshua Barretto
90de779559 Better LoD variable names 2020-04-25 21:44:23 +01:00
Joshua Barretto
8871cb2d29 Better scaled rounding 2020-04-25 21:44:23 +01:00
Joshua Barretto
93105105e0 Added extra LoD level to terrain sprites 2020-04-25 21:44:23 +01:00
Joshua Barretto
f34175a5a8 Reduced scaling size inflation 2020-04-25 21:44:23 +01:00
Joshua Barretto
8e95444d85 Made GPU bone updates more conservative for moar fps 2020-04-25 21:44:23 +01:00
Joshua Barretto
7208b37dc5 Squashed figure vertices for better performance 2020-04-25 21:44:23 +01:00
Joshua Barretto
37301706d4 Reduced size of terrain sprite vertices 2020-04-25 21:44:23 +01:00
Joshua Barretto
c05f4fe009 Added configurable sprite view distance, minor bug fixes 2020-04-25 21:44:23 +01:00
Joshua Barretto
8bf5709ddf Implemented Treeco's z-only LoD suggestion 2020-04-25 21:44:23 +01:00
Joshua Barretto
5bdc420726 Harbarboofarfoobar 2020-04-25 21:44:23 +01:00
Joshua Barretto
1feae79243 Added reseeding for sites 2020-04-25 21:44:23 +01:00
Pfauenauge90
3421b3d8da sprites VD slider visuals 2020-04-25 21:44:23 +01:00
jshipsey
feca113c86 fix for hollow chests 2020-04-25 21:44:23 +01:00