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
7,666 Commits 151 Branches 18 Tags 2.1 GiB
50d0314a75
Commit Graph

7666 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rickey Chamblee
883977a42f Denies any active trades on exit to char select. 2021-04-12 23:00:38 +00:00
Marcel
ef171478f6 Merge branch 'xMAC94x/protocol_errors' into 'master' 
Have a clear error for when the I/O closes and when some protocol is violated....

See merge request veloren/veloren!2082
 2021-04-12 22:44:49 +00:00
Marcel Märtens
9638581d09 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
4fed9dab83 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
831cd9c5db 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
d42c03d57e Fix localization test bug which produced bunch of Unknown states 2021-04-12 21:29:45 +00:00
Samuel Keiffer
c4f3522138 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
a4bd47f340 Support quantity + use Enum for autocompletion + Address comments 2021-04-12 20:07:34 +02:00
Vincent Foulon
0692562533 New Command: "kit" + Removed Command: "debug" 
Update CHANGELOG.md

Update CHANGELOG.md
 2021-04-12 18:53:36 +02:00
Marcel
9289feee23 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
Enrico Marconi
bfd23a9828 fix issue #1065: admin bag and other admin items inside a container doesn't disappear when dropped 2021-04-12 16:21:10 +02:00
Marcel
e3d1d3ddd1 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
dd1e06115e Inverted admin check. 2021-04-12 12:44:19 +02:00
Samuel Keiffer
e1020945dd 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
f7c8389f77 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
e4a67a9ba2 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
4ac8015ed9 Update localization for Ukrainian 2021-04-12 02:28:55 +00:00
Avi Weinstock
df4f44d946 Address MR 2077 review comments. 2021-04-11 22:08:42 -04:00
Avi Weinstock
d401d00d94 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
7c34a96934 Make fade timings configurable, and stop combat music on death. 2021-04-11 22:08:41 -04:00
Avi Weinstock
f1b022cdee 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
0e16c23707 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
5bfdd5f1af Add combat music transitions based on number of enemies in player radius. 2021-04-11 22:08:40 -04:00
Marcel
54024ce401 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
9db290d4ea 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
mdx97
03abe234ee Fix diary toggling when escape menu is open. 2021-04-11 18:53:45 -05:00
Marcel
fd317417fb 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
ddf6a26577 Give NPCs the ability to use potions. 2021-04-11 23:47:29 +00:00
Marcel
5e7adc6767 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
8a25ebb59a Show ctrl-click and shift-click usage in item tooltips during trades. 2021-04-11 22:56:02 +00:00
Marcel
d7a9ab7e23 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
4403cd71a5 Update and fix zh_CN 2021-04-11 22:55:59 +00:00
Marcel
eca27a30b5 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
508dba61a1 Merge branch 'xMAC94x/deps' into 'master' 
update deps

See merge request veloren/veloren!2095
 2021-04-11 22:55:56 +00:00
Joshua Yanovski
2ee8fc378f 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
fd80a97f3d Got rid of content setup macro 2021-04-11 17:36:02 -04:00
hqurve
690419ad90 Placed tabs in a loop and combined tab content chooser using macro 2021-04-11 17:36:02 -04:00
hqurve
469cb391d3 cleaned widget_ids 2021-04-11 17:36:02 -04:00
hqurve
04eea482ce Moved settings window sections into separate files 2021-04-11 17:36:02 -04:00
hqurve
f2340105c1 Moved settings_window.rs to to settings_window/mod.rs 2021-04-11 17:36:02 -04:00
Imbris
f7f584fc49 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
c4294d968d Add/modify Polish translations 2021-04-11 19:10:09 +02:00
Joshua Yanovski
dc4c02baad 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
a2e92c6715 add new loader + move some images 2021-04-11 16:35:25 +02:00
Snowram
52a53963ec Lossless compression of UI assets 2021-04-11 16:35:25 +02:00
Vincent Foulon
de9d5b5e14 clean workspace 
clean workspace (2)

clean workspace (2)
 2021-04-11 16:35:24 +02:00
Vincent Foulon
95f69fea36 remove unused images 2021-04-11 16:35:23 +02:00
Vincent Foulon
2097fbcacd optimized all images 2021-04-11 16:35:23 +02:00
Vincent Foulon
7128c3d3f6 Asset reorganization + removed some unused and duplicates + reduce size of some images 2021-04-11 16:35:17 +02:00
Joshua Yanovski
90c3923119 Fix players being able to pick up other players. 2021-04-11 15:52:55 +02:00