Imbris
3bf0ac1971
Switch to new CI image set with aarch64 support and update changelog
2021-11-23 21:27:23 -05:00
Imbris
a54e4c5dd0
Make sure to copy binaries from the right location in aarch CI
2021-11-23 21:27:23 -05:00
Imbris
0816624d23
Try with: export PKG_CONFIG
2021-11-23 21:27:23 -05:00
Imbris
30df174c3d
Fix order of env var and time command in aarch CI script, remove duplicate release flag, reorder target flag to be in the same order as the target flag for windows
2021-11-23 21:27:23 -05:00
Imbris
d137623dba
Add aarch64 build to the gitlab CI yml
2021-11-23 21:27:23 -05:00
Imbris
4bbf5c7483
Apply Add-CI-build-script-for-cross-compiling-Aarch64.patch from @linux4kix
2021-11-23 21:27:21 -05:00
Imbris
73531f771f
Merge branch 'imbris/allow-incremental' into 'master'
...
Remove incremental disabling for crates that still had it disabled, the issues should be fixed
See merge request veloren/veloren!3025
2021-11-22 22:52:34 +00:00
Imbris
4250a310fa
Merge branch 'imbris/avoid-ci-incremental-delete' into 'master'
...
Remove deletion of incremental folder from the CI scripts
See merge request veloren/veloren!3026
2021-11-22 22:52:32 +00:00
Imbris
79128e1e4b
Remove deletion of incremental folder from the CI scripts, the rustc incremental issue should be fixed
2021-11-22 02:04:19 -05:00
Imbris
6feb2d53ca
Remove incremental disabling for crates that still had it disabled, the issues should be fixed
2021-11-22 01:46:01 -05:00
Imbris
6e168f186b
Merge branch 'imbris/pin-cmake' into 'master'
...
Pin cmake crate to 0.1.45
See merge request veloren/veloren!3024
2021-11-21 15:21:32 +00:00
Imbris
0beee17370
Pin cmake crate to 0.1.45, since the newer version uses the --parallel argument which is not available on our CI's cmake version
2021-11-21 09:51:39 -05:00
Marcel
ecbe58eaab
Merge branch 'xMAC94x/update-deps' into 'master'
...
updating dependencies,
See merge request veloren/veloren!3021
2021-11-20 22:29:16 +00:00
Marcel Märtens
7a8944ac71
remove additional restriction which is only necessary in egui 0.15
2021-11-20 20:22:45 +01:00
Marcel Märtens
aa93b4b53c
update other binaries
2021-11-20 20:19:48 +01:00
Marcel Märtens
7200cc4ad7
undo egui upgrade try
2021-11-20 20:18:03 +01:00
Marcel Märtens
e29ede7c97
updating dependencies,
...
cannot update the following dependencies:
- vek: Sharps SIMD isnt upstream
- tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes,
- refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql
- equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update
- wgpu: cant update due new version doesnt support DX11
Got quinn updated which now require some dependencies to be explicit.
2021-11-20 20:17:49 +01:00
Samuel Keiffer
5274bf9eb3
Merge branch 'scaling_lower_tier_dungeons' into 'master'
...
Scaling dungeons
See merge request veloren/veloren!2991
2021-11-20 15:57:18 +00:00
UncomfySilence
5dca7f9515
+ T1 & T4 chest loot table fix
2021-11-20 07:44:23 +01:00
Treeco
3018942291
Merge branch 'juliancoffee/resizeable_map' into 'master'
...
Add size parameter to map_file opts
See merge request veloren/veloren!2975
2021-11-19 22:50:24 +00:00
Marcel
933b313927
Merge branch 'xMAC94x/harden_network_tests' into 'master'
...
those sleeps cannot be easily included in the code, as they simulate 2...
See merge request veloren/veloren!3020
2021-11-19 13:23:24 +00:00
Joshua Barretto
0d779a754a
Merge branch 'kemper/hitboxes' into 'master'
...
Adjust hitboxes of husk and medium birds
See merge request veloren/veloren!3019
2021-11-19 13:22:48 +00:00
Marcel Märtens
258da1bedf
those sleeps cannot be easily included in the code, as they simulate 2 participants on 2 different computers.
...
Increase the timeouts from 1000 -> 3000 ms if there are some internal messages send (e.g. network_a closed, send on stream_a)
Increase the timeouts from 1000 -> 5000 ms if there is actuall networking involed (e.g. stream_a send, stream_b recv)
2021-11-19 09:36:39 +01:00
Kemper
d37dbf5d24
Adjust hitboxes for husk and medium birds
...
The hitbox of the husk did not include the head and the hitboxes
of the medium birds were far too wide.
2021-11-19 06:18:13 +00:00
UncomfySilence
7c560cc6b9
+ CHANGELOG.md message "Dungeons have somewhat proper scaling. The higher the dungeon the harder it gets, Cultist staying unchanged while Mino is now at its level."
2021-11-18 19:53:21 +01:00
UncomfySilence
f88a3df040
+ Rebase and fixes (kill me)
2021-11-18 19:50:32 +01:00
UncomfySilence
2fa0abf23d
+ Small fix to boss loot table. Boss drops gear from same tier and slight chance from one above.
2021-11-18 19:30:57 +01:00
UncomfySilence
0599726280
+ Fixed pathing for coal in T0 boss loot table, was mineral.coal is mineral.ore.coal now
2021-11-18 19:30:57 +01:00
UncomfySilence
77b74091a9
+ Reducing attack speed of minions
2021-11-18 19:30:53 +01:00
UncomfySilence
10e6de3e89
+ Adjusted damage, crit chance, and attack speed of weapons
...
+ Adjusted boss and chest loot table to match it's new intended tier of difficulty while providing an intermediate stage for new players to explore between T0(T1) and T1(T2)
2021-11-18 19:18:37 +01:00
UncomfySilence
b92d104ca0
+ Made sure that abilities in staff simple match abilities in the staff skillset.
...
+ If anything happened to chests then no more! (Don't question it)
+ Bosses have a ~4% chance to drop higher tiered gear
+ Organized T2 boss ron
2021-11-18 19:16:08 +01:00
UncomfySilence
0461178cd8
+ Gnarling armor count - 7 previous being 7
...
+ Adlet-bow armor count - 39 previous being 62
+ Sahagin armor count - 71 previous being 88
+ Haniwa armor count - 96 previous being 91
+ Myrmidon armor count - 152 previous being 161
+ Although an overall decrease in armor there's an increase in poise res, crit power, energy, and other stats.
+ Gave everything staff an ability set in skillset, and linked them all
2021-11-18 19:09:18 +01:00
UncomfySilence
1b1fee4f0b
+ Updating item_image_manifest to Master (was behind)
2021-11-18 18:56:50 +01:00
UncomfySilence
e69a6b82dc
+ Updating item_image_manifest to Master (was behind)
2021-11-18 18:52:22 +01:00
UncomfySilence
518099b92c
+ Fixing spelling msitake in T0 Boss craftin_ing.sticky_thread to crafting_ing.sticky_thread
2021-11-18 18:50:43 +01:00
UncomfySilence
c1d318f7ee
+ Reducing attack speed of minions
2021-11-18 18:50:43 +01:00
UncomfySilence
34d3cc836e
+ Adjusted damage, crit chance, and attack speed of weapons
...
+ Adjusted boss and chest loot table to match it's new intended tier of difficulty while providing an intermediate stage for new players to explore between T0(T1) and T1(T2)
2021-11-18 18:50:39 +01:00
UncomfySilence
90f29ce277
+ Made sure that abilities in staff simple match abilities in the staff skillset.
...
+ If anything happened to chests then no more! (Don't question it)
+ Bosses have a ~4% chance to drop higher tiered gear
+ Organized T2 boss ron
2021-11-18 18:49:33 +01:00
UncomfySilence
9e28d889af
+ Lowered drop rate of extra extra tier armor and weapons from ~1.7% to ~0.8%
...
+ Organized T2 boss ron
2021-11-18 18:46:46 +01:00
UncomfySilence
3debaf2ded
+ All bosses ranging from T0 to T3 have a ~4% chance of dropping equipment one tier higher than normal, while having a ~1.7% chance to drop equipment even higher than that.
...
+ All chests have a ~2% chance to drop better equipment than their tier.
2021-11-18 18:43:15 +01:00
UncomfySilence
2163dc73b4
+ Gnarling armor count - 7 previous being 7
...
+ Adlet-bow armor count - 39 previous being 62
+ Sahagin armor count - 71 previous being 88
+ Haniwa armor count - 96 previous being 91
+ Myrmidon armor count - 152 previous being 161
+ Although an overall decrease in armor there's an increase in poise res, crit power, energy, and other stats.
+ Gave everything staff an ability set in skillset, and linked them all
2021-11-18 18:31:23 +01:00
UncomfySilence
8d86f62f2e
+ Updating item_image_manifest to Master (was behind)
2021-11-18 18:31:22 +01:00
UncomfySilence
4e19f2444b
+ Updating item_image_manifest to Master (was behind)
2021-11-18 18:31:22 +01:00
Monty Marz
81846f313f
Merge branch 'pfau/armour' into 'master'
...
Merchant Outfit
See merge request veloren/veloren!3018
2021-11-18 16:31:12 +00:00
Monty Marz
ec07dbb05e
Merchant Outfit
2021-11-18 16:31:12 +00:00
Marcel
e426c1997b
Merge branch 'Limofeus/russian_translation_updates' into 'master'
...
Upd #4 - some other translations
See merge request veloren/veloren!3011
2021-11-17 20:04:20 +00:00
Limofeus
7d50af8b7d
Upd #4 - some other translations
2021-11-17 20:04:20 +00:00
Samuel Keiffer
2d89e298df
Merge branch 'changes_to_staff_m3_ability' into 'master'
...
Smol balance changes
See merge request veloren/veloren!3008
2021-11-16 22:45:59 +00:00
Youssef Fahmy
871859b09b
Smol balance changes
2021-11-16 22:45:59 +00:00
Marcel
82c867d95e
Merge branch 'xMAC94x/airship_voxels_common' into 'master'
...
move server.voxel for airship to common
See merge request veloren/veloren!3012
2021-11-15 23:29:58 +00:00