timokoesters
f46e900b57
improvement: enemy balance
2020-01-20 19:15:12 +01:00
Joshua Barretto
86b9ce182a
Merge branch 'zesterer/cs-char-saving' into 'master'
...
Client-side character saving
See merge request veloren/veloren!737
2020-01-20 18:03:28 +00:00
Joshua Barretto
11a85393c5
fmt
2020-01-20 17:45:28 +00:00
Pfauenauge
f6cf2a7a5e
updated info main menu info
2020-01-20 18:08:05 +01:00
Songtronix
c0c334a9f7
Merge branch 'shandley/audio-assets-cleanup' into 'master'
...
Remove currently unused audio assets
See merge request veloren/veloren!710
2020-01-20 15:07:30 +00:00
S Handley
bafa6718a4
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
Joshua Barretto
fc8bc83c01
Solved character select body bug
2020-01-20 15:04:53 +00:00
Joshua Barretto
a6cf5a2a3c
Enumerated Body type
2020-01-20 14:21:06 +00:00
Joshua Yanovski
0c97ad8913
Merge branch 'sharp/fix-ci' into 'master'
...
Fix benchmarks and profile overrides.
See merge request veloren/veloren!736
2020-01-20 13:49:48 +00:00
Joshua Barretto
c6651165c2
Updated changelog
2020-01-20 13:40:14 +00:00
Joshua Barretto
894b82bd6b
Added client-side character saving
2020-01-20 13:37:29 +00:00
Joshua Yanovski
93c953a989
Fix benchmarks and profile overrides.
...
This was necessary because Cargo recently deprecated the "overrides"
keyword in favor of "package", and Criterion changed its interface.
This commit also now lists more configurable keys, so if they aren't set
to their defaults the user will be able to find them. This includes the
roll key, which wasn't listed earlier and is different on Windows and
Mac. It does *not* include the respawn key because that key is already
shown when you die.
2020-01-20 14:16:28 +01:00
Joshua Yanovski
a04e0d49b6
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
68210fcf82
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
0e5a182817
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
abdc524a61
Don't panic if a region can't be found for a deleted entity
2020-01-19 18:22:11 -05:00
Imbris
e323bc79be
Fix lighting calc bug, lower meshing bench sample size
2020-01-19 18:14:07 -05:00
Timo Koesters
56cd7c152d
Merge branch 'energy-recharge' into 'master'
...
Energy recharge
See merge request veloren/veloren!724
2020-01-19 22:26:02 +00:00
Pfauenauge90
5f41841522
added TODO for energy numbers
2020-01-19 22:39:20 +01:00
Joseph Gerardot
01ac937db5
Fixup energy regen math to properly account for acceleration at any
...
framerate.
2020-01-19 22:39:20 +01:00
timokoesters
a708ab84d6
fix: make fall damage behave correctly again after changing gravity
2020-01-19 22:39:20 +01:00
timokoesters
1912ab0d8b
refactor: use restrict_mut
2020-01-19 22:39:20 +01:00
timokoesters
db9a4ac6b9
improvement: reset character state and energy on death
2020-01-19 22:39:19 +01:00
Pfauenauge90
e1c640d5b6
charge icon update
2020-01-19 22:39:19 +01:00
Pfauenauge90
7cb69082ec
various fixes
2020-01-19 22:39:19 +01:00
Pfauenauge90
bf3a735e41
skillbar background fix
2020-01-19 22:39:18 +01:00
Pfauenauge90
cd774780c4
darkened button for unavailabe charge
2020-01-19 22:39:18 +01:00
timokoesters
263fffb79c
improvement: better movement
2020-01-19 22:39:18 +01:00
Joseph Gerardot
715e01f989
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
a970a61192
Add energy comsumption on rolling and charging, and accelerating
...
regeneration when idle.
2020-01-19 22:39:17 +01:00
Imbris
e0da671c74
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
b228f9d651
fmt fix
2020-01-19 16:03:27 -05:00
Imbris
bc8d49905b
fix typo, replace u32 with Vec3<u8> in light propagation queue
2020-01-19 16:03:27 -05:00
Imbris
151f6ea7d7
Add release debuginfo profile
2020-01-19 16:03:27 -05:00
Imbris
7bcbfa9003
add: capability to disable blending for particular BlockKinds
2020-01-19 16:03:27 -05:00
timokoesters
c557dfeedf
improvement: fog doesn't go back and forth anymore
2020-01-19 16:03:27 -05:00
Imbris
b3aa9d2aa4
fix: panic in terrain meshing
2020-01-19 16:03:27 -05:00
Imbris
7f04db1501
Add terrain meshing benchmark
2020-01-19 16:02:12 -05:00
Imbris
e7b30d1263
Cleanup
2020-01-19 16:02:12 -05:00
Imbris
cf07016c07
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
289102cbe9
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
488010ba19
Propagate light via queue to avoid block lookups
2020-01-19 16:02:12 -05:00
Imbris
59c94935f9
Remove unnecessary sampling in meshing light calculations
2020-01-19 16:02:12 -05:00
Imbris
3fc8f5de38
Experiment with replacing hashmap in light calculations
2020-01-19 16:02:12 -05:00
Imbris
5d608dd066
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
a5a8409294
Changelog
2020-01-19 14:28:24 -05:00
Imbris
f82a3a7a5c
Add options to turn off the clouds and to render ugly water
2020-01-19 14:05:31 -05:00
Joshua Barretto
d48974d077
Fixed water normals
2020-01-19 18:39:20 +00:00
Songtronix
d80021cb13
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
19b5143077
Fixed terrain normal decoding
2020-01-19 18:27:03 +00:00
