3799 Commits

Author SHA1 Message Date
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
Joshua Barretto
82a9c17558 Added reseeding for sites 2020-04-25 21:44:23 +01:00
Pfauenauge90
f2f413cc34 sprites VD slider visuals 2020-04-25 21:44:23 +01:00
jshipsey
6feb375da4 fix for hollow chests 2020-04-25 21:44:23 +01:00
Joshua Barretto
17051d555e Fixed figure update rate at a distance 2020-04-25 21:44:23 +01:00
Joshua Barretto
91dc414e32 Added LoD for figures and reduced update rates for far figures 2020-04-25 21:44:23 +01:00
Joshua Barretto
7eedb6e09f Better LoD distance scaling 2020-04-25 21:44:23 +01:00
Joshua Barretto
371d893ddd Massively reduced 'popping' of LoD terrain sprites 2020-04-25 21:44:23 +01:00
Joshua Barretto
c1c7642ac9 Fixed boundary meshing issue for scaled terrain sprites 2020-04-25 21:44:23 +01:00
Joshua Barretto
572f6c76b0 Properly fixed all gaps on positive bound for scaled volumes 2020-04-25 21:44:23 +01:00
Joshua Barretto
064973d90d Fixed gaps in LoD sprites 2020-04-25 21:44:23 +01:00
Joshua Barretto
63b5c7c86d Added terrain sprite LoD 2020-04-25 21:44:23 +01:00
Joshua Barretto
0b345a6b5e Merge branch 'CapsizeGlimmer/sudo_command' into 'master'
Implement /sudo command

See merge request veloren/veloren!940
2020-04-25 18:00:09 +00:00
CapsizeGlimmer
367c424b3d Fixed mutability in /sudo 2020-04-25 13:18:29 -04:00
Songtronix
db2d233dbc Merge branch 'songtronix/fix-toogle' into 'master'
fix: misspelling in english translation

See merge request veloren/veloren!943
2020-04-24 17:05:46 +00:00
Songtronix
4152181264 fix: misspelling in english translation 2020-04-24 18:30:58 +02:00
CapsizeGlimmer
958480ac21 /sudo player /kill now lists the sudoer as killing the target 2020-04-24 12:17:56 -04:00
CapsizeGlimmer
d5e5d5a4d8 Implement /sudo command 2020-04-23 22:36:19 -04:00
Monty Marz
91cc6dc683 Merge branch 'treeco/camera-smoothing-setting' into 'master'
Add camera smoothing setting

See merge request veloren/veloren!936
2020-04-23 22:59:35 +00:00
Treeco
0751ac4c0b Add camera smoothing setting 2020-04-23 22:59:34 +00:00
Joshua Barretto
c79c6e1bf1 Merge branch 'zesterer/civsim' into 'master'
fmt

See merge request veloren/veloren!939
2020-04-23 21:10:00 +00:00
Joshua Barretto
380092080b fmt 2020-04-23 22:10:05 +01:00
Joshua Barretto
43e2e84288 Merge branch 'zesterer/civsim' into 'master'
Added sites to the map

See merge request veloren/veloren!938
2020-04-23 21:06:21 +00:00