Samuel Keiffer
|
351a68944b
|
Merge branch 'juliancoffee/skill_truth' into 'master'
Move skill boost modifiers to skills module
See merge request veloren/veloren!2540
|
2021-07-09 23:05:48 +00:00 |
|
Samuel Keiffer
|
f7a97f2de5
|
Merge branch 'Replace-deprecated-constant' into 'master'
Replace deprecated constant in 'chat'
See merge request veloren/veloren!2581
|
2021-07-09 21:00:16 +00:00 |
|
Jonathan Berglin
|
00434b25c0
|
Replace deprecated constant in 'chat'
|
2021-07-09 21:00:15 +00:00 |
|
Marcel
|
6d63461222
|
Merge branch 'xMAC94x/fix_test_not_running_in_merge_train' into 'master'
xMAC94x/fix test not running in merge train
See merge request veloren/veloren!2524
|
2021-07-09 18:15:19 +00:00 |
|
Marcel Märtens
|
88fb4deebf
|
allow optinal releases on master if its no merge_request to allow it on forks, also adjust the workflow rules to run on release branches
ignore Gitlab user also for releases, as all protected branches are synced
|
2021-07-09 19:06:39 +02:00 |
|
Samuel Keiffer
|
32c2807ee0
|
Merge branch 'swrup/fix_melee_hit_count_increment' into 'master'
fix melee hit_count increment
See merge request veloren/veloren!2574
|
2021-07-09 16:17:51 +00:00 |
|
swrup
|
02151417f2
|
fix melee hit_count increment
|
2021-07-09 16:17:51 +00:00 |
|
Samuel Keiffer
|
b725cf57bb
|
Merge branch 'knightresspaladin/fix-melee-leap' into 'master'
Added check to prevent melee leaps from stalling in liquids
See merge request veloren/veloren!2584
|
2021-07-09 15:02:13 +00:00 |
|
Marcel Märtens
|
6efe3523d5
|
test on merge event rather than branch name master as a fork could also have a branch master
|
2021-07-09 11:19:22 +02:00 |
|
Marcel Märtens
|
fcc6bb819b
|
make sure that all CI jobs run always and not only in branch
|
2021-07-09 11:19:20 +02:00 |
|
Marcel
|
1c8e47b9b1
|
Merge branch 'caldog20/patch_chat_scrolling_#1203' into 'master'
Prevent chat from scrolling with new messages while reading history.
See merge request veloren/veloren!2583
|
2021-07-09 08:57:47 +00:00 |
|
Knightress Paladin
|
c5c89e8662
|
Added check to prevent melee leaps from stalling in liquids
|
2021-07-08 23:52:00 -07:00 |
|
Samuel Keiffer
|
cc505faa66
|
Merge branch 'swrup/apply_attack_return_bool' into 'master'
make apply_attack() return if attack was actually applied
See merge request veloren/veloren!2582
|
2021-07-09 01:04:01 +00:00 |
|
Caleb
|
ffeb936601
|
Prevent chat from scrolling with new messages if not already at the bottom to allow players to read history
|
2021-07-08 20:01:07 -05:00 |
|
Swrup
|
a8579670cf
|
make apply_attack() return if attack was actually applied
|
2021-07-08 21:05:32 +02:00 |
|
Marcel
|
8bb5fb6c14
|
Merge branch 'xMAC94x/dependencies' into 'master'
update dependencies
See merge request veloren/veloren!2577
|
2021-07-08 16:40:37 +00:00 |
|
Marcel
|
4b1a3891df
|
Merge branch 'Refactor-prepare_tab_completion-function' into 'master'
Convert 'prepare_tab_completion' to ternary operation in 'chat' file
See merge request veloren/veloren!2579
|
2021-07-08 15:25:50 +00:00 |
|
Dr. Dystopia
|
7ded50a668
|
Convert 'prepare_tab_completion' to ternary operation in 'chat' file
|
2021-07-08 16:38:27 +02:00 |
|
Marcel Märtens
|
98800c5424
|
update depednencies
|
2021-07-08 12:21:02 +02:00 |
|
Samuel Keiffer
|
72fa4f2180
|
Merge branch 'knightresspaladin/sceptre-ai' into 'master'
Knightresspaladin/sceptre ai
See merge request veloren/veloren!2572
|
2021-07-08 03:43:42 +00:00 |
|
Knightress Paladin
|
adc337530c
|
Merge branch 'knightresspaladin/sceptre-ai' of https://gitlab.com/veloren/dev/veloren into knightresspaladin/sceptre-ai
|
2021-07-07 20:03:26 -07:00 |
|
Knightress Paladin
|
d0bb7004ab
|
Added check to prevent sceptre AI from canceling its own ward
|
2021-07-07 20:01:00 -07:00 |
|
Knightress Paladin
|
65d67ef781
|
Clean up sceptre ai code before merge
|
2021-07-07 20:00:35 -07:00 |
|
Knightress Paladin
|
63c5d9f7df
|
Fixed formatting
|
2021-07-07 20:00:35 -07:00 |
|
Knightress Paladin
|
ba35aaaf90
|
Add check to see if cultist already has ward buff
|
2021-07-07 20:00:35 -07:00 |
|
Knightress Paladin
|
35242c71e1
|
Added sceptre tactic and sceptre cultists
|
2021-07-07 20:00:01 -07:00 |
|
Knightress Paladin
|
4aa623d6c2
|
Added check to prevent sceptre AI from canceling its own ward
|
2021-07-07 19:21:30 -07:00 |
|
Knightress Paladin
|
abe2e4d2ea
|
Clean up sceptre ai code before merge
|
2021-07-07 17:56:47 -07:00 |
|
Knightress Paladin
|
08cc63c19a
|
Fixed formatting
|
2021-07-07 17:06:02 -07:00 |
|
Dominik Broński
|
e6af005ed1
|
Merge branch 'pfau/stuff' into 'master'
Minimap modes, Danari customizations update & bald hairstyles
See merge request veloren/veloren!2576
|
2021-07-08 00:01:09 +00:00 |
|
Monty Marz
|
7c8d73a0c6
|
Minimap modes, Danari customizations update & bald hairstyles
|
2021-07-08 00:01:08 +00:00 |
|
Samuel Keiffer
|
d4be464e9f
|
Merge branch 'sam/energy-stat' into 'master'
Added energy efficiency stat to weapons.
See merge request veloren/veloren!2571
|
2021-07-07 22:57:58 +00:00 |
|
Joshua Barretto
|
092229432c
|
Merge branch 'revert-fc835f67' into 'master'
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'"
See merge request veloren/veloren!2575
|
2021-07-07 22:47:42 +00:00 |
|
Joshua Barretto
|
ad1f6a5304
|
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'"
This reverts merge request !2566
|
2021-07-07 22:07:00 +00:00 |
|
Joshua Barretto
|
9333afc6f1
|
Merge branch 'DixieDev/569-fix-inventory-and-lantern-usage-while-dead' into 'master'
Fix players having inventory and lantern control while dead
Closes #569
See merge request veloren/veloren!2569
|
2021-07-07 18:44:01 +00:00 |
|
juliancoffee
|
066e0a0323
|
Revert non-ui code changes
|
2021-07-07 17:53:17 +03:00 |
|
juliancoffee
|
034b032954
|
Add tests
|
2021-07-07 17:51:30 +03:00 |
|
juliancoffee
|
20c0c7f44f
|
Use code-spliced values for i18n skill description
|
2021-07-07 17:51:30 +03:00 |
|
juliancoffee
|
67f22baed5
|
Add support for splicing numbers into skill desc
|
2021-07-07 17:51:30 +03:00 |
|
juliancoffee
|
274acae939
|
Move skill boost modifiers to skills module
|
2021-07-07 17:51:30 +03:00 |
|
DixiE
|
76fe63ed9a
|
Fix players having inventory and lantern control while dead
|
2021-07-07 13:18:24 +01:00 |
|
Marcel
|
e387617017
|
Merge branch 'Swagazaki-master-patch-23928' into 'master'
Just updated common.ron to correct a few French translations!
See merge request veloren/veloren!2573
|
2021-07-07 11:53:01 +00:00 |
|
Swagazaki
|
cb3e932832
|
Just updated common.ron to correct a few French translations!
|
2021-07-07 10:55:15 +00:00 |
|
Knightress Paladin
|
598d6594ff
|
Add check to see if cultist already has ward buff
|
2021-07-06 21:10:33 -07:00 |
|
Sam
|
509461763b
|
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
|
2021-07-06 22:54:23 -05:00 |
|
Samuel Keiffer
|
2d7a4d6bee
|
Merge branch 'snowram/dungeon-entraces-biomes' into 'master'
Spawn dungeon entrances depending on the Site origin biome
See merge request veloren/veloren!2554
|
2021-07-07 02:47:34 +00:00 |
|
Snowram
|
5dfef5a563
|
Spawn dungeon entrances depending on the Site origin biome
|
2021-07-07 00:35:50 +02:00 |
|
Samuel Keiffer
|
01a8f53ba3
|
Merge branch 'aweinstock/improve-airship-pid' into 'master'
Fix integral error calculations in PID controller, and change coefficients for...
See merge request veloren/veloren!2568
|
2021-07-06 21:38:07 +00:00 |
|
Samuel Keiffer
|
bc47991592
|
Merge branch 'sam/fix-network-test' into 'master'
Fix network test
See merge request veloren/veloren!2567
|
2021-07-06 21:29:51 +00:00 |
|
Samuel Keiffer
|
e5a5d28246
|
Merge branch 'sam/range-stat' into 'master'
Added range stat to weapons.
See merge request veloren/veloren!2563
|
2021-07-06 21:18:47 +00:00 |
|