Commit graph

1900 commits

Author SHA1 Message Date
Benford
147d89c778 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-02-25 13:10:44 -05:00
Benford
c2f471a346 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-02-25 13:09:22 -05:00
jedk1
c1c2b26b55 Change null in ElementType to NO_SUFFIX 2016-02-25 15:25:40 +00:00
jedk1
1da3c3b1d0 Update TabComplete to support Custom Elements 2016-02-25 00:38:08 +00:00
jedk1
78a341e636 Fix NPE with Custom Elements 2016-02-25 00:15:52 +00:00
jedk1
042866ec62 Add support for custom elements 2016-02-24 23:23:03 +00:00
jedk1
f599b5ca1e Change Element and SubElement to public 2016-02-24 00:46:30 +00:00
jedk1
1836888070 Add remove call to QuickStrike 2016-02-23 22:12:24 +00:00
OmniCypher
d8936f8ba8 Merge pull request #421 from jedk1/master
Fix DeathMsgs & ReloadEvent
2016-02-22 20:09:42 -08:00
jedk1
b3679e8829 Fix DeathMsgs & ReloadEvent 2016-02-22 17:01:54 +00:00
OmniCypher
010f4953ec Merge pull request #420 from kingbirdy/bendingevents
Add CommandSender to BendingReloatEvent, cleanup other events
2016-02-21 18:42:04 -08:00
Philip Stephenson
b6e4e088f5 Add CommandSender to BendingReloatEvent, cleanup other events 2016-02-21 20:43:36 -05:00
OmniCypher
397d8c863a Merge pull request #419 from kingbirdy/bendingevents
Remove unneeded damageEntity method, update events
2016-02-21 13:16:30 -08:00
OmniCypher
3e3503be41 Merge pull request #418 from jedk1/master
Fix ChiCombo NPE and FallDamage
2016-02-21 13:16:24 -08:00
Philip Stephenson
c0fe8256b7 Remove unneeded damageEntity method, update events
- change EntityBendingDeath and HorizontalVelocityChange to use Ability objects, instead of strings

- update abilities to reflect changes
2016-02-21 16:01:28 -05:00
jedk1
3d2676a999 Fix ChiCombo NPE and FallDamage 2016-02-20 17:36:22 +00:00
Benford
3c65d98139 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-02-20 10:35:49 -05:00
OmniCypher
4f4335e498 Merge pull request #417 from kingbirdy/bendingevents
Add AbilityDamageEntityEvent, AbilityStartEvent, AbilityEndEvent
2016-02-19 20:10:52 -08:00
Philip Stephenson
3ddc100ffc Add AbilityDamageEntityEvent AbilityStartEvent and AbilityEndEvent
- change GeneralMethods.damageEntity to use event
- removed BendingDamageEvent
- update CoreAbility to create and process the events
2016-02-19 23:03:50 -05:00
OmniCypher
ea68b6a99c Merge pull request #415 from grasshopperMatt/master
Fixed whocommand
2016-02-19 18:41:21 -08:00
OmniCypher
fe47af9630 Merge pull request #416 from kingbirdy/master
Fix disabled abilities outputting multiple times
2016-02-19 18:39:55 -08:00
Philip Stephenson
20ae458d57 Fix disabled abilities outputting multiple times 2016-02-19 19:56:50 -05:00
Matt
ae35e1423d Fixed whocommand 2016-02-19 19:20:41 -05:00
Matt
8f552d225e Added new method 2016-02-19 18:57:55 -05:00
Matt
bddcd989a3 Changed private handlers - public 2016-02-19 18:54:48 -05:00
Matt
0cc79f226f Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-02-19 18:30:23 -05:00
Matt
eca0eca1f8 Fixed & added new args 2016-02-19 18:28:17 -05:00
Benford
b9ddf9360e Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-02-19 18:25:34 -05:00
Matt
97348c9424 Added ability to BendingDamageEvent 2016-02-19 18:24:03 -05:00
Matt
23e03f310f Added code to BendingDamageEvent 2016-02-19 18:12:20 -05:00
OmniCypher
b6f36c1e63 Merge pull request #413 from Simplicitee/master
Fix FireCombo
2016-02-19 15:03:25 -08:00
OmniCypher
10abfdf260 Merge pull request #412 from grasshopperMatt/master
Fixed healingwaters shift functionality, Added BendingDamageEvent
2016-02-19 15:02:00 -08:00
Benford
7ec229ff41 Fix FireCombo
- Makes FireCombos cook animal meat when killing (excludes JetBlast)
2016-02-19 17:53:59 -05:00
Matt
91de6ce20d Added BendingDamageEvent 2016-02-19 17:53:18 -05:00
Matt
4701e5f9cf Fixed healingwaters shift functionality 2016-02-19 17:41:39 -05:00
OmniCypher
de454ac88d Merge pull request #411 from Simplicitee/master
Various changes
2016-02-18 21:38:16 -08:00
Benford
bb88553db0 Various changes
- Changed where the cooldown is called in AirSwipe
- Added instances for FireDamageTimer in appropriate firecombos
- Fixed math mistake in WaterSpout
2016-02-18 18:03:32 -05:00
OmniCypher
1ac4fa16bb Merge pull request #410 from Simplicitee/master
Horizontal Collisions and Barriers
2016-02-17 21:06:15 -08:00
Benford
af0cd7f3f7 Horizontal Collisions and Barriers
- Added a config option for if the block a player hits with horizontal
collisions is barrier.
2016-02-17 22:58:10 -05:00
OmniCypher
e572646f67 Merge pull request #409 from Simplicitee/master
Fix WaterSpout
2016-02-17 16:53:47 -08:00
Benford
e8e3a6f4ee Fix WaterSpout
- Fix removeSpouts method (needs to be tested because I couldn't test it
alone
- Fix remove setting flying and allow flight
2016-02-17 19:43:59 -05:00
OmniCypher
52271cf162 Merge pull request #408 from Simplicitee/master
Various fixes
2016-02-17 16:26:08 -08:00
Benford
79ecbf49c1 Various fixes
- Fixed several warnings
- Renamed BindingUpdateEvent to BindChangeEvent
- Fixed Icespike cooldown, pillar field, and pillar version
- Fixed WaterAbility.getNightFactor(double, World)
- Fixed AirShield knockback being more powerful than it should be
2016-02-17 19:14:30 -05:00
Benford
123f117f3d Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-02-17 16:30:50 -05:00
OmniCypher
c819b359a2 Merge pull request #407 from jedk1/master
Fix Combos & Bloodbending
2016-02-17 13:17:06 -08:00
jedk1
1e24828e73 Fix Bloodbending 2016-02-17 20:20:10 +00:00
jedk1
cb4003993f Fix Bloodbending 2016-02-17 20:19:18 +00:00
jedk1
c67f28fbb4 Fix Combos 2016-02-17 14:26:34 +00:00
OmniCypher
a0c13895e3 Merge pull request #406 from savior67/master
- /b who command now shows Chiblocker instead of Chibender
2016-02-15 19:35:08 -08:00
savior67
dbef318caf - /b who command now shows Chiblocker instead of Chibender 2016-02-15 22:30:08 -05:00