Joshua Yanovski
96e0cad281
Merge branch 'sharp/mac-fixes' into 'master'
...
Fixes for OS X machines.
See merge request veloren/veloren!735
2020-01-20 11:22:51 +00:00
Joshua Yanovski
355a1b204a
Fixes for OS X machines.
...
Handles scroll wheel events in pixels (enabling the scroll wheel) and
sets rolling and wall leaping to use left shift by default on OS X
(instead of middle mouse click, which is absent by default on Apple
trackpads). Also updates the controls UI to show the actual assigned
keys for those controls which are configurable.
2020-01-20 05:12:41 +01:00
Acrimon
595bc6c67a
Merge branch 'imbris/light-fix' into 'master'
...
Fix lighting calc bug, lower meshing bench sample size
See merge request veloren/veloren!734
2020-01-19 23:39:43 +00:00
Imbris
63d74eb8ba
Don't panic if a region can't be found for a deleted entity
2020-01-19 18:22:11 -05:00
Imbris
38c48317f7
Fix lighting calc bug, lower meshing bench sample size
2020-01-19 18:14:07 -05:00
Timo Koesters
7f179fa2eb
Merge branch 'energy-recharge' into 'master'
...
Energy recharge
See merge request veloren/veloren!724
2020-01-19 22:26:02 +00:00
Pfauenauge90
8a0efd3654
added TODO for energy numbers
2020-01-19 22:39:20 +01:00
Joseph Gerardot
454aa82669
Fixup energy regen math to properly account for acceleration at any
...
framerate.
2020-01-19 22:39:20 +01:00
timokoesters
6e651eb659
fix: make fall damage behave correctly again after changing gravity
2020-01-19 22:39:20 +01:00
timokoesters
65d0a1c4f4
refactor: use restrict_mut
2020-01-19 22:39:20 +01:00
timokoesters
8afe5fd1dd
improvement: reset character state and energy on death
2020-01-19 22:39:19 +01: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
Pfauenauge90
480b920fa3
skillbar background fix
2020-01-19 22:39:18 +01:00
Pfauenauge90
863e4c4962
darkened button for unavailabe charge
2020-01-19 22:39:18 +01:00
timokoesters
8064b51ee2
improvement: better movement
2020-01-19 22:39:18 +01:00
Joseph Gerardot
c10c31043c
Make charging take a discrete amount of energy and change energy
...
regeneration to use floats so it is smoother and tickrate-independent.
2020-01-19 22:39:17 +01:00
Joseph Gerardot
b4337e57aa
Add energy comsumption on rolling and charging, and accelerating
...
regeneration when idle.
2020-01-19 22:39:17 +01:00
Imbris
df26a24eaa
Merge branch 'imbris/mesh-opt' into 'master'
...
Optimize Terrain Meshing
See merge request veloren/veloren!728
2020-01-19 21:36:01 +00:00
Imbris
94210070f7
fmt fix
2020-01-19 16:03:27 -05:00
Imbris
3c8d0a3bb9
fix typo, replace u32 with Vec3<u8> in light propagation queue
2020-01-19 16:03:27 -05:00
Imbris
3553c31101
Add release debuginfo profile
2020-01-19 16:03:27 -05:00
Imbris
4b01c1b082
add: capability to disable blending for particular BlockKinds
2020-01-19 16:03:27 -05:00
timokoesters
ae1fa5e4c4
improvement: fog doesn't go back and forth anymore
2020-01-19 16:03:27 -05:00
Imbris
b3cdde3ce9
fix: panic in terrain meshing
2020-01-19 16:03:27 -05:00
Imbris
5666f18ded
Add terrain meshing benchmark
2020-01-19 16:02:12 -05:00
Imbris
6f6dc1b16b
Cleanup
2020-01-19 16:02:12 -05:00
Imbris
aa48729376
Compress position used in propagation queue, decrease outer bounds to the area sunlight can reach the inner area from
2020-01-19 16:02:12 -05:00
Imbris
09239caf88
While copying terrain sample to flat array, keep track of highest and lowest positions with exposed faces in order to constrain further iteration
2020-01-19 16:02:12 -05:00
Imbris
3347438d51
Propagate light via queue to avoid block lookups
2020-01-19 16:02:12 -05:00
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
Adam Whitehurst
7353ab3432
Undo sfx changes
2020-01-18 05:13:25 -08: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
AdamWhitehurst
976eface66
Update from MR comments
2020-01-17 08:39:21 -08:00
