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
9,177 Commits 151 Branches 18 Tags
Commit Graph

2101 Commits

Author SHA1 Message Date
Forest Anderson
83692ae1b7 Merge branch 'aylana/asp-sfx' into 'master' 
Princess-Lana - Add asp sound effects for the game

See merge request veloren/veloren!2611
 2021-07-17 01:49:20 +00:00
Samuel Keiffer
651b775932 Merge branch 'knightresspaladin/healing-aura' into 'master' 
Knightresspaladin/healing aura

See merge request veloren/veloren!2587
 2021-07-16 21:32:03 +00:00
Monty Marz
1443b3e78d icon 2021-07-16 18:39:14 +02:00
Samuel Keiffer
0ef3a978b0 Merge branch 'juliancoffee/patch_animal_dash_double_hit' into 'master' 
Set charge_through to false for non-humanoid dash

See merge request veloren/veloren!2616
 2021-07-16 15:33:59 +00:00
juliancoffee
c6b1446f72 Set charge_through to false for non-humanoid dash 2021-07-16 15:49:02 +03:00
Marcel
33aba370d4 Merge branch 'zesterer/sfx' into 'master' 
Clipped arrow sound effects for more immediate feedback

See merge request veloren/veloren!2476
 2021-07-16 10:32:29 +00:00
Aylana
513085da30 Add asp sound effects 2021-07-15 20:15:36 +02:00
Marcel
b8f7975195 Merge branch 'AlexBethel/item-typos' into 'master' 
Correct spelling errors in item descriptions

See merge request veloren/veloren!2548
 2021-07-15 08:15:43 +00:00
Sam
dc31b9fd1e Particles for healing aura 2021-07-13 20:54:43 -05:00
Samuel Keiffer
b1fd246a77 Merge branch 'knightresspaladin/buff-bow-scaling' into 'master' 
Buffed scaling for bow charged shot

See merge request veloren/veloren!2596
 2021-07-14 00:45:55 +00:00
Knightress Paladin
becd8b4d2d Buffed scaling for bow charged shot 2021-07-13 15:25:35 -07:00
Monty Marz
afcb3eb1e7 char selection frames, adjustments 2021-07-13 13:31:01 +02:00
Sam
192078c6fb Added buff strength stat to weapons. 2021-07-11 12:50:38 -05:00
Knightress Paladin
1289b21e70 Removed references to Healing Beam, which Healing Aura is replacing 2021-07-10 21:39:11 -07:00
Sam
61a18a671d Renamed poise_strength to effect_power to allow it to be used more generally with other weapons in the future. 2021-07-10 23:22:00 -05:00
Knightress Paladin
a2c89cd66b Added healing aura duration skill to voxygen UI 2021-07-10 20:02:36 -07:00
Knightress Paladin
97e59fc633 Added combo scaling to healing aura and allowed cultists to use it 2021-07-10 20:02:36 -07:00
Knightress Paladin
ac5bec1b09 Add healing aura for sceptre M2 2021-07-10 20:02:35 -07:00
Szabó Lambert
333fc7f1a8 Updating the Hungarian translation (minor changes in 6 files, major changes in 14 files) 2021-07-10 17:25:56 +00:00
Samuel Keiffer
7cc4a7b593 Merge branch 'juliancoffee/skill_truth' into 'master' 
Move skill boost modifiers to skills module

See merge request veloren/veloren!2540
 2021-07-09 23:05:48 +00:00
Knightress Paladin
484fc3f161 Clean up sceptre ai code before merge 2021-07-07 20:00:35 -07:00
Knightress Paladin
7d35383be5 Added sceptre tactic and sceptre cultists 2021-07-07 20:00:01 -07:00
Dominik Broński
3a2d615fe5 Merge branch 'pfau/stuff' into 'master' 
Minimap modes, Danari customizations update & bald hairstyles

See merge request veloren/veloren!2576
 2021-07-08 00:01:09 +00:00
Monty Marz
2a1efb4b2b Minimap modes, Danari customizations update & bald hairstyles 2021-07-08 00:01:08 +00:00
Samuel Keiffer
f7fa2ce21a Merge branch 'sam/energy-stat' into 'master' 
Added energy efficiency stat to weapons.

See merge request veloren/veloren!2571
 2021-07-07 22:57:58 +00:00
juliancoffee
3feb3800d7 Use code-spliced values for i18n skill description 2021-07-07 17:51:30 +03:00
Swagazaki
b824c47d43 Just updated common.ron to correct a few French translations! 2021-07-07 10:55:15 +00:00
Sam
0b22953f05 Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive. 2021-07-06 22:54:23 -05:00
Snowram
6d122c6ade Spawn dungeon entrances depending on the Site origin biome 2021-07-07 00:35:50 +02:00
Samuel Keiffer
9460d76a06 Merge branch 'sam/range-stat' into 'master' 
Added range stat to weapons.

See merge request veloren/veloren!2563
 2021-07-06 21:18:47 +00:00
Sam
572072608b Addressed review comments. Removed individual stat assignments. 2021-07-06 15:27:49 -05:00
Marcel
a466b305da Merge branch 'master' into 'master' 
Add Hungarian translation

See merge request veloren/veloren!2559
 2021-07-06 11:44:58 +00:00
Caleb
b7f7503602 Lowered ori_rate to 0.3 for BasicBeam abilities 2021-07-05 22:08:52 -05:00
Sam
aa60081ec7 Added range stat to weapons. 2021-07-05 20:32:12 -05:00
juliancoffee
0640902b7f Make ItemEquality work 
+ Create own directory for trade_pricing `assets/common/trading`
+ Move fictive loot tables there
+ Mark sellable/non-sellable items in trade_pricing tests
 2021-07-05 19:55:08 +03:00
Ács Zoltán
e278f69574 Add Hungarian translation 2021-07-05 15:14:35 +02:00
Ács Zoltán
8c72d7815f Add support for ő and ű to the haxrcorp font 2021-07-05 15:12:27 +02:00
juliancoffee
28c9ea029b Fill trade_pricing with craftable items 2021-07-05 15:43:03 +03:00
juliancoffee
da44b81d7f Bump some food duration to 10 seconds 2021-07-05 10:56:29 +03:00
juliancoffee
c89cf7eec1 Add new food to consumables /kit 2021-07-05 10:56:29 +03:00
juliancoffee
3a4ea2611d Add descriptions to the potions 2021-07-05 10:56:29 +03:00
juliancoffee
3c20c4383b (voxygen) Better support for multibuff items 
+ change `effect` field in ItemKind::Consumable to `effects`, as it's
set of effects and not single effect.
 2021-07-05 10:56:29 +03:00
juliancoffee
b828492040 Rebalance food for new consumables changes 2021-07-05 10:56:29 +03:00
juliancoffee
af9a279371 Change Mortar and Pestle crafting recipe 
- Make it require bowl instead of coconut
 2021-07-05 10:56:29 +03:00
Samuel Keiffer
a71b035b05 Merge branch 'juliancoffee/yeti_nerf' into 'master' 
Adjust Yeti difficulty

See merge request veloren/veloren!2550
 2021-07-05 03:46:42 +00:00
steanne
29d5f16b0c Update assets/common/items/crafting_ing/mindflayer_bag_damaged.ron 2021-07-04 01:44:33 +00:00
juliancoffee
cc27ce00fe Adjust Yeti difficulty 
Frost breath:
    - ori_rate reduced from 0.6 to 0.1
    - time of breath increased from 1 second to 2 seconds
    - buildup increased from 0.4 to 0.8
    - make it more gentle, with less damage per tick, but faster tick rate
    (50 * 1 to 10 * 5)
    - make Frozen debuff strength smoler, 1.5 to 0.5 and make it chance to
    apply debuff.
    - make him use it when closer range (10 and not 15)
Ice spikes:
    - increase recovery_duration from 0.3 to 1.0
    - make him slower while doing ice spikes, make ice spikes move
    slower
    - make him use it when closer range (15 and not 20)
Snowball:
    - increase recover_duration from 0.4 to 0.9
Strike:
    - increase buildup_duration fron 0.6 to 0.8
    - increase recover_duration from 0.5 to 1.0
    - increase knockback from 40.0 to 70.0
 2021-07-04 03:44:17 +03:00
Alex Bethel
d00bc97577 Correct spelling errors in item descriptions 2021-07-03 15:53:19 -05:00
Samuel Keiffer
70d52e9495 Merge branch 'juliancoffee/dungeon_rebalance' into 'master' 
Make cultist great again

See merge request veloren/veloren!2513
 2021-07-01 02:37:39 +00:00
Joshua Barretto
8e2f0021e3 Merge branch 'DaforLynx/aeh' into 'master' 
Sfx fixes and new test

See merge request veloren/veloren!2529
 2021-06-30 11:43:01 +00:00