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
13,624 Commits 151 Branches 18 Tags 2.1 GiB
b37a2bf1c7
Commit Graph

1188 Commits

Author SHA1 Message Date
Sam
a4d3de4833 Crippling abilities 2022-10-27 20:06:32 -04:00
Sam
2051d45d2f Offensive abilities 2022-10-27 20:06:32 -04:00
Sam
014a8cce61 Combo melee can now optionally not function as a stance 2022-10-27 20:06:31 -04:00
Sam
66f9cf22fc Balanced abilities and insert ability id into animations. 2022-10-27 20:06:30 -04:00
Sam
aea4a43b65 Placeholder abilities 2022-10-27 20:06:30 -04:00
Sam
38094b6ba2 Finisher melee 2022-10-27 20:06:29 -04:00
Sam
057b1a4ad6 Added capability for attacks to be interrupted by dodging or blocking 2022-10-27 20:06:29 -04:00
Sam
1e0dfe003d Rolling can now only interrupt abilities when in buildup 2022-10-27 20:06:28 -04:00
Sam
7b27b63122 Melee attacks now only hit a single target by default 2022-10-27 20:06:28 -04:00
Sam
af39287331 Added support for abilities being cheaper if activated from the correct stance 2022-10-27 20:06:27 -04:00
Sam
17258975fc Combo melee 2 state 2022-10-27 20:06:26 -04:00
flo
34eae80253 fix facegourd item name 2022-10-27 13:49:06 +00:00
flo666
9b1efe1bee clippy, fmt, remove leftover file, fix sitenames in soundtrack 2022-10-25 00:33:23 +02:00
IsseW
9a6a3a05a1 bat config 2022-10-25 00:31:04 +02:00
James Melkonian
6bacb487f3 Bat AI 2022-10-23 20:05:39 +02:00
flo666
586d0f6dd8 add bat (created by Gemu) 2022-10-23 20:05:39 +02:00
flo666
79e6fd58fe - make tricksters spawn in groups and play instruments 
- remove defunct draugr flee
 2022-10-23 20:05:39 +02:00
flo666
82026c1acc remove defunct headband from trickster loadout 2022-10-23 20:05:39 +02:00
flo666
e1bd385408 make draugrs Npcs flee at health below 100%, 
trickster gear,
single spawns (trickster, dullahan),
 2022-10-23 20:05:39 +02:00
flo666
1d98050f28 halloween npcs: 
in forests, spawn harvester or dullahans or tricksters with custom halloween loot: facegourd, pumpkin_spice_brew, honeygourd
 2022-10-23 20:05:39 +02:00
Youssef Fahmy
44e19d7c54 Hot-fix for sword 2022-10-19 22:03:42 +00:00
Sam
b1f45ea241 Sword triple strike tweaks. 2022-10-19 09:36:20 -04:00
UncomfySilence
f21082fa76 minor stat tweaks and cleanup 2022-10-16 14:12:37 +02:00
Sam
8eb89adb61 Fixed unintentional overbuff to speed focused secondary components 2022-10-16 14:06:42 +02:00
UncomfySilence
c432a0b719 rings and necks 2022-10-16 14:06:42 +02:00
Sam
3222fb88b0 Nerfed melee combo melee skills 2022-10-16 14:06:42 +02:00
UncomfySilence
fe87f8c38d induv hat stat changes 2022-10-16 14:06:42 +02:00
Sam
2735d3403c Nerfed other sets 2022-10-16 14:06:41 +02:00
Sam
46daa6bfa9 Armor nerf 2022-10-16 14:06:41 +02:00
Monty Marz
2d8627c29b Add gnarling chieftain mask 2022-10-15 11:05:21 +00:00
James Melkonian
99d547c7c6 Add unit test to validate recipe keys 2022-10-09 20:50:09 -07:00
Marcel
160cbbf449 Merge branch 'steel_pick_desc' into 'master' 
Removes blue vein reference from Steel Pickaxe description

See merge request veloren/veloren!3491
 2022-10-09 19:50:31 +00:00
Julio Cezar Silva
0d090bb93e Removes blue vein reference from Steel Pickaxe description 2022-10-09 19:50:30 +00:00
Tianyang Zhang
99bedde100 Crafting recipe for black lantern 2022-10-02 17:46:36 +00:00
flo
a37e1f8d99 seachapel npc work 2022-09-22 01:04:01 +00:00
flo
dc688bccb9 fix_salamander_and_elbst 2022-09-13 17:32:53 +00:00
flo
e43608ce80 add guitar & instrument sample edits 2022-09-10 17:23:38 +00:00
juliancoffee
3cbfe02a8e Add Golden Cheese debug item 2022-09-06 15:50:04 +03:00
Isse
7ea720b2ef Merge branch 'creature_model_updates' into 'master' 
Creature model updates

See merge request veloren/veloren!3584
 2022-09-06 10:35:11 +00:00
flo
e4a3671345 Creature model updates 2022-09-06 10:35:10 +00:00
juliancoffee
54a1adea31 Assets work 
* Remove endgame /kit, move cultist weapons to cultist, move legendaries
  to tier-5
* Remove root_evil sceptre from endgame travelers
 2022-09-05 00:24:59 +03:00
Marcel
aa7cdd2864 Merge branch 'christof/econ_goods_in_ron' into 'master' 
Economy: Move decay and transportation effort from hardcoded into ron

See merge request veloren/veloren!3578
 2022-08-31 08:26:24 +00:00
flo
6c89cd8fbf put Organ under Toolkind Instrument 2022-08-30 16:55:02 +00:00
Christof Petig
5e2474230e oh, Potions do not decay in master 2022-08-30 00:37:38 +02:00
Christof Petig
fbe0aee40d move trading good properties (decay, transportation) from hard coded to ron file 2022-08-30 00:37:38 +02:00
flo
9339971032 Music Instruments 2022-08-28 18:48:18 +00:00
flo
e882e62c08 seachapel 2022-08-24 21:50:53 +00:00
Monty Marz
50701620e6 Temporary invincible merchants 2022-08-16 12:16:45 +00:00
Sam
b572c32a4d Tweaks 2022-07-30 00:18:10 -04:00
Sam
28a4ce9be1 Various tweaks 2022-07-26 19:44:49 -04:00
Youssef Fahmy
91c85dea22 Humanoid Model Overhaul 2022-07-16 11:13:24 +00:00
Christof Petig
5ee72f8a5e fix test; add tusk, crest, pincer 2022-07-13 20:15:28 +02:00
Marcel
fddc97bc77 Merge branch 'tweaks' into 'master' 
tweaks entity stats

See merge request veloren/veloren!3437
 2022-06-29 19:29:38 +00:00
runrobdog
7a40ae2db7 tweak entity stats adlet/tracker.ron 2022-06-23 17:48:28 +02:00
runrobdog
16d5ea1e3c Set stats of entities movesets under the Object(body) tag to pre-modular and change all entities found within dungeons, to pre-modular stats 2022-06-23 06:45:22 +02:00
runrobdog
8c1d4359a8 tweak stats quadmedquick, blackwidow and throped 2022-06-20 14:12:04 +02:00
runrobdog
1dc89fbc58 tweak stats theropodbasic 2022-06-19 19:04:30 +02:00
runrobdog
25eed55ca9 stat tweaks to theropod, arthropods and basilisk 2022-06-19 01:35:18 +02:00
Sam
1f60bdd452 Removed sticky thread requirement from bow limbs. 2022-06-18 15:19:37 -04:00
runrobdog
10023b0759 tweak entity stats 2022-06-18 12:33:19 +02:00
Sam
4a5ef6dce3 Poise damage dealt to a target in a stunned state is now no longer universally applied to the target as health damage. 
Instead poise damage is only converted to health damage when its source is mitigated crushing damage.
Fixed 'Long Pole' -> 'Longpole'
 2022-06-17 21:13:45 -04:00
runrobdog
1e289e6335 tweaks entity stats 2022-06-17 21:48:09 +02:00
runrobdog
1e19f5541b tweak entity stats 2022-06-17 21:41:04 +02:00
runrobdog
95148a9968 tweaks entity stats 2022-06-17 12:35:06 +02:00
Sam
2de831cf38 Converted asset files of other armors. 2022-05-30 20:25:33 -04:00
Sam
8b384fd63e Converted asset files of set armors. 2022-05-30 20:25:33 -04:00
Sam
5e57eabd11 Code changes and msm 2022-05-30 20:25:31 -04:00
Makselord
4a2cdd08d4 modular weapon modifier costs changed to 1, 2, 5, 10, 15, 25 2022-05-30 09:56:17 -04:00
Makselord
f10b868dbf modular weapon modifier costs changed to 1, 5, 10, 15, 20, 30 2022-05-29 19:50:26 -04:00
Christof Petig
2bf8e1865f Skiing and ice skating 2022-05-27 17:19:52 +00:00
Makselord
5c8c88b786 fixed silver, gold, copper, tin ingots not showing correctly in crafting 2022-05-26 17:08:39 -04:00
Euryn
88eaef3145 Add Thai translation 2022-05-22 10:06:36 +00:00
Chase Rozon
7dcee3eb23 Multiple Balance Tweaks & Miscellaneous Changes 2022-05-19 22:46:31 +00:00
Youssef Fahmy
080d8ef8b1 Tweaks for this week 2022-05-19 19:35:31 +00:00
Sam
aeca67443b Simplified item key (assets) 2022-05-18 16:28:10 -04:00
Sam
ba0846d6c7 Addressed more feedback 2022-05-16 15:11:46 -04:00
UncomfySilence
ac124b67a0 minor loot table tweaks and removal of yellow weapon components from caves 2022-05-16 15:11:45 -04:00
Sam
cbf5336343 Moved items from 'items.crafting_ing.modular' to 'items.modular.weapon' (assets). 2022-05-16 15:11:45 -04:00
Sam
ad48b634ab Address feedback (assets) 2022-05-16 15:11:44 -04:00
Sam
254b7964e1 Balance tweaks (assets) 2022-05-16 15:11:43 -04:00
Sam
d6ac9c43d7 More feedback addressed (assets). 2022-05-16 15:11:41 -04:00
Sam
13ea6dee93 Addressed second round of balance feedback (assets). 2022-05-16 15:11:40 -04:00
Sam
9b078c3383 Addressed playtest feedback (assets). 2022-05-16 15:11:38 -04:00
UncomfySilence
1c626da66b loot tables and adding models 2022-05-16 15:11:36 -04:00
Sam
528b62c59a Rebase commit 2022-05-16 15:11:36 -04:00
Sam
efc0189548 Changed component recipe book to generate some stuff automatically to avoid potential for stuff inside to become unsynced (assets). 2022-05-16 15:11:34 -04:00
Sam
49ff094286 Addressed most review comments (assets). 2022-05-16 15:11:33 -04:00
Bryant Deters
075fee5190 modular component tooltips 2022-05-16 15:11:25 -04:00
Sam
558e2aefb7 Bow models 2022-05-16 15:11:23 -04:00
Sam
eec0ba18a9 Fixed eldwood recipes returning frostwood components. 2022-05-16 15:11:22 -04:00
Sam
d436362a8d Consolidated crafting UI for the primnary component of modular weapons. 2022-05-16 15:11:21 -04:00
Sam
3702952f99 Added recipes for each material kind. 2022-05-16 15:11:20 -04:00
Sam
ef5b2e4a1e Added method of differing names for 1h and 2h variants of a modular wepaon. 
Added all 1h melee weapon models.
 2022-05-16 15:11:19 -04:00
Sam
1c0154487a Rebase fixes. 2022-05-16 15:11:18 -04:00
Sam
94c19735ca Fixed broken stuff during rebase. 2022-05-16 15:11:16 -04:00
Sam
5c28e3cb25 Items with components can now have their name modified by the components. Also addressed more review. ONLY ASSETS 2022-05-16 15:11:16 -04:00
Sam
524845b661 Addressed more comments on MR. 2022-05-16 15:11:15 -04:00
Sam
d7f5b907ff Gave modular items a pseudo item definition id that can be used when serializing ItemBase or when persisting items to the database. ONLY ASSETS 2022-05-16 15:11:14 -04:00
Sam
eecc1b42c3 Fixed regex mistake in changing name of item assets. 2022-05-16 15:11:13 -04:00
Sam
62632318fe Changed ModularComponent to allow it to be more extensible. Overhauled random modular weapon function so that there is less runtime cost to generate one. ONLY ASSETS 2022-05-16 15:11:12 -04:00
Sam
b048179c0a Changed Item to have ItemBase instead of ItemDef. ONLY ASSETS. 2022-05-16 15:11:11 -04:00
Sam
2aad3f3961 Switched to item list as an input for modular components so that allowed items could be centralized. 2022-05-16 15:11:08 -04:00
Sam
5acb8cf74e Rebase conflcits handled. 2022-05-16 15:11:05 -04:00
Sam
33feee787b Removed stuff no longer needed after new method of crafting modular weapons. 2022-05-16 15:11:05 -04:00
Sam
b7aa0a7a9f Rebase commit. 2022-05-16 15:11:04 -04:00
Sam
c6b5798cfd Inserted entries in item image and biped weapon manifests to aid in addition of models later. 2022-05-16 15:11:03 -04:00
Sam
ca644f8f0b Added more interesting ingredients to recipes. 
Changed bow main component from held (grip) to damage (limbs).
 2022-05-16 15:11:02 -04:00
Sam
9302a83e8c Added wood into dungeon loot tables. 2022-05-16 15:11:02 -04:00
Sam
a908eb5791 Made a few more changes to migration, removed additional weapon. 2022-05-16 15:11:01 -04:00
Sam
9776760f47 Updated stats on components and edited migration for 1 handed weapons to point to new target modular weapon. 2022-05-16 15:11:00 -04:00
Sam
21084e48f0 Removed old weapons that were migrated to modular weapons. 2022-05-16 15:11:00 -04:00
Sam
c0ac8891ab Added initial recipes for bow, staff, and sceptre components. 2022-05-16 15:10:58 -04:00
Sam
c10fa35fa4 Added correct names to every bow, staff, and sceptre component. 2022-05-16 15:10:58 -04:00
Sam
0a38567e8d Modular weapons can now be properly displayed in the inventory. 2022-05-16 15:10:57 -04:00
Sam
105bb24631 Added placeholder components for bows, staffs, and sceptres. 2022-05-16 15:10:56 -04:00
Sam
762b3be3c3 Modular weapons can now be dropped as loot or assigned to enemies. 2022-05-16 15:10:56 -04:00
Sam
c01fe655f1 Added wood 2022-05-16 15:10:55 -04:00
Sam
d380a2dbaf Quality is now propogated through modular items from the quality of the components. 2022-05-16 15:10:55 -04:00
Sam
c6f4b51215 Removed descriptions from modular weapons and components. 2022-05-16 15:10:54 -04:00
Sam
885bb9aaa7 Added programmatic names for modular components. 2022-05-16 15:10:53 -04:00
Sam
405b9b2448 Modular weapons now have programmatically generated names. 2022-05-16 15:10:53 -04:00
Sam
4e89bc7485 Added test functions to assist in fixing unit tests that broke from changed functionality. 2022-05-16 15:10:52 -04:00
Sam
f9256ecd62 Added recipes 2022-05-16 15:10:51 -04:00
Sam
5898ce9d98 Added axe and hammer components. 2022-05-16 15:10:51 -04:00
Sam
6620c1dd1f Added HandsKind to automatically resolve handedness of modular weapons. 2022-05-16 15:10:51 -04:00
Sam
85b7382487 Added handedness requirements to recipes and components. 2022-05-16 15:10:50 -04:00
Sam
68c8160ecb Added modular components for swords. 2022-05-16 15:10:50 -04:00
Sam
77934c9214 Made changes to crafting to allow modular weapons to work as intended. 2022-05-16 15:10:48 -04:00
Isse
2050bce77d Water caves 2022-05-15 10:16:53 +00:00
Youssef Fahmy
aec866e5ec Balance tweaks 2022-04-23 14:54:01 +00:00
aflying pumpkin
c7f7e63495 Added Lionesses 2022-04-16 16:57:59 +00:00
juliancoffee
1b18629616 Execute asset migration 2022-04-08 19:17:01 +03:00
juliancoffee
09d395f528 Remove temporary test files from git repo 2022-04-07 18:44:15 +03:00
juliancoffee
3f7bfff8d7 Implement all needed features 
+ Multiple/Random inheritance for loadout configs
+ Using ItemSpecNew in Hands
+ Rename Hands::Specific to Hands::InHands to represent non-random
  combination
 2022-04-07 18:44:14 +03:00
flo
3d24b1d635 CliffTowns 2022-03-29 12:52:08 +00:00
Christof Petig
f347b9de11 Diversify price calculation for items by using multiple categories per item. 2022-03-03 02:32:34 +00:00
Marcel Märtens
e2648f6733 apply changes from MR!2904 2022-02-20 10:18:24 +01:00
Samuel Keiffer
6c7c0eefae Merge branch 'gnarlings' into 'master' 
Gnarlings

See merge request veloren/veloren!3194
 2022-02-15 00:22:37 +00:00
unvariant
9d98cd9e58 Render item drops instead of placeholder textures 2022-02-14 02:09:45 +00:00
UncomfySilence
a0d43cb21d further balance changes 2022-02-13 10:35:19 +01:00
Sam
2e6610314c Balance tweaks 2022-02-13 00:39:46 -05:00
Sam
4991f7ecea Gnarlign site tweaks and chieftain buff 2022-02-11 01:23:09 -05:00
Sam
0031aa6f5f Chieftain AI and attacks 2022-02-10 14:58:35 -05:00
jshipsey
0c788997a4 anims 2022-02-10 14:58:34 -05:00
Sam
fcb0f8d8f0 Wood golem attacks and ai 2022-02-10 14:58:32 -05:00
Sam
e044bf5091 Mandragora attacks and ai 2022-02-10 14:58:32 -05:00
Sam
f1801560fa Deadwood ai 2022-02-10 14:58:31 -05:00
Sam
82c976919e Darts are now darts. 2022-02-10 14:58:29 -05:00
Sam
40bb74c42f Gnarling stalker AI 2022-02-10 14:58:28 -05:00
Sam
e1f164d099 Initial AI for gnarling logger/mugger. 2022-02-10 14:58:27 -05:00
James Melkonian
3a8a0d9c53 Cavern systems under gnarling fortifications 2022-02-10 14:58:24 -05:00
Sam
6c6caa7535 Enemy spawns in gnarling fortification. 2022-02-10 14:58:22 -05:00
jshipsey
786ae39fb4 new entities 2022-02-09 20:10:59 -05:00
phoenix13032005
7a1f0d9fa1 Balance update 
+ Make icons for Mino and Mindy dungeons with their faces
+ Adjust loot tables
+ Adjust names with respect to the lore of @Gemu
 2022-02-09 12:13:42 +02:00
juliancoffee
c1a9e1a1b6 Add rare lanterns 2022-02-08 01:39:32 +02:00
juliancoffee
995b10c247 Add all Travelers 2022-02-08 01:39:26 +02:00
juliancoffee
bb99f7e3b6 Add Traveler0 2022-02-08 01:35:54 +02:00
Dominik Broński
19c764dde6 Merge branch 'christof/econfix' into 'master' 
Small economy cleanup

See merge request veloren/veloren!3164
 2022-02-03 21:48:01 +00:00
juliancoffee
0682bfbe14 Add weapons to Husk loadout 2022-02-03 18:02:51 +02:00
Christof Petig
a98b9ad049 normalize loot tables before combining them, take current values for a start 2022-01-31 19:45:38 +01:00
jshipsey
7cac4b4001 myrmidon fix 2022-01-30 02:02:23 -05:00
jshipsey
7827797106 weapon tweaks 2022-01-30 01:10:13 -05:00
jshipsey
4fbd3027a1 new mobs 2022-01-28 02:50:15 -05:00
juliancoffee
e004fba9da Adress review 2022-01-28 00:02:34 +02:00
juliancoffee
9a2fde557c Fix rebase 2022-01-28 00:02:34 +02:00
juliancoffee
5a370cb6f7 Loadout Update: Use 
Delete guard and villager lazy_loadout and use LoadoutKind::Extended
with potions instead
 2022-01-28 00:02:34 +02:00
juliancoffee
7585c8dcc1 Migrate EntityConfig for Loadout update 2022-01-28 00:02:34 +02:00
floppy
2fe8cb965d change SeaCrocodile spawn 2022-01-27 11:34:59 +01:00
floppy
fb316e8f66 SeaCrocodile spawning in tropical Oceans 2022-01-24 19:36:13 +01:00
Samuel Keiffer
7052aad11b Merge branch 'snowram/arthropods' into 'master' 
Snowram/arthropods

See merge request veloren/veloren!3071
 2022-01-20 00:20:24 +00:00
Snowram
a6e396e29a Stunned and jump anims, stats, spawns, more IA work 2022-01-20 00:53:29 +01:00
InfRandomness
dabae7ece8 Remove bomb pile item 2022-01-19 19:31:43 +00:00
Snowram
f6d7ba33ef Arthropods spawns and loots 2022-01-19 19:01:16 +01:00
jshipsey
82df5f23c3 spit anim 2022-01-19 19:01:16 +01:00
jshipsey
269b1fcd00 summon an 2022-01-19 19:01:15 +01:00
Snowram
38bbd60fd2 Arthropod basic attack 2022-01-19 19:01:14 +01:00
Snowram
1e6ead4005 Arthropod charge 2022-01-19 19:01:13 +01:00
Snowram
02ed6ffd60 More arthropod work 2022-01-19 19:01:13 +01:00
Snowram
fa549eece7 Adds new arthropod species 2022-01-19 19:01:12 +01:00
Snowram
f67bf2a539 Adds arthropod skeleton 2022-01-19 19:01:11 +01:00
Samuel Keiffer
c3e92b6c7a Merge branch 'sam/melee-constructor' into 'master' 
Melee Constructor

See merge request veloren/veloren!3111
 2022-01-19 06:36:51 +00:00
roidujeu
a6a825a97f gave speed more weight, reduced equip_time_weight, etc 2022-01-18 10:48:53 +05:30
Sam
b0644ca767 Melee attacks are now created through a melee constructor. 2022-01-17 20:41:24 -05:00
Sam
31a894601f Removed health sclaing from summon character state. 2022-01-16 18:18:23 -05:00
Sam
9b6c76bd3b Removed health scaling that bypasses the skill system. 2022-01-15 11:58:28 -05:00
jshipsey
0e9d50162b last fixes 2022-01-14 00:19:32 -05:00
jshipsey
475fc1631f akhlut 2022-01-13 23:20:58 -05:00
jshipsey
1fac6359de more gnarling weapons 2022-01-13 23:20:56 -05:00
jshipsey
7f928d0bc0 woodengolem, chieftain, icedrake, blowgun 2022-01-13 23:20:52 -05:00
Sam
c8f8ccdc55 Buffed spin for whatever strange reason 2022-01-12 22:18:59 -05:00
Sam
e98edbcc7a Conversion of poise damage to health damage now scales depending on the poise state the target is in. 
Entities are now immune to poise damage for 1 second after exiting a poise state.
Rebalanced most phyiscal damage attacks on player-accessible tools.
 2022-01-12 22:18:59 -05:00
Sam
d1e1de3b14 Slashing damage now decreases target's energy if available, and if target has no remaining energy will do additional damage. 
Piercing damage now ignores an amount of protection equal to the piercing damage value.
Crushing damage now does poise damage equal to the amount of mitigated damage.
When poise damage is dealt while in a poise state, poise damage is instead converted to damage.
 2022-01-12 22:18:58 -05:00
Monty Marz
d72d926341 change merchant backpack visuals and add mining skill icons 2022-01-08 01:57:52 +01:00
Sam
8221336587 Addressed some review. 2022-01-03 19:55:04 -05:00
Youssef Fahmy
9cd87b1af7 Christmas Cleanup 2021-12-30 18:58:15 +00:00
Samuel Keiffer
4d85ae4f60 Merge branch 'ubruntu/dagger-ux' into 'master' 
Dagger UX

See merge request veloren/veloren!3072
 2021-12-28 22:09:34 +00:00
ubruntu
65f9d18fb7 Dagger UX 2021-12-28 22:09:34 +00:00
DoctorKompot
22b19e40e9 updated changelog, fixed lantern colors 2021-12-27 03:01:28 +02:00
DoctorKompot
0dba858ca9 fixed turban specifier in item image manifest, reverted bag size for purified soulkeeper, updated item quality colors in mod files 2021-12-27 03:01:26 +02:00
DoctorKompot
d312452941 changed Magic Lantern kind: to "Magic" 2021-12-27 03:01:24 +02:00