Commit Graph

12240 Commits

Author SHA1 Message Date
Chiss
eae38dfa22 Merge branch 'master' of ssh://198.245.50.91:7999/min/master
Conflicts:
	Plugins/Libraries/craftbukkit.jar
2013-09-23 15:50:30 +10:00
Chiss
bf4dc35b5f Added pig Game
added squid game
added recharged skill event
2013-09-23 15:48:35 +10:00
Jonathan Williams
8aad215475 Added sheep color/shear for disguise 2013-09-22 21:12:08 -07:00
Jonathan Williams
e098d93155 Added baby disguise ability.
Added Stacker recharge.
Fixed issue with ServerGameMenu Champions button.
SuperSmash decreased hunger gain on attack.

Code cleanup.
2013-09-22 20:53:24 -07:00
Jonathan Williams
cc63fdccfc Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-21 15:02:14 -07:00
Jonathan Williams
558d9b4cc6 Added shop link to kits.
REmoved client cache.
Added random messages.
Fixed problem with Confirmation Page.
2013-09-21 15:01:40 -07:00
Chiss
b3a78112be Fixed gem display bug 2013-09-21 13:53:12 +10:00
Chiss
eb6bbceecd Slowed hunger degen a little, increased regen to damage dealt. 2013-09-21 13:40:04 +10:00
Chiss
9064272a38 Prepared SSM for 200 player Game (added hunger) 2013-09-21 13:34:14 +10:00
Chiss
9da18ea43f Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-21 08:34:24 +10:00
Chiss
a92c74a28a HG Updates
Other minor fixes
2013-09-21 08:34:07 +10:00
Jonathan Williams
85cc6e5b2b Updated to 1.6.4 2013-09-20 01:50:56 -07:00
Jonathan Williams
3622808e09 Fix for task cancelling. 2013-09-19 02:39:53 -07:00
Jonathan Williams
d2ab872856 Added some code for Global bungee communication.
Fixed up LobbyBalancer
2013-09-19 00:05:23 -07:00
Jonathan Williams
7329cc0aea Implemented quick game menu.
Fixed dom team size at 1.

Removed old server update code from server manager.
2013-09-18 22:11:49 -07:00
Jonathan Williams
7d31b24c75 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-18 05:20:58 -07:00
Jonathan Williams
978254c16c Fixed dominate start issues.
Fixed issue with server status manager and config for server tracker.
Changed minekart mob name.

Updated Minekart with new server status stuff.
Updated Dominate with new server status stuff.
2013-09-18 05:16:29 -07:00
Chiss
91ce36d6e4 Hub refactor
Hub parkour module
2013-09-18 19:46:45 +10:00
Jonathan Williams
ae00d3df18 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-17 15:52:16 -07:00
Jonathan Williams
f31a734a0d Fixed server pages to show 5 servers.
Added in creeper explode block list for UHC.java
Added task assignment/reward message only on return confirm call.
Hide players in hub when they have an inventory open.
Added gem command into donation manager.

Revamped bungee player count method.
Revamped server status method.
2013-09-17 15:50:23 -07:00
Chiss
f280fb51f2 Mute now blocks commands too. 2013-09-17 14:54:50 +10:00
Chiss
c6a9d4675f MTC changes
Barbarians changes
OITQ enchanter desc improvement
renamed Turf Forts
Added 2.5x gems for bridges
2013-09-17 10:37:45 +10:00
Chiss
c6b3a8a56c Added Minigames to hub TextCreator.java
Milk the cow changes!
2013-09-16 12:23:57 +10:00
Chiss
118d52e106 Slime Buff 2013-09-16 12:03:04 +10:00
Chiss
7bd13b416e Some turf forts fixes/changes
Fixed SSM lobby
2013-09-16 11:52:27 +10:00
Chiss
616ba6312c fixed bug with bomber not giving tnt 2013-09-15 15:27:50 +10:00
Chiss
6f03c57c22 Farmers lose 5 milk when dying. 2013-09-15 14:21:10 +10:00
Chiss
6b5373c20c Fixed Turf Forts arrow bug 2013-09-15 13:57:13 +10:00
Chiss
7894f95aab Milk Cow now has 3 cows
dragon escape backtrack fix
2013-09-15 13:43:56 +10:00
Chiss
d51599de28 HG start
Added /hub and /leave to return to hub
2013-09-15 11:12:11 +10:00
Chiss
cc39abfd7f UHC fixes
IdleManager NPE fix
2013-09-14 20:03:24 +10:00
Chiss
44b82f90b1 Shredder buff 2013-09-14 19:05:07 +10:00
Jonathan Williams
c5f239baba Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-14 02:02:57 -07:00
Jonathan Williams
817fa5737c Added nether teleportation to game world. 2013-09-14 02:02:34 -07:00
Chiss
5ad627decb SSM Creeper shield nerf by 50% duration 2013-09-14 16:13:24 +10:00
Chiss
743c8e9978 SSM Blaze slight buff
Dragons: Removed knockback (based on feedback)
Dragons: added 3 mroe dragons :D
2013-09-14 16:09:30 +10:00
Chiss
72718ff7b4 nerfed farmer in milk teh cow
fixed some UHC bugs
made party tutorial return you to spawn
2013-09-14 15:20:28 +10:00
Chiss
34c333dac9 added announcement logging
fixed creeper explosion disable for uhc
fixed player logout thing for UHC?
2013-09-14 12:27:40 +10:00
Chiss
e49b92d280 UHC fixes
Game inventory disable doesnt disable punish anymore
2013-09-14 11:33:33 +10:00
Chiss
9cac72dc1e Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-14 09:36:05 +10:00
Chiss
3ae6ba709d smash kit display update 2013-09-14 09:34:05 +10:00
Jonathan Williams
c976a46f1f Optimized UtilText/MapUtil.java
Added quick game menu.  Still needs work.
2013-09-13 15:25:01 -07:00
Chiss
2fb200119e Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-14 08:13:37 +10:00
Chiss
35c10f22a1 Fixed gems in a few games
Milk Cow; cannot pickup water, cannot drink milk after end
2013-09-14 08:13:21 +10:00
Jonathan Williams
35728ce4d3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-12 22:33:43 -07:00
Jonathan Williams
c4c81085c5 Added ignore check for bungee updating.
Fixed PlayerCount for bungee's
Fixed bug with Party.
2013-09-12 22:33:03 -07:00
Chiss
20090406a6 missing kit 2013-09-13 12:25:45 +10:00
Chiss
b1744e86d8 many UHC bug fixes
dragon escape bug fixes
barbarians bug fixes
death tag fixes
2013-09-13 12:24:33 +10:00
Chiss
60dd6c84d0 Updated World Parser / Data to account for Y of corner blocks.
Use same height to have no height limits.
2013-09-12 09:01:37 +10:00
Chiss
9490549a96 Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-12 09:01:04 +10:00