Commit graph

1905 commits

Author SHA1 Message Date
Benford
b251971e2f Remove testing messages 2016-03-28 23:06:55 -04:00
Benford
041a003ff1 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-03-28 23:04:31 -04:00
Benford
7510445733 Commit shockwave addition 2016-03-28 22:53:02 -04:00
Benford
af24a227a3 Fix armor issues
- Also added return statement in shockwave
2016-03-28 22:52:03 -04:00
OmniCypher
1c1cfdf9a8 Merge pull request #459 from jedk1/master
Add per combo config enable/disable option
2016-03-28 17:33:00 -07:00
jedk1
379270caec Add per combo config enable/disable option 2016-03-29 01:00:10 +01:00
OmniCypher
dded537a52 Merge pull request #458 from OmniCypher-/master
Various Fixes
2016-03-28 15:35:39 -07:00
OmniCypher
ad4c7aeffa Various Fixes
Fixes FastSwimming on AirSpout slot
Fixes command consistency
Fixes bind command "ability does not exist" message
Fixes add command description
Fixes WaterArms move display
Fixes WaterArms Spear Ice Dome
2016-03-28 15:26:47 -07:00
Benford
a09d1aab73 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-03-28 15:12:12 -04:00
OmniCypher
6dcb920c90 Merge pull request #457 from OmniCypher-/master
Fixes part of PlantArmor and EarthRevert
2016-03-26 18:16:40 -07:00
OmniCypher
e155f1712f Fixes part of PlantArmor and EarthRevert 2016-03-26 18:00:25 -07:00
OmniCypher
5f2d5c06f7 Merge pull request #456 from OmniCypher-/master
Various Changes/Fixes
2016-03-26 12:19:06 -07:00
OmniCypher
afa83c1086 Adds Items Depend 2016-03-26 12:17:16 -07:00
OmniCypher
25bd8d7c8c Various Changes/Fixes
Updates WorldGuard depend version
Fixes NPE in EarthAbility reverting
Fixes NPE in PKListener when getting element prefixes
Fixes inconsistencies between commands
Adds getPrefix() Method to Element
Adds Items commands to /b help
2016-03-26 12:07:36 -07:00
OmniCypher
e004ede011 Merge pull request #455 from grasshopperMatt/master
Fixed blocks not being returned to their previous state
2016-03-25 18:20:32 -07:00
Matt
ca383ff03f Fixed blocks not being returned to their previous state 2016-03-25 15:00:41 -05:00
OmniCypher
8e2b0b0fe1 Merge pull request #454 from Simplicitee/master
Updates
2016-03-23 18:40:11 -07:00
Benford
66413765de Updated RPG lib 2016-03-23 20:38:28 -04:00
Benford
1cd9f87f1d Updates
- Updated tabbing for rpg commands
- Updated the help command to show rpg commands
2016-03-23 20:30:00 -04:00
Benford
dd461e54d1 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-03-23 20:27:47 -04:00
OmniCypher
33c291236c Merge pull request #452 from grasshopperMatt/master
Fixed passives
2016-03-19 19:44:57 -07:00
Matt
98fcb4f78f Fixed passives 2016-03-19 21:28:04 -05:00
OmniCypher
116a6ab0fc Merge pull request #451 from jedk1/master
Fix shockwave cleanup
2016-03-19 13:14:16 -07:00
jedk1
cfdc6ce0ee Fix shockwave cleanup 2016-03-19 18:31:57 +00:00
OmniCypher
d32b701f82 Merge pull request #450 from Simplicitee/master
Fix passives in disabled world
2016-03-16 19:26:36 -07:00
Benford
f82dce0464 Fix passives in disabled world 2016-03-16 22:12:09 -04:00
OmniCypher
d7c1002974 Merge pull request #449 from Simplicitee/master
Fix table creation
2016-03-16 18:41:45 -07:00
OmniCypher
efa0d4a9bd Merge pull request #448 from StrangeOne101/master
Add Forgotten Changes
2016-03-16 18:41:38 -07:00
Benford
e2bd9a874a Fix table creation
- Added missing comma
2016-03-16 16:05:36 -04:00
StrangeOne101
0e99fbef4d Add Forgotten Changes
• Just added some small things that were forgotten in the last commit
2016-03-16 16:15:02 +13:00
Benford
0d7db5ebe3 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-03-15 18:55:02 -04:00
OmniCypher
eedc65cc21 Merge pull request #447 from StrangeOne101/master
Update Subelement Lingo
2016-03-14 18:30:01 -07:00
Benford
1c82807f43 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-03-14 16:12:22 -04:00
StrangeOne101
3c216cebad Update Subelement Lingo
• Updated all commands to treat subelements as elements in certain
circumstances (add, remove, etc)
• Updated tabbing with bug fixes
• Database will now update player's subs when they log in for the first
time (post update)
• Removed "SubElementAdded" field from config
• Fixed /b choose not taking aliases
2016-03-14 22:07:33 +13:00
OmniCypher
73834e3762 Merge pull request #446 from Simplicitee/master
Various changes
2016-03-13 13:57:12 -07:00
OmniCypher
139ff7a132 Merge pull request #445 from RoboMWM/patch-2
Include plugin.yml when building plugin
2016-03-13 13:56:45 -07:00
Benford
f273e2f734 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-03-13 15:33:04 -04:00
Benford
105dc8b005 Various changes
- Changed BindChangeEvent call spot
- Changed subelements to be stored in database
- Changed choose command to accept subelements as an argument
- Changed add command to accept subelements as an argument
- Changed all canBend<SubElement> methods
- Added PlayerChangeSubElementEvent
- Added saveSubElements() method to GeneralMethods
- Cleaned up imports in various classes
- Removed print out in damagehandler
2016-03-13 15:16:01 -04:00
RoboMWM
effc843095 Include plugin.yml when building plugin 2016-03-12 02:44:14 -08:00
OmniCypher
7832927cc3 Merge pull request #444 from FinnBueno/master
Fixed flight disabling creative flight
2016-03-10 18:46:31 -08:00
OmniCypher
c080b494c9 Merge pull request #443 from jedk1/master
Various Fixes & Additions
2016-03-10 18:46:24 -08:00
FinnBueno
63f6b420dc Fixed flight disabling creative flight
Fixed flight disabling flying when the player is in creative or
spectator mode.
2016-03-10 20:08:14 +01:00
jedk1
918c09b096 Update Spirit jar and Who Command 2016-03-10 18:53:45 +00:00
jedk1
995b20f7e0 Update canBind() for spirits. 2016-03-10 18:32:11 +00:00
jedk1
a922b8bd17 Add support ready for when spirits is added. 2016-03-10 18:26:16 +00:00
jedk1
fe4eb8ca25 Update MySQL to support custom elements 2016-03-10 15:15:49 +00:00
Benford
928eeeae1b Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-03-09 20:07:01 -05:00
OmniCypher
5b52eedc27 Merge pull request #442 from FinnBueno/master
Fixed death messages and colour support for custom elements.
2016-03-07 16:01:40 -08:00
FinnBueno
ab4f017c4f Fixed death messages and colour support for custom elements.
Fixed the death messages not being broadcasted and added proper colour
support for addon elements. Also re-order the language.yml to give it
some more structure.
2016-03-08 00:52:10 +01:00
OmniCypher
ce400a4c1b Merge pull request #440 from FinnBueno/master
Language.yml -- Finally...
2016-03-07 11:39:02 -08:00