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

1870 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
OmniCypher
f5c709799d Merge pull request #405 from savior67/master 
- AirBurst no longer triggers doors/buttons/levers
 2016-02-15 19:22:35 -08:00
savior67
a04409123c - Airburst no longer triggers doors/buttons/levers 2016-02-15 22:17:43 -05:00
OmniCypher
b701c86387 Merge pull request #404 from savior67/master 
- EntityBendingDeathEvent now triggers from fire-related deaths
 2016-02-15 19:14:09 -08:00
savior67
81bcfa9867 - EntityBendingDeathEvent now triggers when an entity is killed by fire originating from a bending ability 2016-02-15 21:40:05 -05:00
OmniCypher
a7b8dad7aa Merge pull request #403 from OmniCypher-/master 
Fixes Dynamic digging depth & EarthSmash grab distance
 2016-02-15 16:47:23 -08:00
OmniCypher
db257aa5f7 Fixes Dynamic dig depth & EarthSmash grab distance 2016-02-15 16:45:16 -08:00
OmniCypher
5cd8834085 Merge pull request #402 from OmniCypher-/master 
Various fixes
 2016-02-14 13:53:48 -08:00
OmniCypher
8527705ff3 Various fixes 
Fixes cooldowns affecting fall induced shockwaves and airbursts
Fixes airscooter randomly ending
Fixes avatarstate causing jitter on airscooter
Fixes airscooter removing fly
Fixes preset message for perm remove
 2016-02-14 13:50:02 -08:00
OmniCypher
27a658affe Merge pull request #401 from RoboMWM/patch-1 
Compatibility with other plugins' explosions; resolves #400
 2016-02-14 12:30:04 -08:00
OmniCypher
a676240bbe Merge pull request #394 from savior67/master 
Adds BindingUpdateEvent and Changes PlayerBendingDeathEvent to EntityBendingDeathEvent
 2016-02-13 14:23:56 -08:00
savior67
4ac4a2f646 - Changed PlayerBendingDeathEvent to EntityBendingDeathEvent 2016-02-13 12:42:35 -05:00
savior67
2953a7b921 Merge remote-tracking branch 'upstream/master' 2016-02-13 11:58:36 -05:00
RoboMWM
94787e5f39 Compatibility w/ other plugins' explosions #400 
Is there a reason why this was placed here? If such a thing is needed, it'd be nice if it were under a config option then.
 2016-02-11 22:57:17 -08:00
Benford
cf305aa53d Fix waterspout fly glitch 
- Fixed a fly glitch when a player goes over land with waterspout
 2016-02-11 21:55:48 -05:00
Benford
61004060d6 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-02-11 21:48:55 -05:00
Benford
ca5886b575 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-02-11 21:45:30 -05:00
Benford
5628441235 Revert "Fix flight glitch" 
This reverts commit 952c1cce48.
 2016-02-11 21:45:10 -05:00
OmniCypher
82bc520695 Merge pull request #398 from Simplicitee/patch-2 
Update icebullet
 2016-02-11 18:35:21 -08:00
OmniCypher
be947344f3 Merge pull request #397 from StrangeOne101/master 
Made Element Protected
 2016-02-11 18:35:15 -08:00
Simplicitee
6c46e3d87e Update icebullet 
- Update icebullet right to use RIGHT_CLICK_BLOCK
 2016-02-11 11:28:57 -05:00
StrangeOne101
c05c1987cb Made Element Protected 
• Allows elements to be created by side-plugins
 2016-02-11 22:00:32 +13:00
Benford
952c1cce48 Fix flight glitch 
- Fixed a fly glitch occuring when a player went over land with
waterspout.
 2016-02-10 19:18:23 -05:00
OmniCypher
0f0fda100d Merge pull request #395 from Simplicitee/master 
Fix WaterManipulation
 2016-02-10 13:07:15 -08:00
Benford
a20b4a1001 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-02-09 21:50:32 -05:00
Benford
34063d6dc6 Fix WaterManipulation 
- Fixed WaterManipulation range being buggy
 2016-02-09 21:49:55 -05:00
BuildTools
212c079058 - Added BindingUpdateEvent 2016-02-09 20:27:25 -05:00
OmniCypher
9e2df0a138 Merge pull request #393 from jedk1/master 
Update ComboManager to new ClickTypes & NPE
 2016-02-09 16:02:21 -08:00
jedk1
6f05457229 Fix Event NPE in Remove command 2016-02-09 19:38:06 +00:00
jedk1
31177b4d98 Fix WaterBubble not working 2016-02-09 19:27:24 +00:00
jedk1
497e464cc8 Update to commit 373 
Remove unused variables

Update to commit 373
 2016-02-09 17:17:51 +00:00