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
10,346 Commits 151 Branches 18 Tags 2.1 GiB
aa93b4b53c
Commit Graph

10346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marcel Märtens
086f9737e4 move server.voxel for airship to common 2021-11-15 16:39:39 +01:00
Marcel
3801ead342 Merge branch 'tim74' into 'master' 
fix(AppData): Update screenshots due 404

See merge request veloren/veloren!2834
 2021-11-15 12:44:01 +00:00
Marcel
e218ec2b44 Merge branch 'xMAC94x/fix_torvus_and_other_client_only' into 'master' 
move ship_manifest to common assets until its properly included in servers ECS...

See merge request veloren/veloren!3009
 2021-11-15 09:16:03 +00:00
Marcel Märtens
cd516d0912 name it just manifests rather then tmp_manifests 2021-11-15 09:47:38 +01:00
Marcel Märtens
d24b904563 move ship_manifest to common assets until its properly included in servers ECS and pushed to clients 2021-11-15 09:00:12 +01:00
Samuel Keiffer
dd52695917 Merge branch 'solved_orc_beard_mystery' into 'master' 
Oolnokk/ "Goatee" orc beard glitched fixed

See merge request veloren/veloren!3005
 2021-11-14 04:11:30 +00:00
Oolnokk
5643cea4ba The long orc beard was painted with index 17 thus rendering parts invisible after the hat update, creating an infamous 'goatee' look. Copied the colors to much higher indexes, and now it looks as intended ingame. 2021-11-13 19:08:06 -05:00
Joshua Barretto
b1915622b5 Merge branch 'xvar/fix-tooltip-floating-point-rounding' into 'master' 
Added formatting to round tooltip values for consumables to 1 decimal place

See merge request veloren/veloren!3004
 2021-11-13 20:54:05 +00:00
Ben Wallis
8d356d14a3 Merge branch 'xvar/exp-sharing' into 'master' 
Implemented EXP sharing based on damage contribution

See merge request veloren/veloren!2986
 2021-11-13 20:46:45 +00:00
Ben Wallis
022c1417b6 EXP on kill is now shared between damage contributors. A "damage contributor" is either an individual entity, or a group - depending if the attacker is in a group. This means that not only does the "killing blow" no longer get 100% of EXP, but multiple groups and individuals all receive their fair share of EXP on death (assuming they are still within range of the entity when it dies). 
Damage from a given individual or group only counts towards a kill for 10 minutes since that individual or group's last damage to the entity - after this period their damage contribution is removed. This avoids the list of damage contributors growing excessively large for an entity that does a lot of combat but never dies.

EXP sharing within groups is unchanged - the difference is simply that the input to this calculation may be less than 100% of the base EXP reward for the kill if other individuals or groups contributed damage.
 2021-11-13 20:46:45 +00:00
Ben Wallis
b4c7af1ad1 Added formatting to round tooltip values for consumables to 1 decimal place 2021-11-13 20:25:09 +00:00
Joshua Barretto
4b3aa7e8fa Merge branch 'zesterer/fun-things' into 'master' 
Fun Things

See merge request veloren/veloren!2987
 2021-11-13 17:49:20 +00:00
Joshua Barretto
c0bf9503bd Addressed review issues, added cloning docs to BodySpec::Manifests 2021-11-13 17:20:23 +00:00
Joshua Barretto
0f56ebe82b Toned down golf club knockback 2021-11-13 17:13:09 +00:00