Commit Graph

10596 Commits

Author SHA1 Message Date
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
jshipsey
913a2725e8 changelog 2021-10-31 01:19:21 -04:00
jshipsey
b1e9d9664b adjust models, last fixes 2021-10-30 23:42:18 -04:00
Justin Shipsey
beefdfe840 Delete frame-trace_1635388024283.json 2021-10-30 23:42:17 -04:00
jshipsey
f69e3c9fbc more hats 2021-10-30 23:42:17 -04:00
jshipsey
c2b7d3bb44 good hat rendering 2021-10-30 23:42:16 -04:00
jshipsey
a05c1ea4c5 switch to new matcell variant 2021-10-30 23:42:15 -04:00
jshipsey
97a3c1e713 simple hats 2021-10-30 23:42:15 -04:00
jshipsey
3915aa7aac support for hollow voxels ty zesterer 2021-10-30 23:42:14 -04:00
jshipsey
5cc54b34bd headbands 2021-10-30 23:42:13 -04:00
Justin Shipsey
85abea5814 Merge branch 'evelyntsmg/more_gliders' into 'master'
Add new gliders

See merge request veloren/veloren!2785
2021-10-30 20:48:04 +00:00
Evelyn
91477f7a5c Add new gliders 2021-10-30 20:48:04 +00:00
Treeco
e380425001 Add continent_scale_hack setting 2021-10-30 16:40:37 +01:00
Marcel
bcba2aae7e Merge branch 'juliancoffee/fix_testserver' into 'master'
Make test-server compile again

See merge request veloren/veloren!2974
2021-10-30 09:27:27 +00:00
Sam
ad257410e9 Merchants now have less potion stock. 2021-10-29 19:58:38 -04:00
Sam
41effe61d0 Being knocked out of item use or sprite interact states forces a poise state. 2021-10-29 19:24:40 -04:00
Samuel Keiffer
9a2bc830c0 Merge branch 'sam/explosions' into 'master'
Staff Rebalancing

See merge request veloren/veloren!2970
2021-10-29 22:20:53 +00:00
juliancoffee
84e04fa906 Add size parameter to map_file opts 2021-10-30 01:06:40 +03:00
Sam
aad2384622 Addressed review, changelog. 2021-10-29 17:57:00 -04:00
Sam
ca292a53ea All aspects of an attack now scale with the modifier. 2021-10-29 17:37:12 -04:00
Sam
57851b7df3 Fixed buff applied. 2021-10-29 17:37:10 -04:00