Marcel
5391a612c1
Merge branch 'Resolve-all-'#-allow(clippy--if_same_then_else)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::if_same_then_else)]' error supressions
See merge request veloren/veloren!2602
2021-07-15 21:07:56 +00:00
Jonathan Berglin
b88c23e74f
Resolve all '#[allow(clippy::if_same_then_else)]' error supressions
2021-07-15 21:07:55 +00:00
Marcel
eb08b6a153
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
c1c331d59e
Resolve all '#[allow(clippy::approx_constant)]' error supressions
2021-07-15 16:56:55 +00:00
Marcel
ad2cf88e33
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
583cc38889
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
6fb0395fd0
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
5cc2fc8182
Resolve all '#[allow(clippy::or_fun_call))]' error supressions
2021-07-15 13:49:59 +02:00
Dr. Dystopia
2ff74f5cc9
Resolve all '#[allow(clippy::useless_format)]' error supressions
2021-07-15 13:46:53 +02:00
Dr. Dystopia
d10cb2f161
Resolve all '#[allow(clippy::int_plus_one)]' error supressions
2021-07-15 12:47:57 +02:00
Marcel
c03ad39440
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
7295a2f071
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
f05fc79fe2
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
cc202fe2cb
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
44a840a70a
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
aae3a159b8
Make all Ships constanly flying, not only rtsim
2021-07-14 23:23:35 +03:00
Dr. Dystopia
4d96d6f9a0
Resolve all '#[allow(clippy::neg_multiply)]' error supressions
2021-07-14 22:18:30 +02:00
Dr. Dystopia
fdee2d4a62
Resolve all '#[allow(clippy::unused_unit)]' error supressions
2021-07-14 21:42:29 +02:00
Ben Wallis
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
juliancoffee
d42c7be141
Teach AI how to interact in this evil world
2021-07-14 19:26:12 +03:00
juliancoffee
b6460f6c61
Teach AI how to forgive
2021-07-14 19:26:11 +03:00
juliancoffee
325acc9daf
Teach AI how to heal again
2021-07-14 19:26:11 +03:00
juliancoffee
06e0303e8a
Cleaning
2021-07-14 19:26:11 +03:00
juliancoffee
00a34da48b
Teach AI how to leap again
...
+ adjust hammer and axe AI timings
2021-07-14 19:25:55 +03:00
juliancoffee
56ab92fd05
Teach AI how to glide again
2021-07-14 15:24:15 +03:00
juliancoffee
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
Marcel
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
holychowders
f316f1da60
Make Guards Defend Villagers
2021-07-14 07:40:43 +00:00
Samuel Keiffer
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
Knightress Paladin
5597c3906c
Buffed scaling for bow charged shot
2021-07-13 15:25:35 -07:00
Monty Marz
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
Monty Marz
e379aacf8c
char selection frames, adjustments
2021-07-13 13:31:01 +02:00
Marcel
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
Marcel Märtens
5f780aa0ee
add biome and site info to F3 debug menu
2021-07-12 18:44:54 +02:00
Marcel
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
Marcel Märtens
468cfe84e7
clippy fixes in tests
2021-07-12 13:35:26 +02:00
Marcel Märtens
d345a8f8f0
adjust cache image tag
2021-07-12 12:14:54 +02:00
Marcel Märtens
db8aedd363
fmt after applying clippy fixes after toolchain update
2021-07-12 12:09:27 +02:00
Marcel Märtens
9b3b21f368
fix clippy warnings
2021-07-12 12:09:09 +02:00
Marcel Märtens
fb4f50002e
update toolchain to nightly-2021-07-06
2021-07-12 00:15:37 +02:00
Samuel Keiffer
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
Samuel Keiffer
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
ubruntu
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
Samuel Keiffer
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
Marcel
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
Dr. Dystopia
01a118efc5
Replace deprecated constant in 'loot_scroller'
2021-07-11 13:13:36 +02: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
Marcel
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
Szabó Lambert
0140e75ed4
Updating the Hungarian translation (minor changes in 6 files, major changes in 14 files)
2021-07-10 17:25:56 +00:00
