Commit Graph

404 Commits

Author SHA1 Message Date
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
S Handley
9ab2833056 Add weapon wield/unwield sfx support 2020-02-21 02:56:54 +00:00
Monty Marz
2180040f70 Orc hairstyles, several tiny UI fixes, fixed beard warnings 2020-02-20 10:32:03 +00:00
Monty Marz
18f46a6f83 Fix Fonts 2020-02-17 16:22:49 +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
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
90680d5490 Fix healthbar background alignment 2020-02-16 10:58:44 +00:00
Joshua Yanovski
e524e86090 Merge branch 'sharp/zoom-minimap' into 'master'
Minimap rotation, zoom, orientation indicator, Mainmap changes & indicator

See merge request veloren/veloren!784
2020-02-06 17:34:32 +00:00
Monty Marz
93d7c67cdc Hack to allow minimap rotation.
Currently it just always rotates towards the camera, but it wouldn't be
hard to create a config option that swaps out the rotation of the
indicator and the map.
2020-02-06 17:34:32 +00:00
Joshua Barretto
e520712077 Minor performance improvements 2020-02-04 22:58:56 +00:00
timokoesters
0bc07a0835 Merge remote-tracking branch 'origin/master' into clientstates 2020-02-03 22:02:32 +01:00
S Handley
b7ce91fead Move music under audio
Also add some blank time after each track so that we get some silence
between tracks.
2020-02-03 11:55:32 +00:00
Vechro
377433c2fc Get abs value of maxd and mind 2020-01-31 12:12:57 +02:00
Joshua Barretto
faa86226c7 Collars 2020-01-29 12:01:28 +00:00
Justin Shipsey
908e099aa5 minor anim tweaks 2020-01-29 06:38:08 +00:00
Rémy PHELIPOT
ce54f27531 Add missing translations 2020-01-27 20:34:36 +01:00
Rémy PHELIPOT
69cc30343a Fix disclaimer text 2020-01-27 19:59:17 +01:00
Rémy PHELIPOT
c7271d43f1 Improve French translation 2020-01-27 19:59:17 +01:00
Rémy PHELIPOT
8946ed8d82 Add missing translations in voxygen
Fix #436
2020-01-27 19:59:17 +01:00
Joshua Barretto
8aa1970fdf Merge branch 'treeco/fix-zoom' into 'master'
Made depths behave nicer when zoomed really far out

See merge request veloren/veloren!766
2020-01-27 16:48:16 +00:00
Treeco
6ada176e54 Bumped up the numbers further, behaves nicer still 2020-01-27 14:28:20 +00:00
Justin Shipsey
53e57cb5dc quad_medium animation 2020-01-27 14:16:23 +00:00
Treeco
7334f9782c Made depths behave nicer when zoomed really far out 2020-01-27 12:12:38 +00:00
Joshua Barretto
4eb5b76d5f Added point light ambiance 2020-01-27 10:58:33 +00:00
Monty Marz
80bf0d5698 Change desert sprite colours to fit the ground better 2020-01-27 10:41:07 +00:00
Joshua Barretto
e45d46ddf7 Merge branch 'zesterer/small-fixes' into 'master'
Star fixes

See merge request veloren/veloren!762
2020-01-27 02:29:05 +00:00
Joshua Barretto
d2e0445b34 Added point light ambiance 2020-01-27 01:47:23 +00:00
Joshua Barretto
115ecf15d3 Made stars spin with sun and moon 2020-01-27 01:22:07 +00:00
Joshua Barretto
966a61ad42 Stopped stars popping into existence 2020-01-27 01:03:55 +00:00
Monty Marz
981b55837a fix typo in en.ron, fixed unfinished weapons dropping from chests 2020-01-26 22:57:06 +00:00
Pfauenauge90
9ee72eb810 changed death message 2020-01-26 12:52:32 +00:00
Joshua Barretto
11193a692a Better neutral AI, initial waypoint objects 2020-01-26 12:52:28 +00:00
Joshua Barretto
7167320c92 Fixed shadows, better pathfinding cap 2020-01-26 12:52:28 +00:00
Monty Marz
49071400d2 Fix: Healthbars size 2020-01-26 01:19:36 +00:00
Justin Shipsey
64690279af new mobs
alligators
2020-01-26 00:22:48 +00:00
Monty Marz
b583f60326 35 new ground sprites, UI fixes 2020-01-25 11:14:02 +00:00
Imbris
166aba61f0 Make nametages etc fixed size and only display within limited range 2020-01-24 22:09:45 -05:00
Joshua Yanovski
3383e991e7 Erosion cleanup, part 1.
Covers all files touched by MR that are not in world/src/sim.
2020-01-23 18:18:17 +01:00
Joshua Yanovski
2a6ed4351d Revert to master for main background. 2020-01-23 18:18:13 +01:00
flyingfryingpan
a98d4adc27 forsharp 2020-01-23 18:18:07 +01:00
Monty Marz
bfee0a6f9e Character stats displayed in char window, pulsating active slot in inventory 2020-01-23 17:14:02 +00:00
Monty Marz
1365abae99 Clean up unused UI assets 2020-01-22 21:56:03 +00:00
Monty Marz
e2707ff24a start menu text 2020-01-21 22:04:39 +00:00
Joshua Barretto
34c88708af Adjusted cloud fuzz factor 2020-01-21 13:14:25 +00:00
Joshua Barretto
8e7a8aa4f9 Shader optimisations 2020-01-21 12:58:20 +00:00
Treeco
49262c6a80 Fixes Hair Style & Color labels 2020-01-21 12:27:34 +00:00
Rémy PHELIPOT
a6f9f533a5 Localization system for Voxygen
- Added a localization system in voxygen
- Support English and French languages
- Added a configuration option in the interface settings to change
  the language
2020-01-20 21:07:25 +01:00
S Handley
b44955ba30 Remove currently unused audio assets
This clears out about 56MB of unused audio files.

There were also some unused methods in the audio modules which
referenced a file, which has also been removed.
2020-01-20 15:07:30 +00:00
Pfauenauge90
885e698e5a charge icon update 2020-01-19 22:39:19 +01:00
Pfauenauge90
6a32845e58 various fixes 2020-01-19 22:39:19 +01:00
Imbris
9d6bf66a32 Add options to turn off the clouds and to render ugly water 2020-01-19 14:05:31 -05:00
Joshua Barretto
54773b57b6 Fixed water normals 2020-01-19 18:39:20 +00:00
Joshua Barretto
020c57ec4a Fixed terrain normal decoding 2020-01-19 18:27:03 +00:00
Joshua Barretto
21069a48dd Made clouds bigger, more performant and prettier 2020-01-19 18:06:34 +00:00
Monty Marz
cb5976b9de create character button position change 2020-01-18 15:42:21 +00:00
Adam Whitehurst
7353ab3432 Undo sfx changes 2020-01-18 05:13:25 -08:00
Monty Marz
a4274ef8aa Charge Icon and flashing skillbar 2020-01-17 22:00:00 +00:00
Adam Whitehurst
5959d2a5c7 Fix SFX and Assets 2020-01-16 05:28:45 -08:00
Adam Whitehurst
d82e93b39f Merge master and build 2020-01-16 05:27:30 -08:00
Monty Marz
f6dfb74b3e fix
slightly lower trigger velocity

slighty more transp map image
2020-01-12 19:01:02 +00:00
Monty Marz
851d7858e6 Scrolling Combat Text (SCT) 2020-01-10 00:33:38 +00:00
Yusuf Bera Ertan
fd9cc76786 Reimplement #210 2020-01-07 18:40:45 +03:00
S Handley
2644e29484 Refactor and Rename for clarity
Implements a potential structure for splitting the SFX event mapping
into smaller individual files for maintainability.

- Remove inventory events for now: For a later commit.
- No longer panic when there is a failure parsing the sfx file: log the error and not play sfx.
2020-01-01 02:55:48 +00:00
Monty Marz
8aff5faa83 assets update
acacia trees
updated help.png
bigger map zone name
npc levels from 0-10
boss levels from 20-50
2019-12-30 12:16:35 +00:00
AdamWhitehurst
9c6ce9babd Begin implementing combat actions 2019-12-29 15:47:42 -08:00
S Handley
8c5320d20f Update title music and temporarily remove attack sfx
- Updated title music with a version provided by aeronic which fades out
more gracefully
- Removed attack SFX as it was included in the movement processing, but
will return later as part of a similar chunk of code which processes
combat sfx independent of movement.
2019-12-20 04:04:05 +00:00
S Handley
11dd6b8090 Update footsteps SFX 2019-12-08 10:03:40 +00:00
Monty Marz
d0b7891a34 Set overflow checks to 'false' for release builds in order to bandaid fix recent master error 2019-11-28 13:32:38 +00:00
Monty Marz
040e1a7535 Fix map being inverted and indicator positioning 2019-11-26 22:39:07 +00:00
S Handley
ea2e0d17de SFX system
This is an event based approach to SFX sounds. There is a specific
character sound event mapper which determines sfx to play based on
character or NPC state, as well as emitting sfx events for
non-character-triggers such as levelling up.
2019-11-23 08:26:39 +00:00
Monty Marz
370e94b1ad Loading Screen with pulsating text, 2 new hairstyles 2019-11-23 00:51:18 +00:00
Joshua Barretto
3a5c69a314 Prevented chunk load popping with smooth view distance growth 2019-11-20 10:38:11 +00:00
Joshua Barretto
8745d0a3af Non-linear depth buffer 2019-11-20 09:59:27 +00:00
Joshua Barretto
c60799de3d Stronger moonlight 2019-11-19 20:43:41 +00:00
Joshua Barretto
9993a4c81a Smoother water at distance, fixed warnings 2019-11-19 19:22:56 +00:00
Joshua Barretto
7ad22c647d Fixed cloud shader banding issue 2019-11-19 19:09:22 +00:00
Joshua Barretto
5cb6f691dc Fixed dense cloud void issue 2019-11-19 19:09:22 +00:00
Joshua Barretto
28e625635f Split terrain rendering to avoid redrawing skybox 2019-11-19 19:09:22 +00:00
Joshua Barretto
bca3817163 Massive performance boost for clouds, fixed reflection misprojection bug 2019-11-19 19:09:22 +00:00
Joshua Barretto
39d686961e Removed cloud sampler early return 2019-11-19 19:09:22 +00:00
Joshua Barretto
651bc8a9a3 Fixed close cloud precision noise 2019-11-19 19:09:22 +00:00
Joshua Barretto
eeec7df7d3 Fixed passthrough reduction curve 2019-11-19 19:09:22 +00:00
Joshua Barretto
fa4e68c165 Cleanup and speedup 2019-11-19 19:09:22 +00:00
Joshua Barretto
559106ff2c Better passthrough calculation 2019-11-19 19:09:22 +00:00
Joshua Barretto
4ccd8ac72a Improved cloud precision from internal perspective 2019-11-19 19:09:22 +00:00
Joshua Barretto
b7e59dfcc2 Better precision cloud sampling and moon halo highlight 2019-11-19 19:09:22 +00:00
Joshua Barretto
2c2dd49aed Made clouds render over terrain 2019-11-19 19:09:22 +00:00
Joshua Barretto
9d48cc8fb7 Better water transparency 2019-11-19 19:09:22 +00:00
Joshua Barretto
fd2c9e8cde Prevent sun/moon terrain overlap 2019-11-19 19:09:22 +00:00
Joshua Barretto
f80f303a18 Prevented cloud overlap on terrain 2019-11-19 19:09:22 +00:00
Joshua Barretto
0f37bfa829 Fixed hill colour blending 2019-11-19 19:09:22 +00:00
Joshua Barretto
337383feaa Faster cloud reflections 2019-11-19 19:09:22 +00:00
Joshua Barretto
7375c2c207 Faster clouds, better water 2019-11-19 19:09:22 +00:00
Joshua Barretto
5162256e45 Faster and more visually pleasing clouds 2019-11-19 19:09:22 +00:00
Joshua Barretto
aa111d34e5 Added clouds 2019-11-19 19:09:22 +00:00
Joshua Barretto
18ec6dbbec Prevented the moon rising/setting too early/late 2019-11-19 19:09:22 +00:00
Joshua Barretto
68502b22c1 Better moonlight 2019-11-19 19:09:22 +00:00
Joshua Barretto
10ce8b45e7 Added moon 2019-11-19 19:09:22 +00:00
Joshua Barretto
eb7b55d3ad Merge branch 'zesterer/better-water' into 'master'
Better water

See merge request veloren/veloren!643
2019-11-12 14:55:54 +00:00
Monty Marz
c38447a264 assets update
map image
human male hairstyles
elf male hairstyle
potion item
cheese item
removed admin items from inventory
2019-11-09 13:42:42 +00:00
Joshua Barretto
2134bf87a7 Smaller water details 2019-11-05 15:45:01 +00:00
Joshua Barretto
671313a523 Overhauled water shaders 2019-11-05 15:45:01 +00:00
Joshua Barretto
6d8d06ff7c Smoother water 2019-11-05 15:45:01 +00:00
Joshua Barretto
7ecfde2925 Better water 2019-11-05 15:45:01 +00:00
Monty Marz
240b620c13 login info text 2019-11-01 20:53:52 +00:00
Monty Marz
a0a8011d7e Updated: Help Window, Map, Item Descriptions 2019-10-27 22:22:40 +00:00
jshipsey
2b5fd372c5 streamlined body part naming scheme, swapped quadruped to quadruped_small, rewrote mesh names to reflect body type instead of npckind. finally. 2019-10-25 21:50:14 -04:00
jshipsey
644939810f added dragon skeleton 2019-10-25 21:33:59 -04:00
jshipsey
54fc712076 fish_medium and bird_medium skelingtons 2019-10-25 21:33:02 -04:00
timokoesters
0a1e12c9ad
improvement: make debug items of type ItemKind::Tool
This way all items that can be held in a hand are tools
2019-10-24 23:55:24 +02:00
Monty Marz
3e0ac48bd8 Multiple Assets and UI fixes and additions 2019-10-23 19:40:45 +00:00
Vechro
c9787846d5 Fix MSAA x16 2019-10-21 21:55:49 +03:00
Imbris
39656e92be Merge branch '276-hotloading-armor' into 'master'
Resolve "Enable hotloading of different offsets for armors/weapons"

Closes #276

See merge request veloren/veloren!545
2019-10-18 00:29:09 +00:00
Adam Fogle
c41627d75f Removed the recolor property from the armor ron files. 2019-10-17 19:45:29 -04:00
Monty Marz
fdfab6a807 refactor: create_projectile doesn't take a light
It returns a builder so the caller can just do it
2019-10-17 20:59:36 +00:00
Joshua Barretto
dcf8655202 Fixed srgb normal bug 2019-10-17 17:35:17 +01:00
Joshua Barretto
04c64dc122 Better (and faster) water shaders 2019-10-17 17:11:55 +01:00
Joshua Barretto
3279a278b7 Move computations to terrain fragment shaders 2019-10-16 15:05:45 +01:00
Joshua Barretto
c01e19fc05 Don't render water that isn't there, improved chunk render order 2019-10-16 12:40:18 +01:00
Joshua Yanovski
8ae2692b6e Allow canceling chunk generation.
Currently we only do this when no players are in range of the chunk.  We
also send the first client who posted the chunk a message indicating
that it's canceled, the hope being that this will be a performance win
in single player mode since you don't have to wait three seconds to
realize that the server won't generate the chunk for you.

We now check an atomic flag for every column sample in a chunk.  We
could probably do this less frequently, but since it's a relaxed load it
has essentially no performance impact on Intel architectures.
2019-10-16 11:39:41 +00:00
Adam Fogle
3a4c307d38 Code cleanup, formatting changes, and fixed the cloth belt's offset. 2019-10-16 00:42:57 -04:00
Joshua Barretto
4bbc340f52 Faster meshing, better dusk 2019-10-14 10:48:40 +01:00
Adam Fogle
8f7b4afafd Manifest file is now used to load armor.
Redid how pants renders so they can use underlying skin model/coloring,
same as chest armor.
Redid how belts render so they can use the underly skin color,
same as shoulder or foot.
Converted a manifest variable name to snake case.
2019-10-12 08:31:42 -04:00
Adam Fogle
a5db28113f Redid the mainfest files to remove race/gender.
Now based on armor slot enum.
Added color to the manifest files.
Manifest files aren't yet being used, but will load.
2019-10-12 08:31:42 -04:00
Adam Fogle
da54cf76bc Armor names now end with left/right.
Armor names no longer include their armor part.
This should be inferred from their folder.
2019-10-12 08:31:42 -04:00
Adam Fogle
be53492e69 Added manifest files per armor type using the existing vox names. 2019-10-12 08:31:42 -04:00
Monty Marz
d82ec6715a Item icons, chests and more 2019-10-09 19:28:05 +00:00
Joshua Barretto
889fd678c6 More opaque water surface 2019-10-08 12:21:05 +01:00
Joshua Barretto
087bfffc8a Proper tree colour variation 2019-10-07 09:05:18 +01:00
Monty Marz
b3862278af Help window, UI fixes, asset fixes 2019-10-06 19:19:08 +00:00
Timo Koesters
f3787879d3 fix(bow): adds bow icon art 2019-10-05 21:51:08 +00:00
timokoesters
5a1052a1a6
Fix fonts 2019-10-04 21:30:32 +02:00
Pfauenauge90
e404ea0d4f
assets, rotation, offset changes 2019-10-04 21:02:42 +02:00
Pfauenauge90
39e5530d45
made bow available in char selection 2019-10-04 21:02:40 +02:00
Pfauenauge
b5180320fb
bow position 2019-10-04 21:02:40 +02:00
timokoesters
d46f1e1859
Initial bow & arrow implementation 2019-10-04 21:02:39 +02:00
Monty Marz
4c1eba1f3e Assets update, aesthetics, minor fixes 2019-10-04 18:27:12 +00:00
Songtronix
bced3cb638 feat(voxygen): add logo for windows executable 2019-10-02 16:57:08 +02:00
Justin Shipsey
27f3bebe40 Char overhaul and asset update 2019-10-02 10:05:17 +00:00
Monty Marz
11a022abb3 Better stepping sounds (and minor voxel model fixes) 2019-09-27 16:04:22 +00:00