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,495 Commits 151 Branches 18 Tags 2.1 GiB
7fb9ac121e
Commit Graph

10495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Barretto
46ec4203a2 Arbitrary volume airships 2021-11-13 17:13:08 +00:00
Joshua Barretto
026a4a07bb Made explosions bonk sprites 2021-11-13 17:12:17 +00:00
Joshua Barretto
edf9c59e7d Added bomb sprites 2021-11-13 17:12:16 +00:00
Joshua Barretto
dbfbdcdacd Added golf club 2021-11-13 17:11:02 +00:00
Joshua Barretto
006edb9298 Merge branch 'Oolnokk/wanderers_hat_capitalization_fix_3' into 'master' 
Oolnokk/wanderers hat capitalization fix 3

See merge request veloren/veloren!3002
 2021-11-13 17:01:50 +00:00
Benjam Soule H. Walker
9011ed3a77 Update assets/voxygen/voxel/armor/misc/head/wanderers_hat.vox 2021-11-13 16:30:03 +00:00
William Hetherington
8d15239d30 update Get Veloren Url in README 2021-11-13 08:35:49 +00:00
Justin Shipsey
32e3161d33 Merge branch 'Oolnokk/three_new_hats_edited_and_approved_by_gemu' into 'master' 
Three new hats. Models have been cleaned up and approved by Gemu.

See merge request veloren/veloren!2998
 2021-11-13 04:02:40 +00:00
Oolnokk
de0072bbc1 Fixed drop chances in village crates to better resemble prior odds 2021-11-12 19:52:09 -05:00
Oolnokk
a71f2204d9 Changed drop location from boars to T2 Chests 2021-11-12 19:34:57 -05:00
Oolnokk
c6383ca5a4 Models have been cleaned up and approved by Gemu 2021-11-12 18:46:01 -05:00
Samuel Keiffer
6e57380735 Merge branch 'sam/ability-pool-and-hotbar' into 'master' 
Ability pool

See merge request veloren/veloren!2996
 2021-11-12 05:11:12 +00:00
Sam
b901b97191 Changed fallback ability icon. 2021-11-11 23:41:01 -05:00
Sam
040d70c750 Final fixes. 2021-11-11 23:11:17 -05:00
Sam
f65c89862c Removed vec allocation with an impl Iterator. 2021-11-11 22:43:25 -05:00
Sam
a288f9ee43 Addressed further review. 2021-11-11 22:37:37 -05:00
Sam
dfcb8c8519 Addressed review feedback. 2021-11-11 18:10:22 -05:00
Sam
b678f7f46e Added some client methods for changing abilities to hook into. 2021-11-11 01:55:32 -05:00
Sam
da677e8ea6 Abilities can now be referred to by the asset id. 2021-11-10 17:30:19 -05:00
Imbris
ee6b8b6828 Merge branch 'imbris/leak-fix' into 'master' 
Potential fix for leak when inventory is open

See merge request veloren/veloren!2995
 2021-11-10 22:15:25 +00:00
Sam
4309e1ff9b Did voxygen stuff for ability pool. 2021-11-09 21:20:41 -05:00
Sam
d33ff9f17e Ability pool updates after switching weapons now. 2021-11-09 19:51:06 -05:00
UncomfySilence
debbc1e4c6 + Fixed pathing for coal in T0 boss loot table, was mineral.coal is mineral.ore.coal now 2021-11-09 22:40:25 +01:00
UncomfySilence
0f949f1b20 Merge remote-tracking branch 'origin/scaling_lower_tier_dungeons' into scaling_lower_tier_dungeons 2021-11-09 22:06:57 +01:00
UncomfySilence
027664f1c0 + Fixing spelling msitake in T0 Boss craftin_ing.sticky_thread to crafting_ing.sticky_thread 2021-11-09 22:06:36 +01:00
UncomfySilence
7a49f26568 + Reducing attack speed of minions 2021-11-09 22:06:36 +01:00
UncomfySilence
f764ae99c0 + 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-09 22:06:36 +01:00
UncomfySilence
7b5d92f5fb + 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-09 22:06:35 +01:00
UncomfySilence
6b637534f8 + Lowered drop rate of extra extra tier armor and weapons from ~1.7% to ~0.8% 
+ Organized T2 boss ron
 2021-11-09 22:06:35 +01:00
UncomfySilence
84d46314ad + 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-09 22:06:35 +01:00
UncomfySilence
c8e88375c6 + 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-09 22:06:35 +01:00
UncomfySilence
f009b3fb65 + Updating item_image_manifest to Master (was behind) 2021-11-09 22:06:27 +01:00
UncomfySilence
5221be5d42 + Updating item_image_manifest to Master (was behind) 2021-11-09 21:58:55 +01:00
Sam
a8bec0280c Ability pool mostly functional. 2021-11-09 12:56:07 -05:00
UncomfySilence
9e8aa4e6b1 + Fixing spelling msitake in T0 Boss craftin_ing.sticky_thread to crafting_ing.sticky_thread 2021-11-09 11:50:26 +01:00
UncomfySilence
9d59959e8c + Reducing attack speed of minions 2021-11-09 09:33:05 +01:00
Imbris
a7e1d3218f Potential fix for leak when inventory is open 2021-11-09 01:21:45 -05:00
Imbris
38a50d175c Merge branch 'socksonme/fix_item_drop_texture' into 'master' 
Temporary fix to the textures of dropped items

See merge request veloren/veloren!2993
 2021-11-09 06:12:17 +00:00
Socksonme
0a4df2b158 Temporary fix to the textures of dropped items 2021-11-09 06:12:16 +00:00
Imbris
79afad626b Merge branch 'socksonme/pushback_require_collider' into 'master' 
Make the collider component be required for entity pushback

See merge request veloren/veloren!2954
 2021-11-09 06:11:07 +00:00
Joshua Barretto
9866befac4 Merge branch 'lilypads' into 'master' 
Jungles and Rivers update

See merge request veloren/veloren!2978
 2021-11-08 22:51:22 +00:00
DemonicOnPc
b7ac542ebb fixes to branch after my whoops 2021-11-08 17:09:19 -05:00
DemonicOnPc
a9cedee277 Update scatter.rs 2021-11-08 17:09:17 -05:00
DemonicOnPc
7fc57c027b Fixes to jungle sprites and lillypads 2021-11-08 17:09:15 -05:00
DemonicOnPc
c6dd425203 Update sprite_manifest.ron 2021-11-08 17:09:12 -05:00
DemonicOnPc
9514cd71c6 Jungle and River update 
-Added Lillypads to rivers
-Added new types of reeds
-Added reeds to water
-Added more Ferns/Flowers/Plants to jungles
 2021-11-08 17:09:11 -05:00
UncomfySilence
264bce1a38 + 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-08 23:05:28 +01:00
Joshua Barretto
6b4abddc4e Added floating scatter 2021-11-08 17:04:45 -05:00
UncomfySilence
3373b56c96 + Fixed item_image_manifest finally (weird bug) 2021-11-08 18:31:53 +01:00
UncomfySilence
1b215bcaa4 + 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-08 18:23:04 +01:00