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
15,344 Commits 151 Branches 18 Tags 2.1 GiB
5ff8e1008e
Commit Graph

15344 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Codeberg Translate
5ff8e1008e
Update translation files 
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:51 +00:00
Codeberg Translate
aacd939ff9
Update translation files 
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:51 +00:00
Codeberg Translate
b216215a3b
Update translation files 
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:51 +00:00
Codeberg Translate
355969727c
Update translation files 
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:50 +00:00
Codeberg Translate
fc88577014
Update translation files 
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:50 +00:00
Codeberg Translate
94b4ee9480
Update translation files 
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:50 +00:00
Codeberg Translate
6815dd546d
Update translation files 
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:50 +00:00
Codeberg Translate
8abffa6dca
Update translation files 
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:49 +00:00
Codeberg Translate
0e58704185
Update translation files 
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:49 +00:00
Codeberg Translate
de9c4892d7
Update translation files 
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:49 +00:00
Codeberg Translate
570d2491ee
Update translation files 
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:49 +00:00
Codeberg Translate
c6609c030c
Update translation files 
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:49 +00:00
Codeberg Translate
ca3a668a57
Update translation files 
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:48 +00:00
Codeberg Translate
9db37106e1
Update translation files 
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:48 +00:00
Illia Denysenko
8f9a771ff6 Merge branch 'gamer-kold/nix-review' into 'master' 
Updated Nix Flake (the dependencies are newer now)

See merge request veloren/veloren!4357
 2024-03-09 10:01:57 +00:00
Illia Denysenko
9429e0512c Merge branch 'weblate-translation' into 'master' 
Fix translation conflict

See merge request veloren/veloren!4370
 2024-03-08 12:13:29 +00:00
Otto Richter
b92235d651 Fix translation conflict 2024-03-08 12:13:29 +00:00
crabman
130aa2aa99 Merge branch 'crabman/npc-pets' into 'master' 
Allow pets in entity configurations

See merge request veloren/veloren!4344
 2024-03-06 20:35:41 +00:00
crabman
d58f7f0931
address review comments 2024-03-06 20:44:06 +01:00
crabman
51152f47fa
**tamed** cultist darkhounds 2024-03-06 20:24:03 +01:00
crabman
504e45ebdb
allow entity -> chunk anchor chains 2024-03-06 20:24:03 +01:00
crabman
40fed95760
allow pet definitions in entity configurations 2024-03-06 20:24:03 +01:00
Illia Denysenko
285791817d Merge branch 'walpo/update-en-translation' into 'master' 
Update English translation

See merge request veloren/veloren!4350
 2024-03-06 18:36:08 +00:00
Javier Pérez
30d924274c Update English translation 2024-03-06 18:36:07 +00:00
Illia Denysenko
8fcdff8304 Merge branch 'weblate-translation' into 'master' 
Update translation files (Weblate)

See merge request veloren/veloren!4366
 2024-03-06 14:42:58 +00:00
Otto Richter
48da79f6a4 Update translation files (Weblate) 2024-03-06 14:42:58 +00:00
Illia Denysenko
840e95f21c Merge branch 'juliancoffee/glider-ability' into 'master' 
Vroom Glider

See merge request veloren/veloren!4282
 2024-03-06 13:13:49 +00:00
Imbris
61a374c23f Merge branch 'imbris/char-load-log' into 'master' 
Logging to identify issue with character list not loading

See merge request veloren/veloren!4368
 2024-03-06 02:50:59 +00:00
Imbris
301fc15b47 Logging to identify issue where the server gets in a state where the character list doesn't load for new clients 2024-03-05 21:05:04 -05:00
juliancoffee
8e34300830 Clean-up glider boosting logic 2024-03-06 03:11:07 +02:00
juliancoffee
d5226eadca Nerf debug glider upward boost 2024-03-06 03:11:07 +02:00
juliancoffee
9b1d074b27 Make all_available_abilities charstate-independent 
+ Fix wrong index bug with Auxiliary abilities
 2024-03-06 03:11:07 +02:00
Illia Denysenko
4e4c35f936 Merge branch 'juliancoffee/broom-tweak-v2' into 'master' 
Made broom even better

See merge request veloren/veloren!4365
 2024-03-06 01:07:25 +00:00
juliancoffee
79c2deb38c Made broom even better 
+ Proper particle positioning
+ Set ori from velocity
 2024-03-06 01:24:57 +02:00
crabman
a49c5edde8 Merge branch 'crabman/item-merging' into 'master' 
Dynamic item merging

See merge request veloren/veloren!4126
 2024-03-05 22:41:47 +00:00
Illia Denysenko
2b570c4161 Merge branch 'crabman/inline-loot-table' into 'master' 
add InlineLootTable to LootSpec

See merge request veloren/veloren!4363
 2024-03-05 22:37:02 +00:00
crabman
feecd6ea2b
Dynamic merging of dropped items 2024-03-05 20:59:32 +00:00
juliancoffee
06caf1fd31 Make WeaponAux always available 2024-03-05 18:30:49 +02:00
crabman
78f08dae9f Merge branch 'crabman/mio-update' into 'master' 
upgrade to mio 0.8.11 to fix RUSTSEC-2024-0019

See merge request veloren/veloren!4364
 2024-03-05 16:28:42 +00:00
juliancoffee
1e6c35dab7 Make GliderAux(_) always available 2024-03-05 17:42:05 +02:00
crabman
82052f4517
add InlineLootTable to LootSpec 2024-03-05 15:36:29 +00:00
crabman
b8e95a7968
upgrade to mio 0.8.11 to fix RUSTSEC-2024-0019 2024-03-05 15:28:46 +00:00
crabman
69ade26498 Merge branch 'crabman/beam-tgt-dist-fix' into 'master' 
Use correct target distance for ray cast in beam system

See merge request veloren/veloren!4361
 2024-03-04 18:21:12 +00:00
crabman
eae7f06165
Use correct target distance for ray cast in beam system 2024-03-04 17:32:23 +00:00
flo
2d658e67d4 Merge branch 'cursekeeper_tweaks' into 'master' 
cursekeeper_tweaks

See merge request veloren/veloren!4356
 2024-03-03 17:50:46 +00:00
flo
327c195374 cursekeeper_tweaks 2024-03-03 17:50:46 +00:00
juliancoffee
18a26731d3 Add glider aux abilities 2024-03-03 17:56:09 +02:00
juliancoffee
3ad227545a Remove char_state from active_auxiliary_key 2024-03-03 17:56:09 +02:00
juliancoffee
4dcf6215d2 Route character state to Diary UI 2024-03-03 17:56:09 +02:00
juliancoffee
3283eb6916 Vroom Glider 
- GlideBoost ability
- Vroom Glider item
- Made possible to attach ability_spec to gliders
- Activate glider ability while Glide/GlideWield

TODO:
- make it visible in voxygen
 2024-03-03 17:56:09 +02:00