9e9cbd290b
cargo fmt
2021-07-15 15:52:10 -04:00
0ded44d635
Cleaned up chunk-relative block setting math
2021-07-15 12:36:00 -07:00
9864344cfe
Implemented setting blocks with the wiring system
2021-07-15 12:36:00 -07:00
a3da5b31d6
Add asp sound effects
2021-07-15 20:15:36 +02:00
171113ea74
Added a spacing_radius method to body to make it possible to sett different spacing for different entities
2021-07-15 13:33:51 -04:00
1e3cc3442f
Made the spacing also take the radius of the entity into account per @zesterer suggestion and added a baias variable to change how much priority should be given to separation vs target(1.0 being only focus on separating and 0.0 being only focus on target)
2021-07-15 13:33:51 -04:00
2a5d4fa826
fixing issue #1153 - Improve combat AI spacing between Agents of the same Alignment
2021-07-15 13:33:51 -04:00
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
c1c331d59e
Resolve all '#[allow(clippy::approx_constant)]' error supressions
2021-07-15 16:56:55 +00:00
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
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
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
5cc2fc8182
Resolve all '#[allow(clippy::or_fun_call))]' error supressions
2021-07-15 13:49:59 +02:00
2ff74f5cc9
Resolve all '#[allow(clippy::useless_format)]' error supressions
2021-07-15 13:46:53 +02:00
d10cb2f161
Resolve all '#[allow(clippy::int_plus_one)]' error supressions
2021-07-15 12:47:57 +02:00
7c2cf9f707
only build once, dont build multiple targets. save time
...
Profiles:
(all are build, all are release, all are --no-default-features --features="default-publish" )
A) -p veloren-voxygen AND -p veloren-server-cli
B) NONE AND -p veloren-server-cli
C) NONE
D) NONE but server-cli/Cargo.toml has a default-publish feature
Timings
A)
> time cargo build -p veloren-voxygen --release --no-default-features --features default-publish
Compiling veloren-client v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/client)
Compiling refinery v0.5.0 (https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e#8ecf4b47 )
Compiling gfx-auxil v0.9.0 (https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3 )
Compiling gfx-backend-gl v0.8.1 (https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3 )
Compiling veloren-server v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server)
Compiling wgpu v0.8.0 (https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549 )
Compiling wgpu-profiler v0.4.0 (https://github.com/Imberflur/wgpu-profiler?tag=wgpu-0.8#b156eb14 )
Finished release [optimized] target(s) in 16m 19s
cargo build -p veloren-voxygen --release --no-default-features --features 3091.78s user 71.80s system 322% cpu 16:19.44 total
> time cargo build --release -p veloren-server-cli
Compiling veloren-world v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/world)
Compiling refinery v0.5.0 (https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e#8ecf4b47 )
Compiling veloren-server v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server)
Compiling veloren-server-cli v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server-cli)
Finished release [optimized] target(s) in 6m 06s
cargo build --release -p veloren-server-cli 1024.29s user 18.42s system 284% cpu 6:06.62 total
B)
> time cargo build --release --no-default-features --features default-publish
Compiling veloren-client v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/client)
Compiling veloren-voxygen-egui v0.9.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/egui)
Compiling gfx-auxil v0.9.0 (https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3 )
Compiling gfx-backend-gl v0.8.1 (https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3 )
Compiling refinery v0.5.0 (https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e#8ecf4b47 )
Compiling veloren-server v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server)
Compiling wgpu v0.8.0 (https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549 )
Compiling wgpu-profiler v0.4.0 (https://github.com/Imberflur/wgpu-profiler?tag=wgpu-0.8#b156eb14 )
Compiling veloren-voxygen-anim-dyn v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/anim/dyn)
Compiling veloren-voxygen-egui-dyn v0.9.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/egui/dyn)
Compiling veloren-server-cli v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server-cli)
Finished release [optimized] target(s) in 17m 10s
cargo build --release --no-default-features --features default-publish 4415.58s user 91.10s system 437% cpu 17:10.66 total
> time cargo build --release -p veloren-server-cli
Compiling veloren-world v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/world)
Compiling refinery v0.5.0 (https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e#8ecf4b47 )
Compiling veloren-server v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server)
Compiling veloren-server-cli v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server-cli)
Finished release [optimized] target(s) in 6m 08s
cargo build --release -p veloren-server-cli 1123.93s user 23.01s system 311% cpu 6:08.14 total
C)
> time cargo build --release --no-default-features --features default-publish
Compiling prometheus-hyper v0.1.2
Compiling authc v1.0.0 (https://gitlab.com/veloren/auth.git?rev=fb3dcbc4962b367253f8f2f92760ef44d2679c9a#fb3dcbc4 )
Compiling veloren-common-net v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/common/net)
Compiling veloren-plugin-api v0.1.0 (/mnt/nfs/marcel/Entw/Rust/veloren/plugin/api)
Compiling veloren-voxygen-anim v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/anim)
Compiling veloren-plugin-rt v0.1.0 (/mnt/nfs/marcel/Entw/Rust/veloren/plugin/rt)
Compiling veloren-common-systems v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/common/systems)
Compiling veloren-common-state v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/common/state)
Compiling veloren-world v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/world)
Compiling veloren-world v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/world)
Compiling veloren-client v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/client)
Compiling veloren-voxygen-egui v0.9.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/egui)
Compiling refinery v0.5.0 (https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e#8ecf4b47 )
Compiling veloren-server v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server)
Compiling gfx-auxil v0.9.0 (https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3 )
Compiling gfx-backend-gl v0.8.1 (https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3 )
Compiling wgpu v0.8.0 (https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549 )
Compiling wgpu-profiler v0.4.0 (https://github.com/Imberflur/wgpu-profiler?tag=wgpu-0.8#b156eb14 )
Compiling veloren-voxygen-anim-dyn v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/anim/dyn)
Compiling veloren-voxygen-egui-dyn v0.9.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/egui/dyn)
Compiling veloren-server-cli v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server-cli)
Finished release [optimized] target(s) in 16m 41s
cargo build --release --no-default-features --features default-publish 4349.71s user 90.02s system 443% cpu 16:41.58 total
D)
> time cargo build --release --no-default-features --features default-publish
Compiling prometheus-hyper v0.1.2
Compiling authc v1.0.0 (https://gitlab.com/veloren/auth.git?rev=fb3dcbc4962b367253f8f2f92760ef44d2679c9a#fb3dcbc4 )
Compiling veloren-common-net v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/common/net)
Compiling veloren-plugin-api v0.1.0 (/mnt/nfs/marcel/Entw/Rust/veloren/plugin/api)
Compiling veloren-voxygen-anim v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/anim)
Compiling veloren-plugin-rt v0.1.0 (/mnt/nfs/marcel/Entw/Rust/veloren/plugin/rt)
Compiling veloren-common-state v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/common/state)
Compiling veloren-common-systems v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/common/systems)
Compiling veloren-world v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/world)
Compiling veloren-client v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/client)
Compiling veloren-voxygen-egui v0.9.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/egui)
Compiling refinery v0.5.0 (https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e#8ecf4b47 )
Compiling veloren-server v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server)
Compiling gfx-auxil v0.9.0 (https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3 )
Compiling gfx-backend-gl v0.8.1 (https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3 )
Compiling wgpu v0.8.0 (https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549 )
Compiling wgpu-profiler v0.4.0 (https://github.com/Imberflur/wgpu-profiler?tag=wgpu-0.8#b156eb14 )
Compiling veloren-voxygen-egui-dyn v0.9.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/egui/dyn)
Compiling veloren-voxygen-anim-dyn v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/voxygen/anim/dyn)
Compiling veloren-server-cli v0.10.0 (/mnt/nfs/marcel/Entw/Rust/veloren/server-cli)
Finished release [optimized] target(s) in 17m 30s
cargo build --release --no-default-features --features default-publish 4462.34s user 92.17s system 433% cpu 17:31.00 total
Hashes
A)
veloren-voxygen: e9de69144b4d459dc0da2775b2b87ac9
veloren-server-cli: 8c131c1b1daaa6efd0f83d95d9b5dad9
B)
veloren-voxygen: 415e14ec1c14a6a559d2908b843d88d5
veloren-server-cli: 8c131c1b1daaa6efd0f83d95d9b5dad9
C)
veloren-voxygen: 415e14ec1c14a6a559d2908b843d88d5
veloren-server-cli: 3bf56d0d0a76191a578ed5e71389f512
D)
veloren-voxygen: 415e14ec1c14a6a559d2908b843d88d5
veloren-server-cli: c9dc4fb0bfcbd831150eebac788e2f71
Binary Sizes:
A)
veloren-voxygen: 156667288
veloren-server-cli: 85136736
B)
veloren-voxygen: 162860552
veloren-server-cli: 85136736
C)
veloren-voxygen: 162860552
veloren-server-cli: 95597304
D)
veloren-voxygen: 162860552
veloren-server-cli: 95586360
Total Cache Size:
A) 4.1G
B) 5G
C) 4.1G
D) 4.1G
2021-07-15 10:56:32 +02:00
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
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
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
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
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
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
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
