juliancoffee
df477f7d3b
Cleaning
2021-07-14 19:26:11 +03:00
juliancoffee
263b068a83
Teach AI how to leap again
...
+ adjust hammer and axe AI timings
2021-07-14 19:25:55 +03:00
Marcel Märtens
a53f34ff02
alternative to packaged_simd, as coverage does not compile withit, and it was left out in the simd feature
2021-07-14 14:53:27 +02:00
juliancoffee
eeafd01b03
Teach AI how to glide again
2021-07-14 15:24:15 +03:00
juliancoffee
7f30760ce9
Agent code refactoring
...
0) extracting code branches to closures
1) make RTSim remember target, even if they can't speak about it
2) make only RTSim Ships constantly flying (and not every flying RTSim)
You can tame RTSim Phoenix, yay
2021-07-14 14:55:50 +03:00
Marcel
9cbece8268
Merge branch 'holychowders/make_agents_emit_alarms' into 'master'
...
Make Guards Defend Villagers
See merge request veloren/veloren!2312
2021-07-14 07:40:44 +00:00
holychowders
a1db073af5
Make Guards Defend Villagers
2021-07-14 07:40:43 +00:00
Sam
dc31b9fd1e
Particles for healing aura
2021-07-13 20:54:43 -05:00
Samuel Keiffer
b1fd246a77
Merge branch 'knightresspaladin/buff-bow-scaling' into 'master'
...
Buffed scaling for bow charged shot
See merge request veloren/veloren!2596
2021-07-14 00:45:55 +00:00
Knightress Paladin
becd8b4d2d
Buffed scaling for bow charged shot
2021-07-13 15:25:35 -07:00
Monty Marz
79243e970c
Merge branch 'pfau/char_selection_frames' into 'master'
...
Char selection list frames
See merge request veloren/veloren!2592
2021-07-13 13:14:00 +00:00
Monty Marz
afcb3eb1e7
char selection frames, adjustments
2021-07-13 13:31:01 +02:00
Marcel
af613475ca
Merge branch 'xMAC94x/biomeinfo' into 'master'
...
add biome and site info to F3 debug menu
See merge request veloren/veloren!2593
2021-07-12 18:13:11 +00:00
Marcel Märtens
63d790bb45
add biome and site info to F3 debug menu
2021-07-12 18:44:54 +02:00
Marcel
aac977d0da
Merge branch 'xMAC94x/update-toolchain' into 'master'
...
xMAC94x/update toolchain
See merge request veloren/veloren!2594
2021-07-12 15:00:29 +00:00
Marcel Märtens
2cb27be0c6
clippy fixes in tests
2021-07-12 13:35:26 +02:00
Marcel Märtens
851b9ae5ec
adjust cache image tag
2021-07-12 12:14:54 +02:00
Marcel Märtens
e2cd431908
fmt after applying clippy fixes after toolchain update
2021-07-12 12:09:27 +02:00
Marcel Märtens
7153e8879d
fix clippy warnings
2021-07-12 12:09:09 +02:00
Marcel Märtens
3429c2b53c
update toolchain to nightly-2021-07-06
2021-07-12 00:15:37 +02:00
Samuel Keiffer
37f544efbe
Merge branch 'sam/buff-stat' into 'master'
...
Added buff strength stat to weapons.
See merge request veloren/veloren!2586
2021-07-11 19:06:13 +00:00
Samuel Keiffer
d2f72f24f9
Merge branch 'ubruntu/trade-entity-name' into 'master'
...
Replace "Player 1" with an NPC name when trading with an NPC
See merge request veloren/veloren!2588
2021-07-11 18:27:34 +00:00
ubruntu
bac0ba468f
Replace "Player 1" with an NPC name when trading with an NPC
2021-07-11 18:27:34 +00:00
Sam
192078c6fb
Added buff strength stat to weapons.
2021-07-11 12:50:38 -05:00
Samuel Keiffer
c5a709943d
Merge branch 'sam/rename-poise-stat' into 'master'
...
Renamed poise_strength to effect_power to allow it to be used more generally...
See merge request veloren/veloren!2589
2021-07-11 15:13:00 +00:00
Marcel
7ad4221d36
Merge branch 'Replace-deprecated-constant' into 'master'
...
Replace deprecated constant in 'loot_scroller'
See merge request veloren/veloren!2590
2021-07-11 12:40:12 +00:00
Dr. Dystopia
355df0c898
Replace deprecated constant in 'loot_scroller'
2021-07-11 13:13:36 +02:00
Knightress Paladin
1289b21e70
Removed references to Healing Beam, which Healing Aura is replacing
2021-07-10 21:39:11 -07:00
Sam
61a18a671d
Renamed poise_strength to effect_power to allow it to be used more generally with other weapons in the future.
2021-07-10 23:22:00 -05:00
Knightress Paladin
a2c89cd66b
Added healing aura duration skill to voxygen UI
2021-07-10 20:02:36 -07:00
Knightress Paladin
97e59fc633
Added combo scaling to healing aura and allowed cultists to use it
2021-07-10 20:02:36 -07:00
Knightress Paladin
ac5bec1b09
Add healing aura for sceptre M2
2021-07-10 20:02:35 -07:00
Marcel
3cac4d9479
Merge branch 'szabo_lambert/hungarian_translation' into 'master'
...
Updating the Hungarian translation (minor changes in 6 files, major changes in 14 files)
See merge request veloren/veloren!2580
2021-07-10 17:25:57 +00:00
Szabó Lambert
333fc7f1a8
Updating the Hungarian translation (minor changes in 6 files, major changes in 14 files)
2021-07-10 17:25:56 +00:00
Marcel
537748c505
Merge branch 'alphyr/update_wasmer' into 'master'
...
Update wasmer to 2.0
See merge request veloren/veloren!2585
2021-07-10 15:19:25 +00:00
Benoît du Garreau
2a14509640
Update wasmer
2021-07-10 15:06:51 +02:00
Samuel Keiffer
7cc4a7b593
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
9634448eff
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
e739208f43
Replace deprecated constant in 'chat'
2021-07-09 21:00:15 +00:00
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
