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,366 Commits 151 Branches 18 Tags 2.1 GiB
8b89903d57
Commit Graph

10366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
UncomfySilence
ac88147aef + Lowered drop rate of extra extra tier armor and weapons from ~1.7% to ~0.8% 
+ Organized T2 boss ron
 2021-11-07 11:56:41 +01:00
UncomfySilence
3baa17bb3c + 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-07 11:41:21 +01:00
UncomfySilence
a192bc0cf7 + 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-07 10:57:52 +01:00
UncomfySilence
efa43e0394 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	assets/voxygen/item_image_manifest.ron
 2021-11-03 22:40:32 +01:00
Samuel Keiffer
7438252560 Merge branch 'increasing_witch_lantern_droprate_' into 'master' 
Minor edits

See merge request veloren/veloren!2979
 2021-11-03 21:27:47 +00:00
Youssef Fahmy
6c52d4ca5e Minor edits 2021-11-03 21:27:47 +00:00
UncomfySilence
e9602141d9 + Updating item_image_manifest to Master (was behind) 2021-11-03 00:40:02 +01:00
UncomfySilence
23434117a3 + Updating item_image_manifest to Master (was behind) 2021-11-03 00:37:59 +01:00
Joshua Barretto
715ff845a4 Merge branch 'zesterer/site2' into 'master' 
Added rtsim villagers to site2 towns

See merge request veloren/veloren!2857
 2021-11-02 16:50:52 +00:00
Joshua Barretto
8bab7d2cfb Merge branch 'cherry-pick-a5e64af1' into 'master' 
Update crate for keyboard-keynames

See merge request veloren/veloren!2982
 2021-11-02 09:18:18 +00:00
Jon Nettleton
836c948086 Update crate for keyboard-keynames 
This revision includes a fix for supporting Aarch64 platforms

Signed-off-by: Jon Nettleton <jon@solid-run.com>

(cherry picked from commit a5e64af199)
 2021-11-02 08:49:17 +00:00
Joshua Barretto
de087ae992 Added site2 worldgen feature 2021-11-01 22:53:38 +00:00
Joshua Barretto
16889b2b3e Fixed house supports 2021-11-01 22:19:49 +00:00
Joshua Barretto
9ce057212b Trading for travelers 2021-11-01 22:19:49 +00:00
Joshua Barretto
0cb88139c9 Made merchants work in new sites 2021-11-01 22:19:49 +00:00
Joshua Barretto
4b8bf94320 Used correct entity configs 2021-11-01 22:19:49 +00:00
Joshua Barretto
4acffb9cfb New CSG API for site2 2021-11-01 22:19:49 +00:00
Joshua Barretto
e3ab8fc8ce Added rtsim merchants to site2 2021-11-01 22:19:49 +00:00
Joshua Barretto
bacb2aa504 Better town layout 2021-11-01 22:19:49 +00:00
Joshua Barretto
4a9581b54d Fixed house entrances 2021-11-01 22:19:49 +00:00
Joshua Barretto
8e2ca9cdec Added rtsim villagers to site2 towns 2021-11-01 22:19:49 +00:00
Joshua Barretto
80c4e3de19 Merge branch 'tijnvdheuvel/newSFX' into 'master' 
Merge "Tijnvdheuvel/new sfx" New Truffler & Fungome SFX

See merge request veloren/veloren!2977
 2021-11-01 21:15:35 +00:00
Justin Shipsey
08a3a1b1b8 Merge branch 'oolnokk/new_male_dwarf_customization_options' into 'master' 
Oolnokk/More Dwarf Male Customization Options

See merge request veloren/veloren!2980
 2021-11-01 04:40:54 +00:00
Oolnokk
b6f137bb7a Changes to formatting 2021-10-31 23:49:46 -04:00
Oolnokk
3618a0e5f5 Changes to formatting 2021-10-31 23:44:29 -04:00
Oolnokk
b67558c1ba 2 new beards, four new hairstyles and 1 new eye option for dwarf males 2021-10-31 22:58:25 -04:00
Samuel Keiffer
e692f49463 Merge branch 'sam/potion-tweaks' into 'master' 
Potion tweaks

See merge request veloren/veloren!2976
 2021-10-31 21:12:08 +00:00
Sam
560f73d296 Addressed review feedback. 2021-10-31 16:39:47 -04:00
Samuel Keiffer
be64c3687e Merge branch 'slipped/tweaks' into 'master' 
hats

See merge request veloren/veloren!2966
 2021-10-31 05:35:11 +00:00