Commit Graph

2994 Commits

Author SHA1 Message Date
Imbris
211c076b8d Remove unnecessary sampling in meshing light calculations 2020-01-19 16:02:12 -05:00
Imbris
33993638fe Experiment with replacing hashmap in light calculations 2020-01-19 16:02:12 -05:00
Imbris
12ef2361b3 Merge branch 'zesterer/better-clouds' into 'master'
Made clouds bigger, more performant and prettier

See merge request veloren/veloren!733
2020-01-19 20:00:44 +00:00
Imbris
8184a31001 Changelog 2020-01-19 14:28:24 -05: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
Songtronix
12633d57e6 Merge branch 'songtronix/update-toolchain' into 'master'
update toolchain to nightly-2020-01-18

See merge request veloren/veloren!732
2020-01-19 18:38:19 +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
Songtronix
f16e6aba21 update toolchain to nightly-2020-01-18 2020-01-19 18:50:48 +01:00
Imbris
259879d832 Merge branch 'shandley/bugfix-run-sfx-when-immobile' into 'master'
fix: Prevent dispatching Run SFX if an entity is not moving

See merge request veloren/veloren!729
2020-01-18 18:49:17 +00:00
S Handley
309834df1b fix: Prevent dispatching Run SFX if an entity is not moving
This adds the entity's velocity as an argument when mapping the
movement state to an SFX event, and prevents the run SFX from being
returned if the velocity is below a threshold.

This will prevent hearing the run sfx when stuck in a corner, or running
into a surface where the character is not actually moving their feet.
2020-01-18 18:49:17 +00:00
Imbris
0c4434f015 Merge branch 'payload1/fix-ask-audio-device-only-when-audio-on' into 'master'
Fix panic in case no default audio device found when audio off

See merge request veloren/veloren!722
2020-01-18 18:34:17 +00:00
Gilbert Röhrbein
b2503397c9 Fix panic in case no default audio device found when audio off 2020-01-18 19:16:23 +01:00
Monty Marz
cfe50129e6 Merge branch 'pfau/char-creation-button' into 'master'
create character button position change

See merge request veloren/veloren!730
2020-01-18 15:42:21 +00:00
Monty Marz
cb5976b9de create character button position change 2020-01-18 15:42:21 +00:00
Monty Marz
80c334273a Merge branch 'pfau/charge-icon' into 'master'
Charge Icon and flashing skillbar

See merge request veloren/veloren!726
2020-01-17 22:00:00 +00:00
Monty Marz
a4274ef8aa Charge Icon and flashing skillbar 2020-01-17 22:00:00 +00:00
Acrimon
8d2c69673d Merge branch 'acrimon/precise-color-conversion' into 'master'
More precise color conversion

See merge request veloren/veloren!721
2020-01-14 07:04:51 +00:00
Imbris
d36b263627 Branch on lower color values for more accurate speedy color conversion, add simple color conversion benchmarks 2020-01-13 23:39:22 -05:00
Acrimon
71bd7f15ee
Even better conversion impl. 2020-01-13 20:54:56 +01:00
Acrimon
af8468315d
Made color conversion way more accurate. 2020-01-13 16:38:10 +01:00
Timo Koesters
a06511e413 Merge branch 'payload1/energy-component' into 'master'
payload1/energy component

Closes #405

See merge request veloren/veloren!719
2020-01-12 21:41:34 +00:00
Gilbert Röhrbein
28060e7b6e fixing #405 - Energy as its own component 2020-01-12 22:25:04 +01:00
Monty Marz
9c65c43713 Merge branch 'pfau/map-transp-hotfix' into 'master'
Hotfix for map flickering while turning

See merge request veloren/veloren!720
2020-01-12 19:01:02 +00:00
Monty Marz
f6dfb74b3e fix
slightly lower trigger velocity

slighty more transp map image
2020-01-12 19:01:02 +00:00
Songtronix
8e355f79a3 Merge branch 'shandley/sfx-land-on-ground' into 'master'
Play the Run SFX when a character lands after jumping or falling

See merge request veloren/veloren!717
2020-01-12 16:35:20 +00:00
S Handley
00c1493548 Play the Run SFX when a character lands after jumping or falling
This is a small detail but makes a noticable difference.
2020-01-12 16:35:20 +00:00
Acrimon
3405d42ef1 Merge branch 'qutrin/ez-optimisation' into 'master'
Improvement: Replace all '..=b' with '..b + 1'

See merge request veloren/veloren!718
2020-01-12 15:05:45 +00:00
Piotr Korgól
e1adf40856 Improvement: Replace all '..=b' with '..b + 1' 2020-01-12 15:46:53 +01:00
Monty Marz
7c63f27ecd Merge branch 'pfau/sct-hotfix' into 'master'
fixed number shadow for "0" damage appearing on level up

See merge request veloren/veloren!716
2020-01-11 20:47:47 +00:00
Pfauenauge90
e0fc3ce425 fixed number shadow for "0" damage appearing on level up 2020-01-11 21:31:57 +01:00
Imbris
2b4d4aa480 Merge branch 'yusdacra/tweaks' into 'master'
Fixes minor issues with frustum culling

See merge request veloren/veloren!712
2020-01-11 16:36:51 +00:00
Imbris
d72aeccf50 Merge branch 'shandley/bugfix-stats-audio-event' into 'master'
(fix) Remove emission of an audio event from stats sys

See merge request veloren/veloren!714
2020-01-11 04:49:43 +00:00
Shane Handley
c6f64564a8 Remove emission of an audio event from stats sys
This was accidentally left in by me during some testing of server
emission of SFX events to all clients. There was no effect on gameplay since we dont
emit a sound for this event yet, but it should not be here.

The audio event is correctly handled elsewhere by each client.
2020-01-11 13:08:33 +09:00
Songtronix
a3f893d877 Merge branch 'songtronix/improve-discord' into 'master'
remove discord rich presence

See merge request veloren/veloren!695
2020-01-10 16:15:27 +00:00
Songtronix
70eb2eed33 remove: discord rich presence 2020-01-10 17:01:50 +01:00
Monty Marz
c910d60e06 Merge branch 'pfau/assets' into 'master'
Scrolling Combat Text (SCT)

See merge request veloren/veloren!711
2020-01-10 00:33:38 +00:00
Monty Marz
851d7858e6 Scrolling Combat Text (SCT) 2020-01-10 00:33:38 +00:00
Yusuf Bera Ertan
127f8fb72b Fix lpindex not being updated for culled objects, and don't
recalculate frustum for every entity
2020-01-09 22:22:06 +03:00
Acrimon
4e7c955490 Merge branch 'yusdacra/tweaks' into 'master'
Improvements to frustum culling and some changes

Closes #210

See merge request veloren/veloren!708
2020-01-08 17:43:40 +00:00
Yusuf Bera Ertan
4a0a2d5229 Cargo fmt 2020-01-08 20:09:54 +03:00
Acrimon
2dfba6aacc Merge branch 'shandley/no-npc-spawn-underwater' into 'master'
Prevent NPCs from spawning underwater

See merge request veloren/veloren!709
2020-01-08 12:48:00 +00:00
S Handley
5b65b16594 Prevent NPCs from spawnign underwater
This should be set until there are underwater NPC types.
2020-01-08 12:48:00 +00:00
Yusuf Bera Ertan
71db9d6350 Replace radio list with drop down selector for AA mode setting 2020-01-07 20:37:55 +03:00
Yusuf Bera Ertan
24013f1a32 Use treeculler crate 2020-01-07 19:40:06 +03:00
Yusuf Bera Ertan
0b67dad4a5 Fix figure visible value not updating 2020-01-07 18:46:37 +03:00
Yusuf Bera Ertan
31d18b3381 Use temporal coherence for figure frustum culling, don't process figures if they are not in view frustum 2020-01-07 18:46:22 +03:00
Yusuf Bera Ertan
c19c222a90 Use temporal coherence for chunk frustum culling 2020-01-07 18:46:09 +03:00
Yusuf Bera Ertan
e32153e980 Improve frustum culling by using AABBs, add related debug information 2020-01-07 18:44:33 +03:00