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

Commit Graph

  • 2c1a141fd8 Merge branch 'a1phyr/assets_manager_0.12' into 'master' master weekly nightly Marcel 2024-08-28 16:47:43 +00:00
  • 5fddb29001 Merge branch 'xMAC94x/fix_quinn_panic' into 'master' Marcel 2024-08-27 22:34:02 +00:00
  • 608bc8ac56 Update assets_manager to 0.12 Benoît du Garreau 2024-08-27 22:36:09 +02:00
  • 3bc59ed42f with the new rustls 0.23 update, we had call a Cryptprovider, HostEZ notified us about a client panic when usiong srv Voxygen has paniced: rustls default CryptoProvider not set. Marcel Märtens 2024-06-08 10:29:15 +02:00
  • bc4c7dcd5d Merge branch 'coffee-compiler/rename_diary_shortcut' into 'master' Samuel Keiffer 2024-08-25 20:45:26 +00:00
  • 3541d2871b Rename game input for spellbook to diary coffee-compiler 2024-08-25 20:45:26 +00:00
  • e34ceeae5d Merge branch 'coffee-compiler/use_content_plain_explicitly' into 'master' Marcel 2024-08-25 17:18:30 +00:00
  • 5a69587c92 Use Content::Plain explicitly coffee-compiler 2024-08-25 17:18:30 +00:00
  • 9971aa26a4 Merge branch 'coffee-compiler/localize_map_shape' into 'master' Illia Denysenko 2024-08-24 08:23:04 +00:00
  • e760d3c1a0 Localize map shape for world generation coffee-compiler 2024-08-24 08:23:04 +00:00
  • 67905d0388 Merge branch 'isse/fix-test-voxygen' into 'master' Isse 2024-08-21 17:04:01 +00:00
  • 488062643b Merge branch 'coffee-compiler/localize_server_command_results' into 'master' Illia Denysenko 2024-08-21 07:36:03 +00:00
  • ffccc81881 Localize more server command results coffee-compiler 2024-08-21 07:36:01 +00:00
  • 8361d2edfd Merge branch 'matsuuii/fix_case_ignore_in_server_cli' into 'master' Marcel 2024-08-19 21:55:43 +00:00
  • b04ba00292 Fix ignore case for admin add command Matthew Searle 2024-08-19 14:36:58 -06:00
  • 259fa94d61
         use cfg_attr Isse 2024-08-19 21:53:37 +02:00
  • 6659a512ec
         fix test-voxygen errors and warnings Isse 2024-08-19 19:17:40 +02:00
  • 676b678b52 Merge branch 'coffee-compiler/cap_long_paste_input' into 'master' Imbris 2024-08-18 19:10:53 +00:00
  • 7c7f2072b5 Remove client side chat message capping coffee-compiler 2024-08-18 19:10:53 +00:00
  • 8a96ff715e Merge branch 'coffee-compiler/fix_missing_localization_arg_error' into 'master' Illia Denysenko 2024-08-18 14:15:17 +00:00
  • 60b4e528fe Replace variable key in ftl files coffee-compiler 2024-08-18 14:15:16 +00:00
  • b598f38eca Merge branch 'coffee-compiler/restrict_chat_msg_len_client' into 'master' Marcel 2024-08-18 11:40:00 +00:00
  • 34d6e8d53a Restrict chat message length on client side coffee-compiler 2024-08-18 11:39:59 +00:00
  • b7d3dc998c Merge branch 'coffee-compiler/localize_help_strings' into 'master' Illia Denysenko 2024-08-17 18:12:55 +00:00
  • 9e55aaa702 Localize command descriptions & help summaries coffee-compiler 2024-08-17 18:12:55 +00:00
  • 68b74000f7 Merge branch 'coffee-compiler/update_cmd_doc_gen' into 'master' crabman 2024-08-16 15:32:50 +00:00
  • 9d22f79ce0 Update cmd_doc_gen to print client command table as well coffee-compiler 2024-08-16 15:32:50 +00:00
  • 9b58fc650e Merge branch 'weblate-translation' into 'master' crabman 2024-08-15 20:35:46 +00:00
  • e968b9002f Update translation files (Weblate) Otto Richter 2024-08-15 20:35:46 +00:00
  • 83191551c5 Merge branch 'crab/fix-player-trading' into 'master' Marcel 2024-08-15 13:44:16 +00:00
  • 6277e93911
         Allow trading from player to player again crabman 2024-08-15 13:04:42 +00:00
  • 09825d6769 Merge branch 'uniior/sword-anims2' into 'master' crabman 2024-08-14 14:20:44 +00:00
  • 9912149f56 Sword animations #2 Uniior 2024-08-14 14:20:44 +00:00
  • b8feae67de Merge branch 'coffee-compiler/fix_trade_with_everyone' into 'master' crabman 2024-08-14 09:53:58 +00:00
  • ea533afc01 Fix ability to send trade requests to every entity coffee-compiler 2024-08-14 09:53:58 +00:00
  • 5ec99290f2 Merge branch 'coffee-compiler/remove_help_window_setting' into 'master' Marcel 2024-08-11 13:29:51 +00:00
  • 9e90503f46 Remove help window option from interface settings coffee-compiler 2024-08-11 13:29:51 +00:00
  • 2365209c12 Merge branch 'coffee-compiler/add_clear_command' into 'master' Imbris 2024-08-07 19:48:46 +00:00
  • 4626036ddf Add clear command coffee-compiler 2024-08-07 19:48:46 +00:00
  • 98011dad62 Merge branch 'coffee-compiler/repair_equipment_requirement_checks' into 'master' Marcel 2024-08-07 15:29:44 +00:00
  • da132d20da Add repair equipment requirement checks coffee-compiler 2024-08-07 15:29:44 +00:00
  • 2c5bff33fe Merge branch 'srpapinha/new-potion-and-some-buffs' into 'master' Samuel Keiffer 2024-08-04 22:14:53 +00:00
  • dcc2163188 Freezing potion and debuff immunity Papinha 2024-08-04 22:14:52 +00:00
  • e6c2808fbd Merge branch 'update-wiki-link' into 'master' crabman 2024-08-03 07:31:34 +00:00
  • 89f5af2002 Merge branch 'coffee-compiler/remove_unused_ftl_keys' into 'master' crabman 2024-08-02 14:13:36 +00:00
  • 7ae4c30458 Remove unused localization keys coffee-compiler 2024-08-02 14:13:36 +00:00
  • 2e3375ccf0
         doc(nix): update wiki link Tomodachi94 2024-08-01 10:50:43 -07:00
  • b78749e01b Merge branch 'coffee-compiler/prevent_empty_server_list_entries' into 'master' Marcel 2024-08-01 01:07:33 +00:00
  • 5c5f33d124 Prevent empty server list entries coffee-compiler 2024-08-01 01:07:32 +00:00
  • 409852591f Merge branch 'coffee-compiler/fix_wrong_highlight_in_interface_settings' into 'master' Marcel 2024-07-31 16:05:21 +00:00
  • 4505e1d0b7 Fix wrong button highlighting in interface settings coffee-compiler 2024-07-31 16:05:21 +00:00
  • 44150f6540 Merge branch 'coffee-compiler/update_crafting_repair_ui' into 'master' Marcel 2024-07-31 13:04:13 +00:00
  • 7a3f3cc555 Reworked repair equipment interface in crafting menu coffee-compiler 2024-07-31 13:04:12 +00:00
  • 366cf18603 Merge branch 'coffee-compiler/fix_server_list_panic' into 'master' Marcel 2024-07-31 07:41:35 +00:00
  • 15eeab7405 Fix crash on server list entry deletion coffee-compiler 2024-07-31 07:41:35 +00:00
  • 126f9f8502 Merge branch 'coffee-compiler/give_item_cmd_success_msg' into 'master' crabman 2024-07-30 18:21:18 +00:00
  • c64bddee68 Receive server message on give_item cmd success coffee-compiler 2024-07-30 18:21:18 +00:00
  • 2a3ed498d0 Merge branch 'coffee-compiler/fix_modular_crafting_flick' into 'master' Marcel 2024-07-29 14:52:22 +00:00
  • 1e052aa905 Fix UI flick when clearing slot in crafting menu coffee-compiler 2024-07-29 14:52:22 +00:00
  • f06440b2c3 Merge branch 'coffee-compiler/localize_pseudo_recipes' into 'master' Marcel 2024-07-29 14:44:01 +00:00
  • 0037c81c27 Localize pseudo recipes coffee-compiler 2024-07-29 14:44:01 +00:00
  • 6f24394c35 Merge branch 'fix-black-minimap' into 'master' Marcel 2024-07-28 20:59:47 +00:00
  • 88d85108d5 Fix minimap bug Aidar Shaikhiev 2024-07-28 20:59:47 +00:00
  • 0669f5d8e6 Merge branch 'coffee-compiler/diary_section_localization' into 'master' Marcel 2024-07-28 20:53:59 +00:00
  • b061e4726e Localize diary section and skill tree titles coffee-compiler 2024-07-28 20:53:59 +00:00
  • 5ede03222d Merge branch 'coffee-compiler/fix_crafting_instructions_overflow' into 'master' Marcel 2024-07-28 20:47:46 +00:00
  • 8b5b177e49 Fix modular weapon crafting instructions overflow coffee-compiler 2024-07-28 20:47:45 +00:00
  • 0e64ac29ad Merge branch 'coffee-compiler/localize_invites' into 'master' Marcel 2024-07-27 22:06:50 +00:00
  • a731d85c83 Localize group & trade invite answers coffee-compiler 2024-07-27 22:06:49 +00:00
  • 2746d8403e Merge branch 'coffee-compiler/localize_singleplayer_server_name' into 'master' Marcel 2024-07-27 22:03:31 +00:00
  • a263d8d88a Localize singleplayer server name in char selection coffee-compiler 2024-07-27 22:03:31 +00:00
  • e70a0f3132 Merge branch 'coffee-compiler/localize_item_amount' into 'master' Marcel 2024-07-27 21:51:09 +00:00
  • 009ca07303 Localize item amount coffee-compiler 2024-07-27 21:51:09 +00:00
  • 127c0ce0aa Merge branch 'coffee-compiler/fix_translation_script' into 'master' Marcel 2024-07-23 19:09:36 +00:00
  • c4a3548359 Fix bin reference in gitlab translation script coffee-compiler 2024-07-23 19:09:36 +00:00
  • fc8ea37762 Merge branch 'coffee-compiler/remove_single_file_binary_folders' into 'master' Marcel 2024-07-23 11:59:15 +00:00
  • 007397c644 Remove single file binary folders coffee-compiler 2024-07-23 11:59:15 +00:00
  • 053416c066 Merge branch 'coffee-compiler/module_structure' into 'master' Marcel 2024-07-22 10:29:30 +00:00
  • 0ce0ffba14 Comply to new module structure convention coffee-compiler 2024-07-22 10:29:30 +00:00
  • 4e63622f2a Merge branch 'sam/anim-restructure-arthropod' into 'master' Samuel Keiffer 2024-07-17 00:26:05 +00:00
  • fbe8bb8263 Merge branch 'coffee-compiler/fix_voxygen_panic_message' into 'master' Isse 2024-07-16 17:49:32 +00:00
  • c1d10279ca fmt code coffee-compiler 2024-07-16 19:14:00 +02:00
  • 2bf4096dfb replace dx11 with opengl in panic msg coffee-compiler 2024-07-16 18:33:23 +02:00
  • ca5c2dca7e Arthropod anim restructure Sam 2024-07-09 18:28:50 -04:00
  • 9452500f16 Merge branch 'xMAC94x/fix_windows_build' into 'master' Marcel 2024-07-10 22:07:53 +00:00
  • 60a92d5d47 the file version changed with the baseimage update to 22.04 Marcel Märtens 2024-07-10 23:34:22 +02:00
  • 21f4ae3b85 Merge branch 'xMAC94x/update_toolchain' into 'master' Marcel 2024-07-10 05:58:25 +00:00
  • 1edde3ed11 update ci tag Marcel Märtens 2024-07-10 07:08:36 +02:00
  • 9c129e8c24 Merge branch 'horblegorble/gnarling-bosses' into 'master' Samuel Keiffer 2024-07-10 00:51:53 +00:00
  • 54e3cef223 downgrade libmimalloc-sys again , as the newest version fails with: Marcel Märtens 2024-07-09 23:21:40 +02:00
  • a698a7d46e update toolchain to nightly-2024-07-07 Marcel Märtens 2024-07-09 16:29:33 +02:00
  • 186aea08fc balancing and const usage for gnarling spawns horblegorble 2024-07-09 19:11:29 +10:00
  • 0dc194bb6b Merge branch 'uniior/sword-anims' into 'master' Samuel Keiffer 2024-07-08 23:56:10 +00:00
  • 94c74cb2f2 Merge branch 'xMAC94x/prepare_toolchain_upgrade' into 'master' Marcel 2024-07-08 23:08:28 +00:00
  • 38e403eab2 cargo fmt uniior 2024-07-08 18:40:38 -04:00
  • 618492da39 prepare comments intendation for next toolchain Marcel Märtens 2024-07-08 09:54:01 +02:00
  • fc6b87d5ca Dual Cross Cut uniior 2024-07-08 12:02:01 -04:00
  • ef3489806e Cross Cut uniior 2024-07-07 15:20:57 -04:00
  • 4b0e31a91d Cascade uniior 2024-06-29 12:40:21 -04:00
  • d9ff439ffe Skewer uniior 2024-06-26 16:28:32 -04:00