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

1980 Commits

Author SHA1 Message Date
Snowram
509a71bdc7 Adresses some comments, various visual tweaks 2021-02-10 00:30:23 +01:00
Snowram
17fe9519b3 Adds lights to dungeons 2021-02-10 00:30:23 +01:00
Sam
97153fc8e6 Changing main tool while in wield state moves character back to idle state. 2021-02-08 17:25:40 -05:00
Sam
7e3ec94207 Inventory manipulations are now only for input from the client, and are no longer directly sent as a server event. Slot manipulations do that instead. 2021-02-08 13:55:50 -05:00
Sam
d6ffb1cea5 Loadout manipulations now emit a separate event from client instead of hackily intercepting inventory manipulations in common. 2021-02-08 12:31:17 -05:00
Sam
7289ee89fa Server events directly emitted in states now. 2021-02-08 12:01:48 -05:00
Sam
45be7dd64d Eradicated clones 2021-02-08 12:01:48 -05:00
Sam
a7e43b760f Extended what states inventory manipulations touching the loadout could affect. 2021-02-08 12:01:47 -05:00
Sam
b7496b438f Inventory changes that modify the loadout now go through a control action instead of a control event. 2021-02-08 12:01:47 -05:00
Samuel Keiffer
b9dc561199 Merge branch 'sam/fix-roll' into 'master' 
Fixes roll being free

See merge request veloren/veloren!1757
 2021-02-06 22:15:06 +00:00
Imbris
af7f21729f Merge branch 'trollderim/replace-magic-dr-number' into 'master' 
Replace magic dr constant

Closes #915

See merge request veloren/veloren!1756
 2021-02-06 20:28:40 +00:00
Sam
a4696e5c6f Roll is no longer free. 2021-02-06 15:20:08 -05:00
Phillipp Mevenkamp
e56c6ecc6a Replace magic dr constant 2021-02-06 18:21:58 +01:00
James Melkonian
4d4c6d8b13 Move agent system to server 2021-02-06 06:15:25 +00:00
Pascal Fuhrmann
7e99de8017 Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts 2021-02-05 01:39:12 +00:00
Sam
64868ad7a3 Addressed comments. 2021-02-02 16:08:09 -05:00
Sam
30f33a03b7 Made attacker entity and uid optional to remove potential for attacks to not be applied and some unwraps. 2021-02-02 13:07:07 -05:00
Sam
e92a059ab1 Changed knockback to be an effect on the overall attack, rather than a damage. 2021-02-02 13:07:07 -05:00
Sam
e5bc0d7edf Outcomes now correctly read if an attack had any healing components. 2021-02-02 13:07:06 -05:00
Sam
1bc1b5f200 Added support for damage falloff with explosions. 2021-02-02 13:07:06 -05:00
Sam
486de732fc Explosions now use attacks. 2021-02-02 13:07:06 -05:00
Sam
7317599bed Shockwaves now use attacks. 2021-02-02 13:07:05 -05:00
Sam
f1f4251cb7 Effects on attacks can now require energy. 2021-02-02 13:07:05 -05:00
Sam
c1db9025b8 Attacks can now heal. 2021-02-02 13:07:04 -05:00
Sam
3d42e2812d Attacks can now deal poise damage. 2021-02-02 13:07:04 -05:00
Sam
34cf870cfa Lifesteal now functional on Attack. 2021-02-02 13:07:03 -05:00
Sam
52dbf3f1a8 Beams now use Attack, with limited functionality in some cases. 2021-02-02 13:07:03 -05:00
Sam
9783fc8408 Projectiles now use attacks. 2021-02-02 13:06:57 -05:00
Sam
419f3c62fd Attack effects can now have requirements. 2021-02-02 13:06:34 -05:00
Sam
54175e4710 Effects now work when not tied to a damage. 2021-02-02 13:06:34 -05:00
Sam
f3d01b3160 Rolling now dodges melee attacks again. 2021-02-02 13:06:34 -05:00
Sam
fde961a498 Attacks can now inflict de/buffs. 2021-02-02 13:06:33 -05:00
Sam
26bcfeb66f Attacks can now reward energy. 2021-02-02 13:06:33 -05:00
Sam
c6012f5b00 Critical hits are now functional. 2021-02-02 13:06:32 -05:00
Sam
b78230275d Applied basic functionality of attack-effects system to melee. 2021-02-02 13:06:32 -05:00
Sam
95a6a637f1 Changed name of Attacking comp to MeleeAttack 2021-02-02 13:06:31 -05:00
Sam
7050398af0 Attack builder implemented. 2021-02-02 13:06:31 -05:00
Sam
5794faa761 Changed knockback from an enum to a struct. 2021-02-02 13:06:30 -05:00
Pascal Fuhrmann
77e1b5bf17 fixing #944 - LeapMelee fall damage fix & adjustments 2021-02-02 16:51:04 +00:00
Blob
3a71303aaf Fix projectile explosion being triggered twice. 2021-02-01 15:41:34 +00:00
James Melkonian
8951e427e4 Add basic NPC interaction and fix NPC chat spamming 2021-01-31 20:29:50 +00:00
jiminycrick
76fd36130d Quick poise fix 2021-01-29 15:52:40 -08:00
jiminycrick
ae8722794b Address some comments 
Eliminated extra stagger state

Responding to more comments

Move poise character state changes to character behavior system

Move poise out of JoinTuple/Data

Finish up comments (various fixes)
 2021-01-28 17:31:05 -08:00
jiminycrick
b689226173 Add migration for starter gear 2021-01-28 17:22:39 -08:00
jshipsey
1b0bf21775 animal stuns 
Fix rebase
 2021-01-28 17:22:39 -08:00
jiminycrick
1fadcf51ba Some preliminary balancing 
Fix rebase
 2021-01-28 17:22:39 -08:00
jshipsey
95c3af1123 starting stun anim 
stagger anim, mirroring, bettern walk anim

wielding with stuns/stagger

Knockback fix

Added Poise documentation/comments
 2021-01-28 17:22:37 -08:00
jiminycrick
27ad277051 Made stunned state invulnerable to poise damage 
Fixing silly error for comp creation
 2021-01-28 17:22:35 -08:00
jiminycrick
a2262c5c6b Poise stats 2021-01-28 17:22:35 -08:00
jiminycrick
221d4c8cdc Add knockback to poise 2021-01-28 17:22:35 -08:00