Samuel Keiffer
9c129e8c24
Merge branch 'horblegorble/gnarling-bosses' into 'master'
...
broad updates to wooden golem, gnarling chieftain, harvester
See merge request veloren/veloren!4485
2024-07-10 00:51:53 +00:00
Marcel Märtens
54e3cef223
downgrade libmimalloc-sys again , as the newest version fails with:
...
warning: libmimalloc-sys@0.1.39: In file included from c_src/mimalloc/src/prim/prim.c:12,
warning: libmimalloc-sys@0.1.39: from c_src/mimalloc/src/static.c:38:
warning: libmimalloc-sys@0.1.39: c_src/mimalloc/src/prim/windows/prim.c: In function 'win_is_out_of_memory_error':
warning: libmimalloc-sys@0.1.39: c_src/mimalloc/src/prim/windows/prim.c:212:10: error: 'ERROR_COMMITMENT_MINIMUM' undeclared (first use in this function); did you mean 'ERROR_COMMITMENT_LIMIT'?
warning: libmimalloc-sys@0.1.39: 212 | case ERROR_COMMITMENT_MINIMUM:
warning: libmimalloc-sys@0.1.39: | ^~~~~~~~~~~~~~~~~~~~~~~~
warning: libmimalloc-sys@0.1.39: | ERROR_COMMITMENT_LIMIT
warning: libmimalloc-sys@0.1.39: c_src/mimalloc/src/prim/windows/prim.c:212:10: note: each undeclared identifier is reported only once for each function it appears in
error: failed to run custom build command for `libmimalloc-sys v0.1.39`
2024-07-09 23:21:40 +02:00
Marcel Märtens
a698a7d46e
update toolchain to nightly-2024-07-07
2024-07-09 16:29:33 +02:00
horblegorble
186aea08fc
balancing and const usage for gnarling spawns
2024-07-09 19:11:29 +10:00
Samuel Keiffer
0dc194bb6b
Merge branch 'uniior/sword-anims' into 'master'
...
Sword animations #1
See merge request veloren/veloren!4520
2024-07-08 23:56:10 +00:00
Marcel
94c74cb2f2
Merge branch 'xMAC94x/prepare_toolchain_upgrade' into 'master'
...
prepare comments intendation for next toolchain
See merge request veloren/veloren!4519
2024-07-08 23:08:28 +00:00
uniior
38e403eab2
cargo fmt
2024-07-08 18:40:38 -04:00
Marcel Märtens
618492da39
prepare comments intendation for next toolchain
2024-07-09 00:27:25 +02:00
uniior
fc6b87d5ca
Dual Cross Cut
2024-07-08 16:21:46 -04:00
uniior
ef3489806e
Cross Cut
2024-07-08 16:21:45 -04:00
uniior
4b0e31a91d
Cascade
2024-07-08 16:21:45 -04:00
uniior
d9ff439ffe
Skewer
2024-07-08 16:21:45 -04:00
uniior
67691eda44
Fell Strike
2024-07-08 16:15:51 -04:00
uniior
255b084619
Hamstring/Crescent Slash
2024-07-08 16:15:50 -04:00
uniior
44c6270ad2
Quick Draw + tweaks
...
"Rebase"
2024-07-08 16:15:50 -04:00
uniior
6638184096
Double Slash, Heavy Sweep and Pommel Strike
...
"Rebase"
2024-07-08 16:15:49 -04:00
uniior
e7eb6b4159
Gouge
2024-07-08 16:15:49 -04:00
uniior
b402fa8473
Disengage
2024-07-08 16:15:49 -04:00
uniior
4eb0e8cd36
Feint draft + tweaks
...
"Rebase"
2024-07-08 16:15:48 -04:00
uniior
0ca6109769
Quick Draw + tweaks
2024-07-08 16:15:48 -04:00
uniior
67f7f24285
Double Slash, Heavy Sweep and Pommel Strike
2024-07-08 16:15:48 -04:00
Samuel Keiffer
9c424b98d4
Merge branch 'sam/display-recipes' into 'master'
...
Show acquired recipes in diary screen
See merge request veloren/veloren!4518
2024-07-07 20:14:56 +00:00
horblegorble
554e8be88d
reduced vertical knockback of wooden golem
2024-07-07 12:14:19 +10:00
horblegorble
9e837383a5
read atack data with direct assignment & no mutables; removed default from 'AbilityData'; added 'fn rng_from_span' to avoid repitition typos; indices moved from enums to consts; fixed const typo in 'handle_simple_backstab'
2024-07-07 11:59:12 +10:00
Sam
2daba842bd
Show acquired recipes in diary screen
2024-07-06 20:55:09 -04:00
horblegorble
bdf1134814
added range and angle calculations for projectile attacks; minor tweak to woodgolem shockwave; use of unwrap_or_default & other clippy things
2024-07-06 01:30:00 +10:00
horblegorble
93b336cd20
read & use attack data from AbilityData: added default usage to AbilityData, expanded AbilityData::BasicRanged; tweaked chieftain flamestrike; removed existing buff check for cheiftain totem & increased cooldown; more comments in attack functions
2024-07-02 23:00:11 +10:00
Samuel Keiffer
a3ef7ddf93
Merge branch 'james/charm-recipe-category' into 'master'
...
Make charm recipes accessible by putting them in the potion tab of the crafting menu
See merge request veloren/veloren!4509
2024-06-30 23:27:33 +00:00
James Melkonian
3dcf9ab62e
Make charm recipes accessible by putting them in the potion tab of the crafting menu
2024-06-30 23:27:33 +00:00
horblegorble
674a9e1d6c
removed unused experimental function
2024-06-30 16:46:22 +10:00
Marcel
6214f9df5a
Merge branch 'neura/minor-updates' into 'master'
...
Update ratatui and run cargo update
See merge request veloren/veloren!4516
2024-06-29 22:31:08 +00:00
Youser Nayme
2ab41e56e6
Run cargo update
2024-06-29 17:26:05 -04:00
Youser Nayme
d7c82ce534
Update ratatui
2024-06-29 17:05:29 -04:00
horblegorble
57073c3378
cargo fmt
2024-06-28 15:25:18 +10:00
horblegorble
21a51161bd
changed rng.gen_range(1..=2) to rng.gen_bool(0.5)
2024-06-28 15:25:18 +10:00
horblegorble
14c5ea562e
removed TODO comment
2024-06-28 15:25:18 +10:00
horblegorble
75cf72dd4d
clippy, fmt; renaming some enums
2024-06-28 15:25:18 +10:00
horblegorble
74dcd6b41a
slight slow down of firebarrage; made factor constants consistent
2024-06-28 15:25:18 +10:00
horblegorble
e9f2d97045
timing and small balance changes to chieftain
2024-06-28 15:25:18 +10:00
horblegorble
f47c509c04
swapped RandomInit to combat_state.initialized
2024-06-28 15:25:18 +10:00
horblegorble
dc155ccc1c
small clean up of harvester logic
2024-06-28 15:25:18 +10:00
horblegorble
65c34d71f8
small shuffle of harvester timers; initial refactoring of chieftain (incomplete)
2024-06-28 15:25:18 +10:00
horblegorble
2509eb8d3d
randomised harvester's far pumpkin throw; armor and weapon drops of same tier
2024-06-28 15:25:18 +10:00
horblegorble
60f4be1116
randomised mixup cooldowns for harvester; small adjustment to firebreath ori
2024-06-28 15:25:18 +10:00
horblegorble
a838dcf545
refinements to woodgolem; ori & small updates to harvester; some formatting
2024-06-28 15:25:18 +10:00
horblegorble
9187c37ab1
woodgolem broad update; minor fix for harvester mixup attack
2024-06-28 15:25:17 +10:00
horblegorble
557f2ae53f
cargo fmt
2024-06-28 15:25:17 +10:00
horblegorble
d8ea2c2689
clippy code-quality conformance
2024-06-28 15:25:17 +10:00
horblegorble
d81676a3a1
added 'Nothing' to chieftain bonus loot roll
2024-06-28 15:25:17 +10:00
horblegorble
493b4b8fd3
renamed vine summon abilities; brief comments for body_dist and it usage for harvester
2024-06-28 15:25:17 +10:00
