TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-12-23 00:15:05 +00:00
Code Issues Projects Releases Wiki Activity
1936 commits 14 branches 0 tags 210 MiB
Commit graph

1936 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
OmniCypher
bdab5609b3 Merge pull request #441 from StrangeOne101/master 
Add RPG Command Tabbing
 2016-03-06 15:53:03 -08:00
Benford
d98d8c837c Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-03-06 12:40:53 -05:00
StrangeOne101
acec583b1a Add RPG Command Tabbing 
• Added tabbing support for the avatar and worldevent commands from RPG
 2016-03-06 18:58:45 +13:00
FinnBueno
9857afdb30 Fix merge conflicts 2016-03-05 20:42:41 +01:00
FinnBueno
4380102f39 Adding language.yml -- Removed deathmessages.yml 
Added a language.yml in which almost every message in the plugin can be
found. I moved the move descriptions, and death messages to that file,
so the deathmessages.yml has been removed, because it has nothing in it
anymore.
 2016-03-05 12:12:31 +01:00
jedk1
daf4267727 Fix players grabbing water through walls 2016-03-05 01:25:45 +01:00
savior67
b6e7f57fec - Added DamageHandler class 2016-03-05 01:25:45 +01:00
savior67
ed0109d2f4 - damageEntity function moved out of GeneralMethods into DamageHandler 
- All damaging abilities now invoke DamageHandler.damageEntity
 2016-03-05 01:25:45 +01:00
savior67
51af720bfa - Added cooldown to AirScooter (same cd as firejet by default) 2016-03-05 01:25:44 +01:00
Benford
c4a0187e4a Fix ConfigType 
- Fixed errors with ConfigType
 2016-03-05 01:25:43 +01:00
jedk1
3410c470df Fix WaterSourcing 2016-03-05 01:19:35 +01:00
Benford
02b2f2a915 Add new staff 
- Added new staff members to whocommand
 2016-03-05 01:19:35 +01:00
FinnBueno
bcf91e6859 Added a language.yml 2016-03-05 01:17:17 +01:00
OmniCypher
625b2ae0f7 Merge pull request #439 from jedk1/master 
Fix players grabbing water through walls
 2016-03-03 18:33:35 -08:00
jedk1
d7150ff2c4 Fix players grabbing water through walls 2016-03-03 12:38:28 +00:00
OmniCypher
3f78596809 Merge pull request #438 from savior67/master 
Added cooldown to airscooter | Added DamageHandler
 2016-03-02 18:35:48 -08:00
savior67
fd8fa2b1ec - Added DamageHandler class 2016-03-02 21:01:36 -05:00
savior67
d8d3c416c1 - damageEntity function moved out of GeneralMethods into DamageHandler 
- All damaging abilities now invoke DamageHandler.damageEntity
 2016-03-02 20:54:15 -05:00
savior67
329b01f3aa - Added cooldown to AirScooter (same cd as firejet by default) 2016-03-02 20:50:25 -05:00