TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-12 03:59:06 +00:00
Code Issues Projects Releases Wiki Activity
1485 commits 14 branches 0 tags 210 MiB
Commit graph

1485 commits

This branch
This branch
All branches
Author SHA1 Message Date
OmniCypher
70967bd12f Merge pull request #337 from OmniCypher-/master 
Beta 7
 2015-12-26 11:53:28 -08:00
OmniCypher
3c9c0998ce Beta 7 2015-12-26 11:50:47 -08:00
OmniCypher
b61f12c411 Merge pull request #336 from OmniCypher-/master 
Various additions/fixes (read desc.)
 2015-12-25 21:20:22 -08:00
OmniCypher
50934f980c Various additions/fixes (read desc.) 
Fixes WaterArms Freeze going through ice
Fixes cooldown typos
Adds get/set cooldown in PlayerCooldownChangeEvent
Adds Shift Modifier config option for Catapult
Adds element toggle indicator to /b who <player>
Adds stock combos to autotab
 2015-12-25 21:17:49 -08:00
OmniCypher
491767baf6 Merge pull request #334 from jedk1/master 
Fix ConcurrentModificationException in ChiCombo & Typo fix
 2015-12-24 12:28:56 -08:00
jedk1
011bbbacd8 Fix merge conflict 2015-12-24 11:10:10 +00:00
OmniCypher
01f2a24e50 Merge pull request #335 from Simplicitee/master 
Fix chat error
 2015-12-22 22:10:19 -08:00
OmniCypher
ef7607dc7f Merge pull request #332 from grasshopperMatt/master 
AutoSourcing & Config changes for moves
 2015-12-22 22:06:31 -08:00
Benford
fc81f6e3a4 Fix chat error 
- Fixed players without elements chat appearing as "null<playername>".
Now says [Nonbender] in white.
- Removed unecessary permission check on login.
 2015-12-22 19:54:02 -05:00
jedk1
fa92bbe67e Fix NPE in WaterWave 2015-12-21 23:52:26 +00:00
jedk1
a91c165ce0 Fix NPE in AirScooter 2015-12-21 20:52:13 +00:00
jedk1
79d8a36d17 Fix typo in AirBurst & FireBurst config 2015-12-21 17:39:29 +00:00
jedk1
da767bf13c Fix ConcurrentModificationException in ChiCombo 2015-12-21 14:35:58 +00:00
Benford
b790ddf98d Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2015-12-20 22:53:48 -05:00
Matt
c51cbe18e0 Delete src.zip 2015-12-20 11:51:42 -05:00
OmniCypher
98ebf844a3 Merge pull request #333 from jedk1/master 
Fix NPE in Fireball and ChiCombo
 2015-12-17 15:52:03 -08:00
jedk1
b490a5d524 Fix NPE in Fireball and ChiCombo 2015-12-17 23:23:01 +00:00
Matt
a397746c65 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2015-12-15 19:01:04 -05:00
Matt
f96322dfe7 Fixed small bugs in Cooldown and Dynamic Sourcing 2015-12-15 18:41:48 -05:00
OmniCypher
cc6405989f Merge pull request #327 from Chaotic-Dev/master 
"togged" typo fix
 2015-12-13 17:45:39 -08:00
ChaoticDev
d362fc6aec Fixed typo in the source code 2015-12-13 19:15:59 +02:00
ChaoticDev
cf50695103 Fixed typo in the source code 2015-12-13 19:14:55 +02:00
Matt
90afa1f9e5 Removed some methods in EarthMethods / WaterMethods 2015-12-12 21:21:11 -05:00
Matt
d84b0977ff Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2015-12-12 21:12:20 -05:00
Matt
d5b6ac24cb Finished AutoSourcing, added config options for DynamicSourcing 
Added cooldowns to AirBurst, Flight, OctopusForm, PhaseChange,
WaterManipulation, EarthBlast, RaiseEarth, EarthGrab, Shockwave, Blaze
and FireBurst
 2015-12-12 21:12:09 -05:00
Matt
91bfc0a0c3 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2015-12-12 13:00:49 -05:00
Matt
ba2818ac2e Finished AutoSourcing implementation to all moves 2015-12-12 12:57:38 -05:00
OmniCypher
a7e97e86f1 Merge pull request #325 from StrangeOne101/master 
Fix Fireball NPE
 2015-12-09 21:02:39 -08:00
OmniCypher
5c70373eb5 Merge pull request #324 from jedk1/master 
Fix bending player NPE in FireBurst
 2015-12-09 21:01:56 -08:00
jedk1
b7bb87c10c Fix bending player NPE in FireBurst 2015-12-08 23:40:03 +00:00
StrangeOne101
85cb6e3720 Fix Fireball NPE 
• Fixes NPE in Fireball
• Fixes measuring distance across worlds
 2015-12-08 23:28:17 +13:00
OmniCypher
16f6885497 Merge pull request #323 from jedk1/master 
Fix getEntitiesAroundPoint getting spectator players.
 2015-12-06 15:05:13 -08:00
jedk1
04a006cac9 Fix getEntitiesAroundPoint getting spectator players. 2015-12-06 19:25:10 +00:00
OmniCypher
c745396739 Merge pull request #322 from jacklin213/master 
Add 30 second timeout to Updater
 2015-12-05 18:23:15 -08:00
Jack Lin
669ef4f73b Add 30 second timeout to Updater 2015-12-06 15:18:50 +13:00
OmniCypher
44c7327b63 Merge pull request #319 from Simplicitee/master 
Changes to bending who
 2015-12-01 20:54:41 -08:00
Benford
c2c0fe40bc Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2015-12-01 23:45:03 -05:00
Benford
ef9166a64d Changes to bending who 
- Added different display for toggled bending/elements
- Commented out staff that aren't staff anymore
 2015-12-01 23:42:40 -05:00
OmniCypher
b8ac24d869 Merge pull request #318 from Simplicitee/master 
Change /bending who, Fix Auto Tab problem
 2015-11-30 23:28:07 -08:00
Benford
2ec5849e73 Auto Tab fix 
- Changed two instances of canBend to canBind
 2015-12-01 00:18:14 -05:00
Benford
a3b2b798e0 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2015-12-01 00:12:35 -05:00
Benford
bd1065daa1 Change /bending who list 
- /bending who list now shows appropriate elements and staff title
 2015-12-01 00:12:28 -05:00
OmniCypher
f9897d713d Merge pull request #317 from StrangeOne101/master 
Fix Bloodbending Bugs and Permissions
 2015-11-30 20:41:59 -08:00
OmniCypher
407a566f0f Merge pull request #316 from jedk1/master 
Fix NPE on update
 2015-11-30 19:25:25 -08:00
jedk1
d1d6091061 Fix NPE on update 2015-12-01 00:49:51 +00:00
OmniCypher
2d63a97611 Merge pull request #313 from jedk1/master 
Fix missing Element and Subelement args.
 2015-11-27 14:51:27 -08:00
jedk1
2df6bbc699 Fix missing Element and Subelement args. 2015-11-27 16:56:42 +00:00
OmniCypher
5f47ff465b Merge pull request #312 from jedk1/master 
Fix NPE on player log out.
 2015-11-26 10:44:56 -08:00
jedk1
f12052dbbe Fix NPE on player log out. 2015-11-26 18:24:34 +00:00
OmniCypher
39d3df50e4 Merge pull request #311 from Simplicitee/master 
Fix commands, Fix EarthSmash bug
 2015-11-25 13:29:24 -08:00