Commit Graph

19 Commits

Author SHA1 Message Date
Fierelier
f5227096a6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	paydayHealth.cs
2018-05-15 10:04:36 +02:00
Fierelier
08e430e275 Removed testing KeyDown EventHandler 2018-05-15 10:02:19 +02:00
Fierelier
83daeec0ae Moved timeUntilRegen reset-checks 2018-05-15 10:00:56 +02:00
Fierelier
5eb9b4dbb5 Added armorDefense 2018-05-15 10:00:30 +02:00
Fierelier
34355502ec Fixed mistake with allDamageArmor 2018-05-15 10:00:00 +02:00
Fierelier
3a5d3d044c Added overrideArmor 2018-05-15 09:59:42 +02:00
Fierelier
97e72b3143 Changed overrideHealth 2018-05-15 09:59:30 +02:00
Fierelier
93c3518370 Updated descriptions for settings 2018-05-15 09:56:44 +02:00
Fierelier
2020cc3eb0 Merge branch 'master' of https://git.lumen.sh/Fierelier/iv-pdhealth 2018-04-23 15:30:29 +02:00
Fierelier
f9af270574 Fixed mistake 2018-04-23 15:30:22 +02:00
Fierelier
b9bdcf44d3 Added overrideHealth 2018-04-23 15:30:10 +02:00
Fierelier
896db94b17 overrideHealth added 2018-04-19 22:01:18 +02:00
Fierelier
5e0d6525f6 Updated descriptions 2018-04-18 22:04:16 +02:00
Fierelier
90a7355064 Fixed armor-damage 2018-04-18 16:08:43 +02:00
Fierelier
809672d61a Revert "Broke af"
This reverts commit 87cab524ee.
2018-04-17 22:59:02 +02:00
Fierelier
87cab524ee Broke af 2018-04-17 22:41:50 +02:00
Fierelier
3cc8861f64 .gitignore added 2018-04-17 22:08:42 +02:00
Fierelier
66102c8025 Added allDamageArmor 2018-04-17 21:55:04 +02:00
Fierelier
e19094ff65 First Commit 2018-04-17 21:16:20 +02:00