Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,274 Commits 151 Branches 18 Tags
Commit Graph

9274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Avi Weinstock
17c2459a01 Basic implementation of hat visuals. 2021-07-16 18:49:40 -04:00
Avi Weinstock
b9b666c2dc Address MR 2612 review comments. 2021-07-16 17:46:48 -04:00
Samuel Keiffer
651b775932 Merge branch 'knightresspaladin/healing-aura' into 'master' 
Knightresspaladin/healing aura

See merge request veloren/veloren!2587
 2021-07-16 21:32:03 +00:00
Avi Weinstock
a463b8b171 Defer repositioning until after chunks are generated normally, to reduce latency and avoid duplicate work. 2021-07-16 15:42:50 -04:00
Marcel
b67cf70c70 Merge branch 'savalige/ai_spacing' into 'master' 
Issue #1153 - Improve combat AI spacing between Agents of the same Alignment

Closes #1153

See merge request veloren/veloren!2451
 2021-07-16 16:40:27 +00:00
Monty Marz
1443b3e78d icon 2021-07-16 18:39:14 +02:00
Samuel Keiffer
0ef3a978b0 Merge branch 'juliancoffee/patch_animal_dash_double_hit' into 'master' 
Set charge_through to false for non-humanoid dash

See merge request veloren/veloren!2616
 2021-07-16 15:33:59 +00:00
Marcel Märtens
b04ba58040 fix scripts that ended with && and correct the ASSETS variable for tests 2021-07-16 15:32:39 +02:00
juliancoffee
c6b1446f72 Set charge_through to false for non-humanoid dash 2021-07-16 15:49:02 +03:00
Marcel
33aba370d4 Merge branch 'zesterer/sfx' into 'master' 
Clipped arrow sound effects for more immediate feedback

See merge request veloren/veloren!2476
 2021-07-16 10:32:29 +00:00
Marcel
f10f583a92 Merge branch 'xMAC94x/experiment_ci' into 'master' 
fix/cleanup ci

See merge request veloren/veloren!2595
 2021-07-16 00:33:35 +00:00
Avi Weinstock
47d185d094 Spawn players aboveground when using /site or when their waypoint is underground. 2021-07-15 17:54:29 -04:00
Dominik Broński
d4cde2bffa Merge branch 'knightresspaladin/toggle-block-collision' into 'master' 
Implemented setting blocks with the wiring system

See merge request veloren/veloren!2604
 2021-07-15 21:50:34 +00:00
Marcel
0622ac6308 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
e165d52d03 Resolve all '#[allow(clippy::if_same_then_else)]' error supressions 2021-07-15 21:07:55 +00:00
Avi Weinstock
c037a75310 cargo fmt 2021-07-15 15:52:10 -04:00
Knightress Paladin
60b11ca408 Cleaned up chunk-relative block setting math 2021-07-15 12:36:00 -07:00
Knightress Paladin
c80c5c6ab4 Implemented setting blocks with the wiring system 2021-07-15 12:36:00 -07:00
Aylana
513085da30 Add asp sound effects 2021-07-15 20:15:36 +02:00
Savalige
2a1a84fef7 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
Savalige
04651971c2 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
Savalige
a4458bc335 fixing issue #1153 - Improve combat AI spacing between Agents of the same Alignment 2021-07-15 13:33:51 -04: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 Märtens
ac10410782 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
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
Marcel Märtens
9379aa929a no longer incremental builds in CI 2021-07-14 21:55:12 +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
Marcel Märtens
6cb502c229 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
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
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