Marcel
44150f6540
Merge branch 'coffee-compiler/update_crafting_repair_ui' into 'master'
...
Reworked repair equipment interface in crafting menu
See merge request veloren/veloren!4541
2024-07-31 13:04:13 +00:00
coffee-compiler
7a3f3cc555
Reworked repair equipment interface in crafting menu
2024-07-31 13:04:12 +00:00
Marcel
366cf18603
Merge branch 'coffee-compiler/fix_server_list_panic' into 'master'
...
Fix crash on server list entry deletion
See merge request veloren/veloren!4540
2024-07-31 07:41:35 +00:00
coffee-compiler
15eeab7405
Fix crash on server list entry deletion
2024-07-31 07:41:35 +00:00
crabman
126f9f8502
Merge branch 'coffee-compiler/give_item_cmd_success_msg' into 'master'
...
Receive server message on give_item cmd success
See merge request veloren/veloren!4539
2024-07-30 18:21:18 +00:00
coffee-compiler
c64bddee68
Receive server message on give_item cmd success
2024-07-30 18:21:18 +00:00
Marcel
2a3ed498d0
Merge branch 'coffee-compiler/fix_modular_crafting_flick' into 'master'
...
Fix UI flick when clearing slot in crafting menu
See merge request veloren/veloren!4538
2024-07-29 14:52:22 +00:00
coffee-compiler
1e052aa905
Fix UI flick when clearing slot in crafting menu
2024-07-29 14:52:22 +00:00
Marcel
f06440b2c3
Merge branch 'coffee-compiler/localize_pseudo_recipes' into 'master'
...
Localize pseudo recipes
See merge request veloren/veloren!4537
2024-07-29 14:44:01 +00:00
coffee-compiler
0037c81c27
Localize pseudo recipes
2024-07-29 14:44:01 +00:00
Marcel
6f24394c35
Merge branch 'fix-black-minimap' into 'master'
...
Fix minimap bug
See merge request veloren/veloren!4514
2024-07-28 20:59:47 +00:00
Aidar Shaikhiev
88d85108d5
Fix minimap bug
2024-07-28 20:59:47 +00:00
Marcel
0669f5d8e6
Merge branch 'coffee-compiler/diary_section_localization' into 'master'
...
Localize diary section and skill tree titles
See merge request veloren/veloren!4532
2024-07-28 20:53:59 +00:00
coffee-compiler
b061e4726e
Localize diary section and skill tree titles
2024-07-28 20:53:59 +00:00
Marcel
5ede03222d
Merge branch 'coffee-compiler/fix_crafting_instructions_overflow' into 'master'
...
Fix modular weapon crafting instructions overflow
See merge request veloren/veloren!4536
2024-07-28 20:47:46 +00:00
coffee-compiler
8b5b177e49
Fix modular weapon crafting instructions overflow
2024-07-28 20:47:45 +00:00
Marcel
0e64ac29ad
Merge branch 'coffee-compiler/localize_invites' into 'master'
...
Localize group & trade invite answers
See merge request veloren/veloren!4535
2024-07-27 22:06:50 +00:00
coffee-compiler
a731d85c83
Localize group & trade invite answers
2024-07-27 22:06:49 +00:00
Marcel
2746d8403e
Merge branch 'coffee-compiler/localize_singleplayer_server_name' into 'master'
...
Localize singleplayer server name in char selection
See merge request veloren/veloren!4533
2024-07-27 22:03:31 +00:00
coffee-compiler
a263d8d88a
Localize singleplayer server name in char selection
2024-07-27 22:03:31 +00:00
Marcel
e70a0f3132
Merge branch 'coffee-compiler/localize_item_amount' into 'master'
...
Localize item amount
See merge request veloren/veloren!4534
2024-07-27 21:51:09 +00:00
coffee-compiler
009ca07303
Localize item amount
2024-07-27 21:51:09 +00:00
Marcel
127c0ce0aa
Merge branch 'coffee-compiler/fix_translation_script' into 'master'
...
Fix bin reference in gitlab translation script
See merge request veloren/veloren!4531
2024-07-23 19:09:36 +00:00
coffee-compiler
c4a3548359
Fix bin reference in gitlab translation script
2024-07-23 19:09:36 +00:00
Marcel
fc8ea37762
Merge branch 'coffee-compiler/remove_single_file_binary_folders' into 'master'
...
Remove single file binary folders
See merge request veloren/veloren!4530
2024-07-23 11:59:15 +00:00
coffee-compiler
007397c644
Remove single file binary folders
2024-07-23 11:59:15 +00:00
Marcel
053416c066
Merge branch 'coffee-compiler/module_structure' into 'master'
...
Comply to new module structure convention
See merge request veloren/veloren!4527
2024-07-22 10:29:30 +00:00
coffee-compiler
0ce0ffba14
Comply to new module structure convention
2024-07-22 10:29:30 +00:00
Samuel Keiffer
4e63622f2a
Merge branch 'sam/anim-restructure-arthropod' into 'master'
...
Arthropod anim restructure
See merge request veloren/veloren!4521
2024-07-17 00:26:05 +00:00
Isse
fbe8bb8263
Merge branch 'coffee-compiler/fix_voxygen_panic_message' into 'master'
...
Replace dx11 with opengl in panic msg
Closes #1958
See merge request veloren/veloren!4524
2024-07-16 17:49:32 +00:00
coffee-compiler
c1d10279ca
fmt code
2024-07-16 19:14:00 +02:00
coffee-compiler
2bf4096dfb
replace dx11 with opengl in panic msg
2024-07-16 18:33:23 +02:00
Sam
ca5c2dca7e
Arthropod anim restructure
2024-07-10 18:17:53 -04:00
Marcel
9452500f16
Merge branch 'xMAC94x/fix_windows_build' into 'master'
...
the file version changed with the baseimage update to 22.04
See merge request veloren/veloren!4523
2024-07-10 22:07:53 +00:00
Marcel Märtens
60a92d5d47
the file version changed with the baseimage update to 22.04
2024-07-10 23:34:22 +02:00
Marcel
21f4ae3b85
Merge branch 'xMAC94x/update_toolchain' into 'master'
...
update toolchain to 2024-07-07
See merge request veloren/veloren!4522
2024-07-10 05:58:25 +00:00
Marcel Märtens
1edde3ed11
update ci tag
2024-07-10 07:10:34 +02:00
Samuel Keiffer
9c129e8c24
Merge branch 'horblegorble/gnarling-bosses' into 'master'
...
broad updates to wooden golem, gnarling chieftain, harvester
See merge request veloren/veloren!4485
2024-07-10 00:51:53 +00:00
Marcel Märtens
54e3cef223
downgrade libmimalloc-sys again , as the newest version fails with:
...
warning: libmimalloc-sys@0.1.39: In file included from c_src/mimalloc/src/prim/prim.c:12,
warning: libmimalloc-sys@0.1.39: from c_src/mimalloc/src/static.c:38:
warning: libmimalloc-sys@0.1.39: c_src/mimalloc/src/prim/windows/prim.c: In function 'win_is_out_of_memory_error':
warning: libmimalloc-sys@0.1.39: c_src/mimalloc/src/prim/windows/prim.c:212:10: error: 'ERROR_COMMITMENT_MINIMUM' undeclared (first use in this function); did you mean 'ERROR_COMMITMENT_LIMIT'?
warning: libmimalloc-sys@0.1.39: 212 | case ERROR_COMMITMENT_MINIMUM:
warning: libmimalloc-sys@0.1.39: | ^~~~~~~~~~~~~~~~~~~~~~~~
warning: libmimalloc-sys@0.1.39: | ERROR_COMMITMENT_LIMIT
warning: libmimalloc-sys@0.1.39: c_src/mimalloc/src/prim/windows/prim.c:212:10: note: each undeclared identifier is reported only once for each function it appears in
error: failed to run custom build command for `libmimalloc-sys v0.1.39`
2024-07-09 23:21:40 +02:00
Marcel Märtens
a698a7d46e
update toolchain to nightly-2024-07-07
2024-07-09 16:29:33 +02:00
horblegorble
186aea08fc
balancing and const usage for gnarling spawns
2024-07-09 19:11:29 +10:00
Samuel Keiffer
0dc194bb6b
Merge branch 'uniior/sword-anims' into 'master'
...
Sword animations #1
See merge request veloren/veloren!4520
2024-07-08 23:56:10 +00:00
Marcel
94c74cb2f2
Merge branch 'xMAC94x/prepare_toolchain_upgrade' into 'master'
...
prepare comments intendation for next toolchain
See merge request veloren/veloren!4519
2024-07-08 23:08:28 +00:00
uniior
38e403eab2
cargo fmt
2024-07-08 18:40:38 -04:00
Marcel Märtens
618492da39
prepare comments intendation for next toolchain
2024-07-09 00:27:25 +02:00
uniior
fc6b87d5ca
Dual Cross Cut
2024-07-08 16:21:46 -04:00
uniior
ef3489806e
Cross Cut
2024-07-08 16:21:45 -04:00
uniior
4b0e31a91d
Cascade
2024-07-08 16:21:45 -04:00
uniior
d9ff439ffe
Skewer
2024-07-08 16:21:45 -04:00
uniior
67691eda44
Fell Strike
2024-07-08 16:15:51 -04:00
