Commit Graph

9238 Commits

Author SHA1 Message Date
aae3a159b8 Make all Ships constanly flying, not only rtsim 2021-07-14 23:23:35 +03:00
4d96d6f9a0 Resolve all '#[allow(clippy::neg_multiply)]' error supressions 2021-07-14 22:18:30 +02:00
b3983c5451 no longer incremental builds in CI 2021-07-14 21:55:12 +02:00
fdee2d4a62 Resolve all '#[allow(clippy::unused_unit)]' error supressions 2021-07-14 21:42:29 +02:00
73b5c03510 Changed veloren-server-cli to run in interactive basic mode as default. Removed -b and added -t which enables the tui. 2021-07-14 20:03:16 +01:00
07c044f2e5 extract relevant code in a script in order to remove duplicate coding with docker-ci repo
export VELOREN_ASSETS without pwd to keep caching working
2021-07-14 20:57:08 +02:00
d42c7be141 Teach AI how to interact in this evil world 2021-07-14 19:26:12 +03:00
b6460f6c61 Teach AI how to forgive 2021-07-14 19:26:11 +03:00
325acc9daf Teach AI how to heal again 2021-07-14 19:26:11 +03:00
06e0303e8a Cleaning 2021-07-14 19:26:11 +03:00
00a34da48b Teach AI how to leap again
+ adjust hammer and axe AI timings
2021-07-14 19:25:55 +03:00
9a2c2b300a 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
56ab92fd05 Teach AI how to glide again 2021-07-14 15:24:15 +03:00
59e9fc6530 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
117035f47b 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
f316f1da60 Make Guards Defend Villagers 2021-07-14 07:40:43 +00:00
Sam
997da21001 Particles for healing aura 2021-07-13 20:54:43 -05:00
a5594b9da3 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
5597c3906c Buffed scaling for bow charged shot 2021-07-13 15:25:35 -07:00
46f8bb764e 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
e379aacf8c char selection frames, adjustments 2021-07-13 13:31:01 +02:00
81b8cf21ff 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
5f780aa0ee add biome and site info to F3 debug menu 2021-07-12 18:44:54 +02:00
35d8306c7a Merge branch 'xMAC94x/update-toolchain' into 'master'
xMAC94x/update toolchain

See merge request veloren/veloren!2594
2021-07-12 15:00:29 +00:00
468cfe84e7 clippy fixes in tests 2021-07-12 13:35:26 +02:00
d345a8f8f0 adjust cache image tag 2021-07-12 12:14:54 +02:00
db8aedd363 fmt after applying clippy fixes after toolchain update 2021-07-12 12:09:27 +02:00
9b3b21f368 fix clippy warnings 2021-07-12 12:09:09 +02:00
fb4f50002e update toolchain to nightly-2021-07-06 2021-07-12 00:15:37 +02:00
2633e9d70c 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
89d948c827 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
6bb47b447e Replace "Player 1" with an NPC name when trading with an NPC 2021-07-11 18:27:34 +00:00
Sam
be8b12845a Added buff strength stat to weapons. 2021-07-11 12:50:38 -05:00
7cf5bc4bb7 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
36a0e58a3d 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
01a118efc5 Replace deprecated constant in 'loot_scroller' 2021-07-11 13:13:36 +02:00
146f86be2c Removed references to Healing Beam, which Healing Aura is replacing 2021-07-10 21:39:11 -07:00
Sam
fbcc774911 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
42c3872528 Added healing aura duration skill to voxygen UI 2021-07-10 20:02:36 -07:00
b96bb6fc5d Added combo scaling to healing aura and allowed cultists to use it 2021-07-10 20:02:36 -07:00
b4ec433509 Add healing aura for sceptre M2 2021-07-10 20:02:35 -07:00
7b7d0c0504 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
0140e75ed4 Updating the Hungarian translation (minor changes in 6 files, major changes in 14 files) 2021-07-10 17:25:56 +00:00
9e841a7dea 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
286037166a Update wasmer 2021-07-10 15:06:51 +02:00
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
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
00434b25c0 Replace deprecated constant in 'chat' 2021-07-09 21:00:15 +00:00
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
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