Knightress Paladin
c80c5c6ab4
Implemented setting blocks with the wiring system
2021-07-15 12:36:00 -07:00
Marcel
6c916c090f
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--approx_constant)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::approx_constant)]' error supressions
See merge request veloren/veloren!2608
2021-07-15 16:56:57 +00:00
Jonathan Berglin
51aa54ba8d
Resolve all '#[allow(clippy::approx_constant)]' error supressions
2021-07-15 16:56:55 +00:00
Marcel
b60bdab6d0
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--int_plus_one)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::int_plus_one)]' error supressions
See merge request veloren/veloren!2606
2021-07-15 13:35:28 +00:00
Marcel
8ae3a81c62
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--useless_format)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::useless_format)]' error supressions
See merge request veloren/veloren!2609
2021-07-15 13:03:02 +00:00
Marcel
ad9a3f6b28
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--for_loops_over_fallibles)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::or_fun_call)]' error supressions
See merge request veloren/veloren!2607
2021-07-15 12:24:11 +00:00
Dr. Dystopia
66fd06f53c
Resolve all '#[allow(clippy::or_fun_call))]' error supressions
2021-07-15 13:49:59 +02:00
Dr. Dystopia
7c1d35c02e
Resolve all '#[allow(clippy::useless_format)]' error supressions
2021-07-15 13:46:53 +02:00
Dr. Dystopia
3c2f65e0b8
Resolve all '#[allow(clippy::int_plus_one)]' error supressions
2021-07-15 12:47:57 +02:00
Marcel
b8f7975195
Merge branch 'AlexBethel/item-typos' into 'master'
...
Correct spelling errors in item descriptions
See merge request veloren/veloren!2548
2021-07-15 08:15:43 +00:00
Marcel
3e61960a8c
Merge branch 'xvar/remove-tui-as-default' into 'master'
...
Changed veloren-server-cli to run in interactive basic mode as default
See merge request veloren/veloren!2599
2021-07-15 08:15:40 +00:00
Marcel
54672a922e
Merge branch 'juliancoffee/forgiving_travellers' into 'master'
...
AI small fixes
See merge request veloren/veloren!2598
2021-07-15 08:15:25 +00:00
Marcel
543f1fc883
Merge branch 'tygyh/Resolve-all-'#allow(clippy--unused_unit)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::unused_unit)]' error supressions
See merge request veloren/veloren!2600
2021-07-15 07:40:52 +00:00
Marcel
b3bb4708ab
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--neg_multiply)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::neg_multiply)]' error supressions
See merge request veloren/veloren!2603
2021-07-14 22:02:48 +00:00
juliancoffee
5d00aa341c
Make all Ships constanly flying, not only rtsim
2021-07-14 23:23:35 +03:00
Dr. Dystopia
748074f075
Resolve all '#[allow(clippy::neg_multiply)]' error supressions
2021-07-14 22:18:30 +02:00
Dr. Dystopia
61afb82e99
Resolve all '#[allow(clippy::unused_unit)]' error supressions
2021-07-14 21:42:29 +02:00
Ben Wallis
3568fbadcb
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
juliancoffee
2b2d5d7541
Teach AI how to interact in this evil world
2021-07-14 19:26:12 +03:00
juliancoffee
7923876fe4
Teach AI how to forgive
2021-07-14 19:26:11 +03:00
juliancoffee
7394430548
Teach AI how to heal again
2021-07-14 19:26:11 +03:00
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
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
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
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
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
