Commit Graph

3078 Commits

Author SHA1 Message Date
Joshua Barretto
aab059a450 Added LoD slider 2020-02-24 15:14:06 +00:00
Joshua Barretto
779c36b538 Reduced cost of vertex pushing 2020-02-24 12:54:55 +00:00
Joshua Barretto
9fea150473 Fixed maths, improved LoD resolution 2020-02-24 12:38:53 +00:00
Joshua Barretto
5481df38fe Dynamically relocate LoD vertices to enhance details 2020-02-24 11:22:50 +00:00
Joshua Barretto
a3e36a50ab Simpler terrain spiral rendering 2020-02-23 18:13:51 +00:00
Joshua Barretto
255f450ae9 Better LoD precision 2020-02-23 16:53:17 +00:00
Joshua Barretto
3d027aebe8 Better falloff 2020-02-23 16:04:03 +00:00
Joshua Barretto
be775c9484 Applied good ideas from experimental branch 2020-02-23 15:30:45 +00:00
Joshua Barretto
58587b6854 Minor fixes to LoD merging 2020-02-21 16:15:13 +00:00
Joshua Barretto
7b42aebd70 Capped LoD dragging 2020-02-21 15:04:44 +00:00
Joshua Barretto
8aafc559f8 Better blending between LoD and terrain border 2020-02-21 14:54:37 +00:00
Joshua Barretto
edd3455d51 Fixed LoD z depth, added sea level offset 2020-02-21 14:40:19 +00:00
Joshua Barretto
b9b0674462 Better LoD smoothing 2020-02-21 14:27:43 +00:00
Joshua Barretto
2400786c13 Use world map as LoD source 2020-02-21 13:48:40 +00:00
Joshua Barretto
dbf650f504 Better clouds at distance 2020-02-21 11:12:26 +00:00
Joshua Barretto
5e6f81b86c sync 2020-02-21 11:12:25 +00:00
Joshua Barretto
745e7540dd Improved cloud falloff mist, faster noise sampling 2020-02-21 11:12:02 +00:00
Joshua Barretto
f6a200d0cb Improved long-range depth precision, removed unnecessary LoD polygons 2020-02-21 11:12:02 +00:00
Joshua Barretto
63d1b2bb22 Working LoD shader 2020-02-21 11:12:02 +00:00
Joshua Barretto
f13d98ee3e LoD first attempt (stack overflow issue) 2020-02-21 11:10:16 +00:00
Justin Shipsey
13cbef7865 Merge branch 'shandley/weapon-wield-sfx' into 'master'
Add weapon wield/unwield sfx support

Closes #486

See merge request veloren/veloren!805
2020-02-21 02:56:54 +00:00
S Handley
9ab2833056 Add weapon wield/unwield sfx support 2020-02-21 02:56:54 +00:00
Monty Marz
2afdebbe47 Merge branch 'pfau/hairstyles' into 'master'
Orc hairstyles, several tiny UI fixes, fixed beard warnings

See merge request veloren/veloren!808
2020-02-20 10:32:05 +00:00
Monty Marz
2180040f70 Orc hairstyles, several tiny UI fixes, fixed beard warnings 2020-02-20 10:32:03 +00:00
Songtronix
2d0b5d514a Merge branch 'imarv/refactor-server-events' into 'master'
Move ServerEvents into own module

Closes #494

See merge request veloren/veloren!809
2020-02-19 18:30:53 +00:00
Marvin Altemeier
035d74f502 Move ServerEvents into own module 2020-02-18 20:51:10 +01:00
Monty Marz
4b3d61f41d Merge branch 'pfau/fix-fonts' into 'master'
Fix Fonts

See merge request veloren/veloren!806
2020-02-17 16:22:49 +00:00
Monty Marz
18f46a6f83 Fix Fonts 2020-02-17 16:22:49 +00:00
Imbris
633abcb058 Merge branch 'treeco/add-gamma-setting' into 'master'
Treeco/add gamma setting

Closes #312

See merge request veloren/veloren!797
2020-02-17 02:01:06 +00:00
Treeco
abe47d8621 Gamma setting now works 2020-02-17 00:46:31 +00:00
Treeco
aaf1de9f9b Added gamma setting, not hooked up yet 2020-02-16 20:32:17 +00:00
Forest Anderson
30ec2755fe Merge branch 'ender/configurable_fonts' into 'master'
Configurable fonts

See merge request veloren/veloren!778
2020-02-16 17:27:33 +00:00
Joshua Barretto
1ca026f56d Merge branch 'zesterer-master-patch-73879' into 'master'
Add a new name (to force the repo to update this file)

See merge request veloren/veloren!804
2020-02-16 15:11:57 +00:00
Joshua Barretto
31449db578 Add a new name (to force the repo to update this file) 2020-02-16 15:11:34 +00:00
Rémy PHELIPOT
98c37d0b28 [i18n] Configurable fonts
- Add font configuration in internationalization files
- Scale font size using a configurable ratio
- Add a script to identify translation item statuses using Git metadata
- Execute the i18n script in a new gitlab-ci step (delayed)
- Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended)
  to add some additional latin characters (mainly for French)
2020-02-16 16:02:38 +01:00
Monty Marz
26f670e5c3 Merge branch 'pfau/fix-healthbars' into 'master'
Fix healthbar background alignment

See merge request veloren/veloren!803
2020-02-16 10:58:44 +00:00
Monty Marz
90680d5490 Fix healthbar background alignment 2020-02-16 10:58:44 +00:00
Imbris
a08fc287ae Merge branch 'shandley/audio-channel-types' into 'master'
Use non-spatial audio sinks for music

Closes #463

See merge request veloren/veloren!794
2020-02-15 21:30:44 +00:00
S Handley
b739623579 Split the audio channels into SFX and music channels. This makes the
Music Channel for exploration music a basic Sink without spatial audio
functionality, which is not required.
2020-02-15 21:30:44 +00:00
Forest Anderson
f79b26d043 Merge branch 'angelonfira/add-ci-tarpaulin-workaround' into 'master'
Try tarpaulin 4 times before failing

See merge request veloren/veloren!802
2020-02-15 20:57:53 +00:00
Forest Anderson
b481d3c747 Try tarpaulin 4 times before failing 2020-02-15 20:57:52 +00:00
Songtronix
3c1121261a Merge branch 'imarv/fix-give-exp' into 'master'
Fix /give_exp command an introduce /set_level

Closes #481 and #460

See merge request veloren/veloren!793
2020-02-15 17:45:29 +00:00
Marvin Altemeier
a89003cbfa resolve #481 - add /set_level command 2020-02-14 22:11:41 +01:00
Marvin Altemeier
bfdfd87d89 change order of /give_exp arguments 2020-02-14 22:11:20 +01:00
Marvin Altemeier
787e5a6e49 fix #460 - /give_exp targeting wrong player 2020-02-14 22:11:20 +01:00
Imbris
6424ca7947 Merge branch 'sharp/spawn-single-species' into 'master'
Allow spawning individual species with /spawn.

See merge request veloren/veloren!780
2020-02-14 04:44:34 +00:00
Joshua Yanovski
8a9d4012fa Allow spawning individual species with /spawn.
To get the old behavior, you now need to refer to the internal keywords
(like "bird_medium" or "quadruped_small") rather than the old friendly
names (like "duck" or "pig"), as the latter generate single species now.
2020-02-14 03:12:37 +01:00
Ben Simpson
636bf7d343 Merge branch 'expandedreality/energy-regen' into 'master'
Energy now does not regen when climbing,gliding,and swimming

Closes #483

See merge request veloren/veloren!800
2020-02-14 01:15:47 +00:00
Ben Simpson
c427f2298e Energy now does not regen when climbing,gliding,and swimming 2020-02-13 18:46:01 -06:00
Marcel
1c6460f0ef Merge branch 'angelonfira/test-action-macosx-build' into 'master'
Angelonfira/test action macosx build

See merge request veloren/veloren!796
2020-02-14 00:19:06 +00:00