Commit Graph

3564 Commits

Author SHA1 Message Date
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
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
b2503397c9 Fix panic in case no default audio device found when audio off 2020-01-18 19:16:23 +01:00
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
cb5976b9de create character button position change 2020-01-18 15:42:21 +00:00
7353ab3432 Undo sfx changes 2020-01-18 05:13:25 -08:00
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
a4274ef8aa Charge Icon and flashing skillbar 2020-01-17 22:00:00 +00:00
976eface66 Update from MR comments 2020-01-17 08:39:21 -08:00
5959d2a5c7 Fix SFX and Assets 2020-01-16 05:28:45 -08:00
d82e93b39f Merge master and build 2020-01-16 05:27:30 -08:00
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
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
71bd7f15ee Even better conversion impl. 2020-01-13 20:54:56 +01:00
af8468315d Made color conversion way more accurate. 2020-01-13 16:38:10 +01:00
71a39c3677 Update update return statements 2020-01-12 15:14:08 -08:00
1816d4b805 Move states/ to common/src/ 2020-01-12 15:06:52 -08:00
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
28060e7b6e fixing #405 - Energy as its own component 2020-01-12 22:25:04 +01:00
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
f6dfb74b3e fix
slightly lower trigger velocity

slighty more transp map image
2020-01-12 19:01:02 +00:00
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
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
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
e1adf40856 Improvement: Replace all '..=b' with '..b + 1' 2020-01-12 15:46:53 +01:00
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
e0fc3ce425 fixed number shadow for "0" damage appearing on level up 2020-01-11 21:31:57 +01:00
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
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
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
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
70eb2eed33 remove: discord rich presence 2020-01-10 17:01:50 +01:00
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
851d7858e6 Scrolling Combat Text (SCT) 2020-01-10 00:33:38 +00:00
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
563e50b67d Move utils file 2020-01-09 08:23:20 -08:00
de36e75264 Fix imports, update matches 2020-01-08 11:31:42 -08:00
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
4a0a2d5229 Cargo fmt 2020-01-08 20:09:54 +03:00
5527d83a0e Update mod imports 2020-01-08 08:56:36 -08:00
8cdf06e3e2 Swim pulsing 2020-01-08 05:17:36 -08:00
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
5b65b16594 Prevent NPCs from spawnign underwater
This should be set until there are underwater NPC types.
2020-01-08 12:48:00 +00:00
71db9d6350 Replace radio list with drop down selector for AA mode setting 2020-01-07 20:37:55 +03:00
24013f1a32 Use treeculler crate 2020-01-07 19:40:06 +03:00
8648641362 Grooming 2020-01-07 07:49:08 -08:00
0b67dad4a5 Fix figure visible value not updating 2020-01-07 18:46:37 +03:00
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
c19c222a90 Use temporal coherence for chunk frustum culling 2020-01-07 18:46:09 +03:00
e32153e980 Improve frustum culling by using AABBs, add related debug information 2020-01-07 18:44:33 +03:00