Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,494 Commits 151 Branches 18 Tags
Commit Graph

4494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nemanja
c3dce91088 #612 Fixed utility items not being removed from inventory/hotbar 2020-07-18 02:41:45 +00:00
Joshua Barretto
25266923a9 Merge branch 'zesterer/small-fixes' into 'master' 
Zesterer/small fixes

See merge request veloren/veloren!1190
 2020-07-14 09:54:17 +00:00
Forest Anderson
e271d32ca1 Merge branch 'nwilder/improve-pt-br-translation' into 'master' 
Nwilder/improve pt br translation

See merge request veloren/veloren!1199
 2020-07-14 03:21:45 +00:00
Joshua Barretto
48391d4f99 Neater compass 2020-07-13 23:23:44 +01:00
Marcel
16ba649df7 Merge branch 'clippy-fixes-useless_conversion' into 'master' 
Fixed suppressed clippy warnings for #587 - useless_conversion

See merge request veloren/veloren!1198
 2020-07-13 20:54:42 +00:00
Ben Wallis
59c30f4835 Fixed suppressed clippy warnings for #587 - useless_conversion 2020-07-13 20:57:13 +01:00
Marcel
587e57ca99 Merge branch 'yusdacra/fix-i18n-test' into 'master' 
Fix localization test and add translation status percentage

See merge request veloren/veloren!1196
 2020-07-13 10:02:00 +00:00
Marcel
27af3f1bef Merge branch 'gSpera/no_autowalk_after_die' into 'master' 
Stopping auto-walk after death: Fixes #607

Closes #607

See merge request veloren/veloren!1197
 2020-07-13 08:39:39 +00:00
Marcel Märtens
de5aaf3fa3 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
e9c4c21a9d 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
5c3e01c678
localization test: add per file data to overall status, better alignments 2020-07-13 00:40:43 +03:00
Kai
257127e5a5 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
Yusuf Bera Ertan
921e753fbc
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
1650375a07
fix localization test 2020-07-12 05:38:11 +03:00
Marcel
6764fcff54 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
c533d6ba5c Add a clientside check to only allow freefly camera for admins 2020-07-11 13:59:47 -07:00
Kai
58adfdb900 Add freefly camera mode and cycle camera mode keybind 2020-07-11 11:39:04 -07:00
Marcel
fdc73074aa 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
07cdf63c06 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
63260ad880 Added migration to fix characters unable to login due to DashMelee ability change 2020-07-11 15:42:19 +01:00
Ben Wallis
e97a964230 Removed rounding from ping delta and added weighted rolling average ping calculation 2020-07-11 15:39:31 +01:00
Joshua Barretto
d3c6bb2c0e Nicer north colour 2020-07-10 18:21:34 +01:00
Marcel
6636be93cc 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
9e015b6377 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
f14e91ca0f Added minimap compass 2020-07-10 15:00:20 +01:00
Songtronix
e24f773441 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
6734a39fd4 fix: show loading screen for singleplayer 2020-07-10 11:05:09 +02:00
Joshua Barretto
33d035973d Improved hill path following 2020-07-10 00:43:11 +01:00
Songtronix
1c841695fc 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
8745e3ca98 fix: use correct specs(-idvs) versions 
related to torvus
 2020-07-09 19:46:30 +02:00
Joshua Barretto
6dc897c874 Commented unused but potentially useful code 2020-07-09 16:54:10 +01:00
Joshua Barretto
4ede438825 Improved pathfinding tolerance and reliability 2020-07-09 16:54:10 +01:00
Joshua Barretto
df4bb6f989 Fixed missed VD update bug 2020-07-09 16:54:10 +01:00
Joshua Barretto
f44b39420b 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
44e6fe01f1 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
8ab24d4c06 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
736132e154 Spin attack for axe 2020-07-08 19:58:41 +00:00
Marcel
2d50d600a5 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
599b1ec627 Added CharacterDataError when character list fails to load due to Loadout de-serialization error 2020-07-08 09:34:20 +01:00
Ben Wallis
240bd0639b Added migration to create a default inventory and loadout for characters without one 2020-07-08 09:09:48 +01:00
Ben Wallis
8b8c68a3b8 Removed de-serialization failure tolerance to prevent player inventory/loadout wipes 2020-07-08 09:09:47 +01:00
Marcel
315ed25f2c 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
Giovanni Spera
fc8cc8ad5e Stopping auto-walk after death: Fixes #607 2020-07-07 20:56:44 +02:00
Ben Frankel
51dc3629c8 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
Justin Shipsey
5d858160df Merge branch 'scott-c/1h-fixes' into 'master' 
1h fixes

See merge request veloren/veloren!1158
 2020-07-07 15:29:33 +00:00
Marcel
466ce77b9d Merge branch 'xMAC94x/specs' into 'master' 
fix specs

See merge request veloren/veloren!1179
 2020-07-07 13:00:09 +00:00
Marcel Märtens
a2a33ddd55 fix specs 2020-07-07 14:28:00 +02:00
Marcel
113151ddf9 Merge branch 'xMAC94x/specs' into 'master' 
specs back to master

See merge request veloren/veloren!1178
 2020-07-07 11:43:31 +00:00
Marcel Märtens
00528bee71 specs back to master 2020-07-07 12:55:06 +02:00
Marcel
d75a800d5e Merge branch 'fix-macos' into 'master' 
revert dispatch

See merge request veloren/veloren!1177
 2020-07-07 10:09:07 +00:00