Marcel
|
b93717c6ba
|
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
|
fb8e5efe87
|
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
|
439404988e
|
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
|
83ecf7bd32
|
fix melee hit_count increment
|
2021-07-09 16:17:51 +00:00 |
|
Samuel Keiffer
|
861c65ce9b
|
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
|
81dc34ec68
|
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
|
7bac7a99c7
|
make sure that all CI jobs run always and not only in branch
|
2021-07-09 11:19:20 +02:00 |
|
Marcel
|
75f6f5b716
|
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
|
b1cb8bdd1f
|
Added check to prevent melee leaps from stalling in liquids
|
2021-07-08 23:52:00 -07:00 |
|
Samuel Keiffer
|
c61688fa48
|
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
|
9d308f8c45
|
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
|
48bf083efa
|
make apply_attack() return if attack was actually applied
|
2021-07-08 21:05:32 +02:00 |
|
Marcel
|
af047229ce
|
Merge branch 'xMAC94x/dependencies' into 'master'
update dependencies
See merge request veloren/veloren!2577
|
2021-07-08 16:40:37 +00:00 |
|
Marcel
|
a97a08c840
|
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
|
81fc20c9de
|
Convert 'prepare_tab_completion' to ternary operation in 'chat' file
|
2021-07-08 16:38:27 +02:00 |
|
Marcel Märtens
|
e2e1f15cff
|
update depednencies
|
2021-07-08 12:21:02 +02:00 |
|
Samuel Keiffer
|
72d1f04cf9
|
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
|
01595e6a8d
|
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
|
c0752cd6dc
|
Added check to prevent sceptre AI from canceling its own ward
|
2021-07-07 20:01:00 -07:00 |
|
Knightress Paladin
|
484fc3f161
|
Clean up sceptre ai code before merge
|
2021-07-07 20:00:35 -07:00 |
|
Knightress Paladin
|
64ff6c3754
|
Fixed formatting
|
2021-07-07 20:00:35 -07:00 |
|
Knightress Paladin
|
4bd34d1871
|
Add check to see if cultist already has ward buff
|
2021-07-07 20:00:35 -07:00 |
|
Knightress Paladin
|
7d35383be5
|
Added sceptre tactic and sceptre cultists
|
2021-07-07 20:00:01 -07:00 |
|
Knightress Paladin
|
7200b35ca3
|
Added check to prevent sceptre AI from canceling its own ward
|
2021-07-07 19:21:30 -07:00 |
|
Knightress Paladin
|
00a05e82df
|
Clean up sceptre ai code before merge
|
2021-07-07 17:56:47 -07:00 |
|
Knightress Paladin
|
5c98d39317
|
Fixed formatting
|
2021-07-07 17:06:02 -07:00 |
|
Dominik Broński
|
3a2d615fe5
|
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
|
2a1efb4b2b
|
Minimap modes, Danari customizations update & bald hairstyles
|
2021-07-08 00:01:08 +00:00 |
|
Samuel Keiffer
|
f7fa2ce21a
|
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
|
d2325887bf
|
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
|
15200d48df
|
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'"
This reverts merge request !2566
|
2021-07-07 22:07:00 +00:00 |
|
Joshua Barretto
|
7a6a8a741a
|
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 |
|
DixiE
|
86fd512647
|
Fix players having inventory and lantern control while dead
|
2021-07-07 13:18:24 +01:00 |
|
Marcel
|
81952483fa
|
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
|
b824c47d43
|
Just updated common.ron to correct a few French translations!
|
2021-07-07 10:55:15 +00:00 |
|
Knightress Paladin
|
33c4614d35
|
Add check to see if cultist already has ward buff
|
2021-07-06 21:10:33 -07:00 |
|
Sam
|
0b22953f05
|
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
|
2021-07-06 22:54:23 -05:00 |
|
Samuel Keiffer
|
93af5e74a5
|
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
|
6d122c6ade
|
Spawn dungeon entrances depending on the Site origin biome
|
2021-07-07 00:35:50 +02:00 |
|
Samuel Keiffer
|
80fb4fc530
|
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
|
8ee72466f2
|
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
|
9460d76a06
|
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 |
|
Avi Weinstock
|
fdb5dedac1
|
Fix integral error calculations in PID controller, and change coefficients for airship and hot air balloon.
|
2021-07-06 16:52:12 -04:00 |
|
Sam
|
f2b00f965e
|
Fix test
|
2021-07-06 15:49:57 -05:00 |
|
Sam
|
572072608b
|
Addressed review comments. Removed individual stat assignments.
|
2021-07-06 15:27:49 -05:00 |
|
Marcel
|
a466b305da
|
Merge branch 'master' into 'master'
Add Hungarian translation
See merge request veloren/veloren!2559
|
2021-07-06 11:44:58 +00:00 |
|
Knightress Paladin
|
3851ef5183
|
Merge branch 'knightresspaladin/sceptre-ai' of https://gitlab.com/veloren/dev/veloren into knightresspaladin/sceptre-ai
|
2021-07-06 01:48:11 -07:00 |
|
Knightress Paladin
|
67eff74b29
|
Added sceptre tactic and sceptre cultists
|
2021-07-06 01:47:22 -07:00 |
|
Knightress Paladin
|
195341f515
|
Added sceptre tactic and sceptre cultists
|
2021-07-06 01:29:11 -07:00 |
|
Marcel
|
ffcf6360e8
|
Merge branch 'xvar/wgpu-0.9' into 'master'
Updated wgpu to 0.9.0 and egui to 0.13.0
See merge request veloren/veloren!2566
|
2021-07-06 07:27:45 +00:00 |
|