Commit graph

1937 commits

Author SHA1 Message Date
savior67
329b01f3aa - Added cooldown to AirScooter (same cd as firejet by default) 2016-03-02 20:50:25 -05:00
OmniCypher
d90fcbb982 Merge pull request #437 from jedk1/master
Fix WaterSourcing
2016-03-02 17:47:25 -08:00
OmniCypher
66ac82240d Merge pull request #436 from Simplicitee/master
Add new staff, Fixed ConfigType
2016-03-02 17:47:11 -08:00
Benford
94cc849767 Fix ConfigType
- Fixed errors with ConfigType
2016-03-02 13:29:24 -05:00
Benford
c50c227f05 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-03-02 13:28:44 -05:00
jedk1
7ac86b30f3 Fix WaterSourcing 2016-03-02 16:29:27 +00:00
Benford
05607a9836 Add new staff
- Added new staff members to whocommand
2016-03-01 15:59:17 -05:00
OmniCypher
66c7be3ddc Merge pull request #434 from jedk1/master
Various Fixes
2016-02-29 17:14:00 -08:00
OmniCypher
0983f48ca0 Merge pull request #435 from Simplicitee/master
Edit config for Rpg
2016-02-29 17:13:32 -08:00
Benford
e332875e1b Change to fit Rpg configs
- Changed configtype to not be an enum
- Removed an unused import
- Edited configmanager to match ConfigType
2016-02-29 15:36:19 -05:00
Benford
47ba35b760 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-02-29 15:28:06 -05:00
jedk1
6e0c9f50ca Fix bug with abilities duping 2016-02-29 16:11:45 +00:00
OmniCypher
99a74c6573 Merge pull request #433 from jedk1/master
Add documentation and update Who command
2016-02-28 18:29:20 -08:00
jedk1
975cfa87c2 Add documentation and update Who command 2016-02-28 14:35:19 +00:00
OmniCypher
7cd16b26f9 Merge pull request #432 from jedk1/master
Fix Choose Command
2016-02-27 17:17:22 -08:00
jedk1
3509a03a59 Fix Choose Command 2016-02-28 00:27:47 +00:00
OmniCypher
15fe8ad2ae Merge pull request #430 from Simplicitee/master
Fix boolean in FireBlast
2016-02-27 10:34:58 -08:00
OmniCypher
f41de48cc9 Merge pull request #431 from jedk1/master
Add getAbility() method to AbilityEndEvent
2016-02-27 10:34:21 -08:00
jedk1
5704171066 Merge branch 'master' of https://github.com/ProjectKorra/ProjectKorra 2016-02-27 18:22:15 +00:00
jedk1
1c0acc0f29 Fix no method for getAbility() 2016-02-27 18:21:53 +00:00
Benford
6b345c7c2e Fix boolean in FireBlast
- The isFireBurst boolean was never set to false for normal fireblast
2016-02-27 12:47:19 -05:00
Benford
5513477ec9 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-02-27 11:50:27 -05:00
OmniCypher
a1840b52e9 Merge pull request #429 from OmniCypher-/master
Various Fixes & Additions
2016-02-27 00:00:53 -08:00
OmniCypher
dcdd8efd3e Various Fixes & Additions
Adds Plant & Ice source list to config
Removes PackedIce option (can now be set or removed through Ice list)
Fixes being able to select through walls
2016-02-26 23:57:55 -08:00
OmniCypher
ac1057cc5b Merge pull request #428 from Simplicitee/master
Fix FireBlast damage
2016-02-26 17:51:36 -08:00
Benford
054827986c Fix FireBlast damage
- Added the variable for FireBlast damage to be set
- Added getDayFactor to damage and a range variable in FireBlast
2016-02-26 20:28:51 -05:00
OmniCypher
c10b92a7c3 Merge pull request #427 from OmniCypher-/master
Adds Residence
2016-02-26 17:21:19 -08:00
OmniCypher
9831cf3aa3 Adds Residence 2016-02-26 17:18:48 -08:00
OmniCypher
eafe395ef9 Merge pull request #426 from Simplicitee/master
Add Residence plugin support
2016-02-26 17:12:58 -08:00
Benford
91b823084b Add Residence to softdepend
- Added Residence to softdepend in plugin.yml
2016-02-26 19:54:05 -05:00
Benford
cdfdcb570d Add Residence plugin support
- Added two new config options, Residence.Respect and Residence.Flag (in
the according spot)
- Residence.Respect will respect if true
- Residence.Flag specifies the flag that needs to be set to true for
bending to be enabled in a residence.
- Is put in isRegionProtected methods
2016-02-26 19:39:44 -05:00
Benford
b4a7a62362 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-02-26 18:57:18 -05:00
OmniCypher
bb4485e4f7 Merge pull request #425 from Simplicitee/master
Fix fall damage animation
2016-02-26 15:56:27 -08:00
Benford
d93d34b286 Fix fall damage animation
- Fixed fall damage animation activating for chiblockers
2016-02-26 18:52:02 -05:00
OmniCypher
280de9fca4 Merge pull request #424 from Simplicitee/master
Fix shockwave and other
2016-02-25 15:24:47 -08:00
OmniCypher
3cddb44b57 Merge pull request #423 from jedk1/master
Various Changes & Fixes
2016-02-25 15:24:21 -08:00
Benford
5d244d0eac Fix shockwave
- Fixed shockwave fall version
- Removed various unnecessary methods called when fall damage was taken.
2016-02-25 17:22:37 -05:00
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