flyingfryingpan
28d0afbfb6
wahtevermoresharp
2020-01-23 18:18:07 +01:00
flyingfryingpan
a98d4adc27
forsharp
2020-01-23 18:18:07 +01:00
Monty Marz
6a3f979290
Merge branch 'pfau/pulsating-inv-slot' into 'master'
...
Character stats displayed in char window, pulsating active slot in inventory
See merge request veloren/veloren!746
2020-01-23 17:14:02 +00: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
b8135408a5
Merge branch 'pfau/asset-cleanup' into 'master'
...
Clean up unused UI assets
See merge request veloren/veloren!745
2020-01-22 21:56:03 +00:00
Monty Marz
1365abae99
Clean up unused UI assets
2020-01-22 21:56:03 +00:00
Monty Marz
22b556b480
Merge branch 'pfau/fix-info' into 'master'
...
start menu text
See merge request veloren/veloren!744
2020-01-21 22:04:40 +00:00
Monty Marz
e2707ff24a
start menu text
2020-01-21 22:04:39 +00:00
Timo Koesters
c0d2ac3ada
Merge branch 'payload1/add-endurance-fitness-willpower' into 'master'
...
endurance, fitness, willpower stats and improve movement speed based on fitness
Closes #402 and #400
See merge request veloren/veloren!723
2020-01-21 19:15:07 +00:00
timokoesters
28fe73825d
feat: fitness stat effects movement speed
2020-01-21 19:24:09 +01:00
Gilbert Röhrbein
4f90e6325e
feat: add endurance fitness willpower to stats
2020-01-21 18:49:17 +01:00
Gilbert Röhrbein
c2b99f3a62
Fix panic in case no default audio device found when audio off
2020-01-21 18:09:37 +01:00
Joshua Barretto
dc2c3b0dd7
Merge branch 'zesterer/shader-perf' into 'master'
...
Shader optimisations
See merge request veloren/veloren!742
2020-01-21 14:40:49 +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
Joshua Barretto
bf1b2d96f5
Merge branch 'treeco/fix-char-creation-labels' into 'master'
...
Fix Hair Style & Color labels
See merge request veloren/veloren!741
2020-01-21 12:57:02 +00:00
Treeco
49262c6a80
Fixes Hair Style & Color labels
2020-01-21 12:27:34 +00:00
Joshua Barretto
2ddb6d362e
Merge branch 'pfau/fix-char-creation' into 'master'
...
Fixed char select bugs, improved code quality
See merge request veloren/veloren!739
2020-01-20 23:20:22 +00:00
Joshua Barretto
8a0bd9220b
Fixed button font
2020-01-20 22:54:51 +00:00
Joshua Barretto
4b5cc272ac
sync
2020-01-20 22:51:55 +00:00
Joshua Barretto
397fa7777f
Switched to enum-based char creation state
2020-01-20 22:29:14 +00:00
Joshua Barretto
1c922c939d
Merge branch 'localization' into 'master'
...
Localization support for voxygen
See merge request veloren/veloren!731
2020-01-20 21:50:47 +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
Timo Koesters
ec0692249a
Merge branch 'timo-balance' into 'master'
...
improvement: enemy balance
See merge request veloren/veloren!738
2020-01-20 19:10:09 +00:00
timokoesters
2e8bf9d212
improvement: enemy balance
2020-01-20 19:15:12 +01:00
Joshua Barretto
0223a60a1e
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
6f26f2afb1
fmt
2020-01-20 17:45:28 +00:00
Pfauenauge
caa5abf183
updated info main menu info
2020-01-20 18:08:05 +01:00
Songtronix
da6b209753
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
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
Joshua Barretto
fc1e66fb31
Solved character select body bug
2020-01-20 15:04:53 +00:00
Joshua Barretto
8f86e45a72
Enumerated Body type
2020-01-20 14:21:06 +00:00
Joshua Yanovski
f0350cd24f
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
0757083b19
Updated changelog
2020-01-20 13:40:14 +00:00
Joshua Barretto
2c42aaf5f5
Added client-side character saving
2020-01-20 13:37:29 +00:00
Joshua Yanovski
898b5c6593
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
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
