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
2103 commits 14 branches 0 tags 210 MiB
Commit graph

2103 commits

This branch
This branch
All branches
Author SHA1 Message Date
OmniCypher
442eb0e7ea Merge pull request #496 from RoboMWM/patch-4 
Don't blindly check cancel status for all damage
 2016-06-09 15:47:57 -07:00
OmniCypher
1fee3bcdf8 Merge pull request #499 from StrangeOne101/master 
Small FireBlast Fix
 2016-06-09 15:47:02 -07:00
StrangeOne101
9086ea2c01 Small FireBlast Fix 2016-06-09 12:06:47 +12:00
OmniCypher
b80082c6ff Merge pull request #498 from jedk1/master 
Update to BETA 11
 2016-06-08 14:56:46 -07:00
jedk1
cf465a3452 Update to BETA 11 2016-06-08 21:59:41 +01:00
OmniCypher
f6bc8bc87d Merge pull request #497 from StrangeOne101/master 
Bug fixes
 2016-06-06 22:04:08 -07:00
StrangeOne101
0efcea7e4d Actually fixed WaterArms Spear Bug 
Forgot the file. I'm sorry. >_<
 2016-06-07 16:19:34 +12:00
StrangeOne101
7e075fe2b7 Bug fixes 
• Fixed WaterArms Spear not removing, even forcefully
• Fixes FireBlast still loading when disabled
• Fixes FireBlast still being able to be charged when on a different
slot
• Fixed NPE
 2016-06-07 16:15:55 +12:00
RoboMWM
d242ecd1fc Don't blindly check cancel status for all damage 
If fall damage is disabled via another plugin like WorldGuard, abilities like Shockwave can't function upon landing. Plus, there's already a lot of checks for event.isCancelled, so don't see a reason to do a check for the entire event.
 2016-05-19 16:08:30 -07:00
OmniCypher
e9ee121574 Merge pull request #492 from Loonyy/master 
New ClickType / Fixes Immobilize bug
 2016-05-07 21:03:18 -07:00
OmniCypher
bfe445bd92 Merge pull request #491 from jedk1/master 
Fix NPEs
 2016-05-07 21:02:15 -07:00
Loony
cc23128b5b New ClickType / Fixes Immobilize bug 
Added new ClickType (LEFT_CLICK_ENTITY)
Updated Immobilize to use LEFT_CLICK_ENTITY to fix being able to do the
steps of Immobilize without hitting an entity
 2016-05-05 00:29:42 +01:00
jedk1
996e470089 Fix NPEs 2016-05-03 23:03:50 +01:00
OmniCypher
cf9b781de1 Merge pull request #490 from Loonyy/master 
Immobilize permission fix
 2016-05-02 19:17:13 -07:00
Loony
249f2f451e Fixes Immobilize perm and adds ChiCombo permission 2016-05-01 23:48:52 +01:00
Loony
d068d076d3 Revert "Re-fixes Immobilize permission" 
This reverts commit 6bc6e06adc.
 2016-05-01 23:47:35 +01:00
Loony
a368742de3 Merge branch 'master' of https://github.com/ProjectKorra/ProjectKorra 2016-05-01 23:40:19 +01:00
Loony
6bc6e06adc Re-fixes Immobilize permission 
Fixes the Immobilize permission being default
 2016-05-01 23:39:29 +01:00
OmniCypher
dea5e7c21a Merge pull request #489 from StrangeOne101/master 
Fixes, Fixes and More Fixes!
 2016-05-01 15:25:11 -07:00
StrangeOne101
d8dc5e2df6 Merge branch 'master' of http://github.com/ProjectKorra/ProjectKorra 2016-05-02 10:16:19 +12:00
StrangeOne101
d187d3fa11 Fixes, Fixes and More Fixes! 
• Fixed the /bending display <combo> not working when specifying combo
aliases
• Fixed IceBullet using the wrong name in the language file
• Fixed Bloodbending using a constant range of 6
• Fixed Chi taking no damage but still getting the animation when
jumping off blocks
• Updated staff list in the /bending who command
 2016-05-02 10:15:03 +12:00
OmniCypher
b20145c83a Merge pull request #488 from Loonyy/master 
Config changes, bug fixes
 2016-05-01 14:58:13 -07:00
Loony
0a7981de1e Fixes Immobilize cooldown activating if target = null 2016-05-01 11:51:36 +01:00
Loony
45154e7774 Fixes SwiftKick getting ChiBlockChance from config 2016-05-01 10:06:01 +01:00
Loony
713860f7e8 Fixes SwiftKick cooldown not respecting config 2016-05-01 10:02:29 +01:00
Loony
014fbbc638 Fixes Immobilize permission 
Fixes Immobilize ChiCombo not being default permission
 2016-05-01 08:44:38 +01:00
BuildTools
e4f8b0e1bc Fixes Immobilize cooldown 2016-05-01 08:17:14 +01:00
BuildTools
8b3b3c9739 Fixes SwiftKick 
Fixes SwiftKick being able to be used when player hasn't / isn't jumping
 2016-05-01 08:13:53 +01:00
BuildTools
8ee81c9c0e Fix catapult cooldown and adds cobblestone to default earthblocks list 2016-05-01 07:03:35 +01:00
BuildTools
b8a2b34289 Config changes 
Minor config changes.
Buff's water's select range, lowered fire ticks, things like that.
 2016-05-01 06:48:13 +01:00
OmniCypher
49493a1797 Merge pull request #487 from grasshopperMatt/master 
Various fixes
 2016-04-30 16:08:34 -07:00
Matt
dc615d5d49 Fixed disabled abilities still being bound to bar 2016-04-30 10:18:59 -05:00
Matt
125e5da0f9 Solid earth temp blocks no longer do damage 2016-04-30 08:24:23 -05:00
Matt
5797d7dc25 Fixed & cleaned RemoveCommand 2016-04-28 20:41:35 -05:00
OmniCypher
fe675fbfd9 Merge pull request #486 from StrangeOne101/master 
Various Additions + Fixes
 2016-04-26 18:05:52 -07:00
StrangeOne101
6301625a42 Various Additions + Fixes 
• Added requireAvatar() method to AvatarAbility
• Allows moves to be created that don't require the user to be the
avatar in order to use them (adding back old functionality)
• Added AbilityProgressEvent
• Tweaked Grammar
• Fixed speed/jump passives
• Fixed incorrect tabbing with the remove command
 2016-04-26 17:43:23 +12:00
OmniCypher
9d3d3ab692 Merge pull request #484 from Simplicitee/master 
Fix sand speed passive
 2016-04-18 17:16:42 -07:00
OmniCypher
a59c651386 Merge pull request #483 from jedk1/master 
Fix NPE in blocksource & Avy Cooldown
 2016-04-18 17:16:34 -07:00
Benford
5a0ffc988d Fix sand speed passive 
- Fixed the FOV change that happens when jumping as a sandbender on sand
 2016-04-18 19:03:20 -04:00
Benford
1581fb7763 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-04-18 19:02:38 -04:00
jedk1
f941393dfd Fix avatarstate cooldown 2016-04-17 20:50:37 +01:00
jedk1
d930c78d16 Fix NPE in blocksource 2016-04-17 14:37:15 +01:00
OmniCypher
eaf183f8c4 Merge pull request #482 from Simplicitee/master 
Various changes
 2016-04-14 18:19:31 -07:00
Benford
5001585ba6 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-04-14 19:10:57 -04:00
Benford
c479129ad1 Various bug fixes 
- Added config option for torrent multi hits damage
- Added config option for the amount of times torrent can hit
- Removed chiblocking's sprint fall damage removal
- Fixed AirScooter stopping when switching binds
 2016-04-14 19:08:37 -04:00
OmniCypher
d07ee18b94 Merge pull request #480 from grasshopperMatt/master 
Fixed EarthBlast / WaterManipulation being able to make moves off of eachothers blocks
 2016-04-13 18:59:53 -07:00
OmniCypher
fa7f1db5bf Merge pull request #481 from Simplicitee/master 
Various bug fixes + new event
 2016-04-13 18:58:53 -07:00
Benford
6f58fe5c4b Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-04-13 21:00:24 -04:00
Benford
a1c9c54d48 Various bug fixes + new event 
- Added PlayerJumpEvent
- Added JUMPS map to PKListener
- Fixed fly glitch with airspout/sandspout + firejet
- Added snowBlocks config list
- Fixed AirCombo cooldowns
- Fixed FireSpin enabled config option not appearing
- Fixed speed and jump passives, no longer requires sprinting
- Fixed HealingWaters ShiftRequired config option
- Fixed Surge select range
- Fixed WaterManipulation creating water in place of ice sources
- Added snow methods to ElementalAbility and BlockSource
- Added SNOW enum value to BlockSourceType
- Added check for snow in WaterAbility.isWaterbendable()
 2016-04-13 21:00:21 -04:00
Matt
bc196a95e0 Fixed EarthBlast / WaterManipulation being able to make moves off of eachothers blocks 2016-04-12 21:01:10 -05:00