Commit Graph

3858 Commits

Author SHA1 Message Date
Joshua Yanovski
ef67bd58ba Experimental underwater lighting. 2020-04-28 20:49:03 +02:00
Joshua Yanovski
2c5ad9d076 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-04-27 22:35:24 +02:00
Joshua Yanovski
7482798354 Replace discard in figure-frag. 2020-04-27 21:59:55 +02:00
Joshua Yanovski
d83b4ae69b Fix sprite lighting, HDR from focus_pos. 2020-04-27 18:45:57 +02:00
Joshua Yanovski
0594238004 Proper HDR from point lights. 2020-04-27 18:14:10 +02:00
Joshua Yanovski
48c93d2b41 Brighter ambiance, darker LOD shadows. 2020-04-27 14:01:43 +02:00
Joshua Yanovski
e0452e895c More proper HDR. 2020-04-27 13:13:23 +02: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 Yanovski
4c6da3ed16 Trying LOD noise. 2020-04-27 00:13:10 +02:00
Joshua Yanovski
682a3d74c8 Fix LOD heights in towns. 2020-04-26 23:11:08 +02:00
Joshua Yanovski
cc39e5734e More LOD fixes. 2020-04-26 21:01:23 +02: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 Yanovski
8116b21c2e I like this coloring. 2020-04-25 23:54:43 +02:00
Joshua Yanovski
bc2560ea90 Merge remote-tracking branch 'origin/master' into sharp/small-fixes 2020-04-25 23:48:33 +02: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
Joshua Barretto
ebd1537769 Fixed figure update rate at a distance 2020-04-25 21:44:23 +01:00
Joshua Barretto
39b88dbcb1 Added LoD for figures and reduced update rates for far figures 2020-04-25 21:44:23 +01:00
Joshua Barretto
3e62f7edc3 Better LoD distance scaling 2020-04-25 21:44:23 +01:00
Joshua Barretto
1d75f4815b Massively reduced 'popping' of LoD terrain sprites 2020-04-25 21:44:23 +01:00
Joshua Barretto
e498d78b6c Fixed boundary meshing issue for scaled terrain sprites 2020-04-25 21:44:23 +01:00
Joshua Barretto
59f4161f5c Properly fixed all gaps on positive bound for scaled volumes 2020-04-25 21:44:23 +01:00
Joshua Barretto
e84c2aa1db Fixed gaps in LoD sprites 2020-04-25 21:44:23 +01:00