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,979 Commits 151 Branches 18 Tags
7898af73c2
Commit Graph

1901 Commits

Author SHA1 Message Date
Knightress Paladin
484fc3f161 Clean up sceptre ai code before merge 2021-07-07 20:00:35 -07:00
Knightress Paladin
64ff6c3754 Fixed formatting 2021-07-07 20:00:35 -07:00
Knightress Paladin
4bd34d1871 Add check to see if cultist already has ward buff 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
Joshua Barretto
7a6a8a741a Merge branch 'DixieDev/569-fix-inventory-and-lantern-usage-while-dead' into 'master' 
Fix players having inventory and lantern control while dead

Closes 

See merge request
2021-07-07 18:44:01 +00:00
DixiE
86fd512647 Fix players having inventory and lantern control while dead 2021-07-07 13:18:24 +01:00
Avi Weinstock
fdb5dedac1 Fix integral error calculations in PID controller, and change coefficients for airship and hot air balloon. 2021-07-06 16:52:12 -04:00
Knightress Paladin
f729ec3d3d Formatted code to omit continue keyword 2021-07-05 19:41:25 -07:00
Knightress Paladin
a771bea612 Added check for exploding lava and glowing blocks 2021-07-05 19:41:25 -07:00
Enrico Marconi
bd503de294 Actually check if entity is alive 2021-07-05 16:09:39 +02:00
Enrico Marconi
9ec2bf9eb7 Check if entity is alive before applying a buff 2021-07-05 16:09:39 +02:00
AldanTanneo
b50188d69f Implemented trading stackable items with a full inventory 2021-07-05 10:34:03 +00: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
Samuel Keiffer
3eb44bd171 Merge branch 'swrup/fix_combo_decay_on_death' into 'master' 
fix combo not reset at respawn

See merge request
2021-07-05 03:56:24 +00:00
Samuel Keiffer
a71b035b05 Merge branch 'juliancoffee/yeti_nerf' into 'master' 
Adjust Yeti difficulty

See merge request
2021-07-05 03:46:42 +00:00
Swrup
d9d9bc90e4 fix combo not reset at respawn 2021-07-04 17:28:11 +02: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
Avi Weinstock
9aa1985172 Remove allocation in SpriteKind::collectible_id. 2021-07-03 15:32:36 -04:00
DaforLynx
e20a5db899 Sfx fixes and new test 2021-06-30 11:43:00 +00:00
Samuel Keiffer
74d4f3e49c Merge branch 'potion-animations' into 'master' 
Consumable Animations

See merge request
2021-06-29 16:36:41 +00:00
Sam
a3dd5f395c Removed potential for accessing OOB index and panicking in animations for combo melee. 
Made only entities with a character state component emit a death outcome on death.
 2021-06-29 06:20:26 -05:00
Sam
938978bdbd Destringified consumables 2021-06-29 05:59:02 -05:00
Snowram
64045ed7bd Adds an outcome to death with SFX and VFX 2021-06-29 00:14:05 +02:00
Ben Wallis
925a174205 Merge branch 'xvar/fix-plugin-build-warnings' into 'master' 
Fixed build warnings for server-cli related to non-default plugin feature

See merge request
2021-06-26 21:35:54 +00:00
Ben Wallis
ed9c619822 Fixed build warnings for server-cli related to non-default plugin feature 2021-06-26 21:56:03 +01:00
Avi Weinstock
bea9de0d46 Rename remove_warlock_warlord migration so it actually triggers. 2021-06-26 16:28:49 -04:00
Daan Vanoverloop
7d39c14481 Fixing - use strum macros for BlockKind conversion 2021-06-26 17:52:32 +02:00
Snowram
3b393a9c5c Ajust new npcs from feedback 2021-06-25 03:26:32 +02:00
Snowram
f518aebe81 Ajustments to new npcs 2021-06-24 19:31:21 +02:00
Snowram
38c9ff5225 Husk brute animations 2021-06-24 19:31:19 +02:00
Snowram
080328941b Adds alpaca and llama npcs 2021-06-24 19:30:15 +02:00
Snowram
78afaf32a2 Removes warlord and warlock armours 2021-06-24 19:30:11 +02:00
Sam
e93c981ed5 Balance tweaks for harvester. 2021-06-23 22:38:16 -05:00
Sam
d46aa358c8 Harvester AI 2021-06-23 22:38:16 -05:00
Sam
cc748c0a3f Ensnaring vines now ensnare you. 2021-06-23 22:38:16 -05:00
Sam
c326df0b88 Slightly functional sprite summon. 2021-06-23 22:38:16 -05:00
Marcel
1de3dd515c Merge branch 'imbris/tracy' into 'master' 
Refactor Client message handling, improve use of tracy, increase coverage of profiling spans in voxygen

See merge request
2021-06-20 23:17:08 +00:00
Christof Petig
11d9b93684 Accelerate econsim using arrays instead of hashmaps 2021-06-20 16:00:37 +00:00
Imbris
156e2e86b5 Remove tracy features that are no longer needed now that macros have been fixed 2021-06-19 04:27:50 -04:00
juliancoffee
0ac97ed156 Nerf golem laser dmg and ori_rate, make it fire 
+ Make laser state duration lower
 2021-06-19 10:47:45 +03:00
juliancoffee
27e309fb19 Use Golem Shockwave only after loosing 30% health 
+ Make shockwave buildup longer
 2021-06-18 22:32:43 +03:00
Joshua Barretto
c3c8fcc54a Renamed command event 2021-06-18 11:31:06 +01:00
Joshua Barretto
e2f558dacd Made commands a distinct ClientMsg to avoid possible sanitisation problems for clients 2021-06-17 19:55:21 +01:00
DaforLynx
fd2094ca3d Added npc hurt sfx 2021-06-17 05:49:09 +00:00
jshipsey
a98734d609 buffs to stretch progression 2021-06-16 20:50:46 -04:00
Joshua Barretto
0c925ea03e Added more cow noises, prepare for merge 2021-06-16 17:23:54 +01:00
Joshua Barretto
93affee6ac Significantly more efficient sound effect processing, more NPC sounds 2021-06-16 17:23:22 +01:00
Joshua Barretto
19dd62a887 More voice kinds, more opportunities for sounds 2021-06-16 17:23:22 +01:00
Joshua Barretto
0a8d4af404 VoiceKind for better sound effect specs 2021-06-16 17:23:22 +01:00
Joshua Barretto
64e79b5659 Chasing sounds 2021-06-16 17:23:22 +01:00