Marcel Märtens
5d60fb2e1d
move i18n test to i18n file to reduce compile time && merge gitlab jobs to only have 1 cargo test job
2020-07-13 09:50:55 +02:00
Marcel
0b66a88ae5
Merge branch 'fexii/unique-keybinds' into 'master'
...
Highlight keys which are bound to multiple GameInputs and add a Reset to Defaults button
Closes #605
See merge request veloren/veloren!1193
2020-07-12 21:47:10 +00:00
Yusuf Bera Ertan
730a54dad5
localization test: add per file data to overall status, better alignments
2020-07-13 00:40:43 +03:00
Kai
8e523364ac
Prevent GameInputs from being bound to multiple keys unless explicitly allowed. Add a Reset to Defaults button for controls.
2020-07-12 11:59:55 -07:00
Joshua Yanovski
6c31e6b562
Fix shadow creation.
2020-07-12 19:50:26 +02:00
Joshua Yanovski
6332cbe006
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-07-12 18:47:00 +02:00
Joshua Yanovski
be438657c3
Tweaks to shadows.
...
Added shadow map resolution configuration, added seamless cubemaps,
documented all existing rendering options, and fixed a few Clippy
errors.
2020-07-12 18:28:08 +02:00
Yusuf Bera Ertan
95fd89b4f9
add more error messages, add percentage calculation for each i18n file and an overall percentage result
2020-07-12 14:54:03 +03:00
Yusuf Bera Ertan
72ec565678
fix localization test
2020-07-12 05:38:11 +03:00
Marcel
930e0028bc
Merge branch 'fexii/freefly-camera' into 'master'
...
Add freefly camera mode and cycle camera mode keybind
See merge request veloren/veloren!1188
2020-07-11 22:45:02 +00:00
Kai
6b771b8dca
Add a clientside check to only allow freefly camera for admins
2020-07-11 13:59:47 -07:00
Kai
738fa34534
Add freefly camera mode and cycle camera mode keybind
2020-07-11 11:39:04 -07:00
Marcel
1e367d6371
Merge branch 'xvar/fix-client-ping-display' into 'master'
...
Removed rounding from ping delta and added weighted rolling average ping calculation
See merge request veloren/veloren!1194
2020-07-11 16:51:37 +00:00
Marcel
a0b866e97b
Merge branch 'xvar/bricked-loadouts-fix' into 'master'
...
Added migration to fix characters unable to login due to DashMelee ability change
See merge request veloren/veloren!1192
2020-07-11 15:19:53 +00:00
Ben Wallis
7f6c892cf0
Added migration to fix characters unable to login due to DashMelee ability change
2020-07-11 15:42:19 +01:00
Ben Wallis
6ca6e2d646
Removed rounding from ping delta and added weighted rolling average ping calculation
2020-07-11 15:39:31 +01:00
Joshua Barretto
3c72022c81
Nicer north colour
2020-07-10 18:21:34 +01:00
Marcel
72dd2850e3
Merge branch 'ci-strip' into 'master'
...
remove the strip of the linux binaries in CI, this will prob make it a few MB...
See merge request veloren/veloren!1191
2020-07-10 15:06:58 +00:00
Marcel Märtens
d44128ac7a
remove the strip of the linux binaries in CI, this will prob make it a few MB bigger but help to provide a backtrace in case we panic! in our builds or docker server
2020-07-10 16:03:06 +02:00
Joshua Barretto
cf69d0c5d8
Added minimap compass
2020-07-10 15:00:20 +01:00
Songtronix
26d47304e0
Merge branch 'songtronix/fix-singleplayer-loading' into 'master'
...
fix: show loading screen for singleplayer
See merge request veloren/veloren!1189
2020-07-10 10:14:38 +00:00
Songtronix
728d349c77
fix: show loading screen for singleplayer
2020-07-10 11:05:09 +02:00
Joshua Barretto
951a977b2f
Improved hill path following
2020-07-10 00:43:11 +01:00
Songtronix
cabf7ebd92
Merge branch 'songtronix/fix-specs-idvs' into 'master'
...
fix: use correct specs(-idvs) versions
See merge request veloren/veloren!1187
2020-07-09 21:08:23 +00:00
Songtronix
5b57072064
fix: use correct specs(-idvs) versions
...
related to torvus
2020-07-09 19:46:30 +02:00
Joshua Barretto
ac30fcbd0e
Commented unused but potentially useful code
2020-07-09 16:54:10 +01:00
Joshua Barretto
47e413c530
Improved pathfinding tolerance and reliability
2020-07-09 16:54:10 +01:00
Joshua Barretto
23c774c8da
Fixed missed VD update bug
2020-07-09 16:54:10 +01:00
Treeco
1f1d9c5625
Reset rather than accumulate velocity when stuck or in unloaded chunks
2020-07-09 15:58:07 +01:00
Joshua Barretto
3239fc1f2f
Merge branch 'sam/creature-stats' into 'master'
...
Creature Specific Stats
See merge request veloren/veloren!1182
2020-07-09 00:04:25 +00:00
Samuel Keiffer
25c28f26d6
Different body types now have different health values and gain different amounts of healths on leveling.
2020-07-09 00:04:25 +00:00
Joshua Barretto
a0df8bee2c
Merge branch 'sam/axe-spin-attack' into 'master'
...
Spin attack for axe
See merge request veloren/veloren!1171
2020-07-08 19:58:41 +00:00
Samuel Keiffer
fe47a14ba5
Spin attack for axe
2020-07-08 19:58:41 +00:00
Marcel
10ba532815
Merge branch 'xvar/preventdatalossfromdeserialization' into 'master'
...
Removed de-serialization failure tolerance to prevent player inventory/loadout wipes (#659 )
See merge request veloren/veloren!1173
2020-07-08 18:26:59 +00:00
Ben Wallis
ddb66ec73b
Added CharacterDataError when character list fails to load due to Loadout de-serialization error
2020-07-08 09:34:20 +01:00
Joshua Yanovski
23b4058906
Fix moon, use nonlinear noise for terrain.
...
Note that the latter has a bit of performance cost.
2020-07-08 10:11:19 +02:00
Ben Wallis
e83d0abd33
Added migration to create a default inventory and loadout for characters without one
2020-07-08 09:09:48 +01:00
Ben Wallis
3ac18f73ea
Removed de-serialization failure tolerance to prevent player inventory/loadout wipes
2020-07-08 09:09:47 +01:00
Joshua Yanovski
7fbe5cbfbb
Address lies about max texture size.
2020-07-08 02:23:02 +02:00
Joshua Yanovski
bcfc62b5e1
Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes
2020-07-08 02:22:08 +02:00
Joshua Yanovski
75e3626a78
OpenGL 3.3 minimum.
2020-07-08 02:21:52 +02:00
Marcel
921c8a81d6
Merge branch 'pyrious/fix-character-state-on-inventory-change' into 'master'
...
Maintain character state when inventory is modified
Closes #602
See merge request veloren/veloren!1180
2020-07-07 23:54:56 +00:00
Monty Marz
18a08e8fe2
settings localization
2020-07-07 23:57:52 +02:00
Joshua Yanovski
90c5d1ca36
Lower near distance.
2020-07-07 21:11:48 +02:00
Giovanni Spera
4232148b83
Stopping auto-walk after death: Fixes #607
2020-07-07 20:56:44 +02:00
Joshua Yanovski
0e66f02b25
All sprites sway in the wind now.
2020-07-07 20:09:01 +02:00
Joshua Yanovski
db1401a691
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-07-07 19:34:17 +02:00
Ben Frankel
823141f825
Maintain character state when inventory is modified
...
If the mainhand slot is swapped out or dropped while the character is
wielding, the character will be set to idle (same behavior). However, if
an item is picked up or used; or a non-mainhand item is dropped; or two
non-mainhand items are swapped; the character state will not be set to
idle (new behavior).
Rationale for keeping the same behavior:
Swapping a weapon out while in a wielding state can put the player in a
barehanded wielding state, which would be inconsistent with the fact
that that state can't be entered by toggling wield while barehanded.
Rationale for setting the new behavior:
Setting character state to idle was originally added because "Interact"
was mapped to right mouse button, so picking up an item with RMB would
also activate secondary attack if the player was wielding during the
interaction. Now the default keybinding for "Interact" is E, so this
isn't a problem unless the player changes their keybinding to RMB.
In addition, setting character state to idle for any inventory
manipulation may cause players to fall out of glider unexpectedly.
2020-07-07 09:43:48 -07:00
Joshua Yanovski
69e508d8c9
Make it easy to switch to SIMD for math.
2020-07-07 18:41:37 +02:00
Justin Shipsey
e8b4b29d70
Merge branch 'scott-c/1h-fixes' into 'master'
...
1h fixes
See merge request veloren/veloren!1158
2020-07-07 15:29:33 +00:00
