Marcel Märtens
60c3105fae
ITFrame::read_frame now throws an error when the frame_no is invalid.
...
This will be catched by the respective protocols, e.g. tcp and cause a violation
2021-04-13 00:13:08 +02:00
Marcel Märtens
ce1c58fb7b
Have a clear error for when the I/O closes and when some protocol is violated. this should help find the rootcause of a bug.
...
If its Closed it looks like the TCP connection got dropped/cut off (e.g. OS, Wifi).
If its Violated we for sure know the cause is the messages send/recv in a wrong way
2021-04-13 00:12:20 +02:00
Ben Wallis
e669da890a
Merge branch 'juliancoffee/fix_localization_tests' into 'master'
...
Fix localization test bug which produced bunch of Unknown states
See merge request veloren/veloren!2105
2021-04-12 21:29:45 +00:00
Illia Denysenko
5e0fd884c7
Fix localization test bug which produced bunch of Unknown states
2021-04-12 21:29:45 +00:00
Samuel Keiffer
02ac7168d7
Merge branch 'vfoulon80/cmd-item-kits' into 'master'
...
New Command: "kit" + Removed Command: "debug"
See merge request veloren/veloren!2115
2021-04-12 19:36:08 +00:00
Vincent Foulon
bdbbc23b9c
Support quantity + use Enum for autocompletion + Address comments
2021-04-12 20:07:34 +02:00
Vincent Foulon
65ef568d70
New Command: "kit" + Removed Command: "debug"
...
Update CHANGELOG.md
Update CHANGELOG.md
2021-04-12 18:53:36 +02:00
Marcel
a4779ea6b5
Merge branch 'imbris/update-cache-image' into 'master'
...
Update the ci cache image
See merge request veloren/veloren!2106
2021-04-12 15:35:06 +00:00
Marcel
ce47ac5f31
Merge branch 'sharp/inverted-check' into 'master'
...
Inverted admin check.
See merge request veloren/veloren!2112
2021-04-12 10:45:23 +00:00
Joshua Yanovski
85589081ed
Inverted admin check.
2021-04-12 12:44:19 +02:00
Samuel Keiffer
22ef002238
Merge branch 'aweinstock/combat-music' into 'master'
...
Add combat music transitions based on number of enemies in player radius.
See merge request veloren/veloren!2077
2021-04-12 06:01:19 +00:00
Monty Marz
876e9704a6
Merge branch 'hqurve/settings-ui' into 'master'
...
Cleanup of settings window: split each tab into its own file
See merge request veloren/veloren!2108
2021-04-12 04:11:06 +00:00
Marcel
2e8bbeaf4a
Merge branch 'juliancoffee/update-uk_UA' into 'master'
...
Update localization for Ukrainian
See merge request veloren/veloren!2107
2021-04-12 02:28:56 +00:00
Illia Denysenko
015c4a7c91
Update localization for Ukrainian
2021-04-12 02:28:55 +00:00
Avi Weinstock
545eda6eea
Address MR 2077 review comments.
2021-04-11 22:08:42 -04:00
Avi Weinstock
f1f38002ae
Address MR2077 review comments: add comment about group::ENEMY and remove trace statements, and fuse filtering loops.
2021-04-11 22:08:41 -04:00
Avi Weinstock
abdc7bb112
Make fade timings configurable, and stop combat music on death.
2021-04-11 22:08:41 -04:00
Avi Weinstock
8a11a723fd
Add new version of combat soundtrack, and change details of how transitions between tracks work.
2021-04-11 22:08:41 -04:00
Avi Weinstock
70a2027634
Only count enemy group members for combat music, and count bosses as high-intensity via an HP heuristic.
2021-04-11 22:08:41 -04:00
Avi Weinstock
6a3883b8f1
Add combat music transitions based on number of enemies in player radius.
2021-04-11 22:08:40 -04:00
Marcel
39d4d84f15
Merge branch 'DaforLynx/more-music' into 'master'
...
Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds
See merge request veloren/veloren!2102
2021-04-12 00:43:08 +00:00
DaforLynx
e1ca34d9e8
Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds
2021-04-12 00:43:08 +00:00
Marcel
5a76b0e4ec
Merge branch 'aweinstock/npcpotions' into 'master'
...
Give NPCs the ability to use potions.
See merge request veloren/veloren!2092
2021-04-11 23:47:30 +00:00
Avi Weinstock
5bf4048419
Give NPCs the ability to use potions.
2021-04-11 23:47:29 +00:00
Marcel
dc2428b38e
Merge branch 'trade-help-tooltips' into 'master'
...
Show ctrl-click and shift-click usage in item tooltips during trades.
See merge request veloren/veloren!2101
2021-04-11 22:56:03 +00:00
Rickey Chamblee
95c44a6794
Show ctrl-click and shift-click usage in item tooltips during trades.
2021-04-11 22:56:02 +00:00
Marcel
439505c405
Merge branch 'master' into 'master'
...
Update and fix zh_CN
See merge request veloren/veloren!2103
2021-04-11 22:56:00 +00:00
law4x
86e53dbb95
Update and fix zh_CN
2021-04-11 22:55:59 +00:00
Marcel
58bebc39d0
Merge branch 'danielduel/PL-local' into 'master'
...
Add/Extend PL locale
See merge request veloren/veloren!2091
2021-04-11 22:55:58 +00:00
Joshua Yanovski
b42ec9a4e5
Merge branch 'xMAC94x/deps' into 'master'
...
update deps
See merge request veloren/veloren!2095
2021-04-11 22:55:56 +00:00
Joshua Yanovski
01145f4a53
Merge branch 'vfoulon80/reorganize-assets' into 'master'
...
Reorganize and optimize assets
See merge request veloren/veloren!2099
2021-04-11 22:55:54 +00:00
hqurve
ff35d06062
Got rid of content setup macro
2021-04-11 17:36:02 -04:00
hqurve
fe23b0727b
Placed tabs in a loop and combined tab content chooser using macro
2021-04-11 17:36:02 -04:00
hqurve
bd2930a2b0
cleaned widget_ids
2021-04-11 17:36:02 -04:00
hqurve
73d6d86b4e
Moved settings window sections into separate files
2021-04-11 17:36:02 -04:00
hqurve
4668bfb333
Moved settings_window.rs to to settings_window/mod.rs
2021-04-11 17:36:02 -04:00
Imbris
c7d37d6280
Update the ci cache image with image from https://gitlab.com/veloren/veloren-docker-ci/-/merge_requests/38
2021-04-11 19:16:00 +00:00
BuildTools
fcdfd3e223
Add/modify Polish translations
2021-04-11 19:10:09 +02:00
Joshua Yanovski
7c526438bc
Merge branch 'sharp/fix-silly-bug' into 'master'
...
Fix players being able to pick up other players.
See merge request veloren/veloren!2104
2021-04-11 16:34:06 +00:00
Vincent Foulon
eb04bc7335
add new loader + move some images
2021-04-11 16:35:25 +02:00
Snowram
61fe82d4af
Lossless compression of UI assets
2021-04-11 16:35:25 +02:00
Vincent Foulon
36c3b08190
clean workspace
...
clean workspace (2)
clean workspace (2)
2021-04-11 16:35:24 +02:00
Vincent Foulon
c29f75372e
remove unused images
2021-04-11 16:35:23 +02:00
Vincent Foulon
ff6c6da674
optimized all images
2021-04-11 16:35:23 +02:00
Vincent Foulon
c613e0022c
Asset reorganization + removed some unused and duplicates + reduce size of some images
2021-04-11 16:35:17 +02:00
Joshua Yanovski
1c38230494
Fix players being able to pick up other players.
2021-04-11 15:52:55 +02:00
Monty Marz
7dfb344e26
Merge branch 'pfau/map-things' into 'master'
...
UI fixes and more
See merge request veloren/veloren!2100
2021-04-11 03:49:47 +00:00
Monty Marz
04d540c565
UI fixes and more
2021-04-11 03:49:47 +00:00
Joshua Yanovski
32be6c5f8f
Merge branch 'sharp/sprites-in-background' into 'master'
...
Mesh sprites in background.
See merge request veloren/veloren!2098
2021-04-10 20:34:35 +00:00
Marcel
e0af7d8d87
Merge branch 'UMR1352/fix#1059' into 'master'
...
fix issue #1059 : Debug items should disappear when dropped
Closes #1059
See merge request veloren/veloren!2088
2021-04-10 17:41:43 +00:00
