Commit Graph

4294 Commits

Author SHA1 Message Date
Jonathan Williams 90fbc397ff Converted gem rewards to boolean return from website.
Implemented gem transactions and source.
2013-10-18 00:46:06 -07:00
Jonathan Williams f88c202e07 Added AntiHack to Arcade/Hub
Added AntiHack Offense uploading.
Fixed memory leaks in PreparedStatments
Added Ultra tag in hub chat.
2013-10-17 00:37:57 -07:00
Chiss 2a836f3464 Added anti-hack 2013-10-16 12:23:23 +11:00
Chiss 40e49dd3d4 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-16 08:11:04 +11:00
Chiss ec80d8a568 added AntiHack
added dragonrider coolness
2013-10-16 08:10:45 +11:00
Jonathan Williams 1cdb89f4bf Derp, missing arcade. 2013-10-13 21:51:38 -07:00
Chiss 9ffc793f61 added Dragon Rider
anti-stack changes (dont anti-stack mined blocks)
2013-10-14 10:29:20 +11:00
Chiss 36b825d36d Snake update (woo) 2013-10-13 10:33:16 +11:00
Chiss d784a0b017 snake speed ramp up decrease 2013-10-13 09:38:03 +11:00
Chiss e12477c4b6 snake max speed decrease 2013-10-13 08:46:02 +11:00
Chiss 1fd894934a Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-13 08:43:06 +11:00
Chiss 377f4b0680 Gem fix, now correctly displays scaled gems.
UHC public changes
Snake fixes.
2013-10-13 08:42:49 +11:00
Jonathan Williams c5385ee7dc Fixed ultra join in arcade manager. 2013-10-12 02:53:22 -07:00
Chiss c8386bbc40 blue kit for snake 2013-10-12 18:22:20 +11:00
Chiss a315064a3f snake fix
parkour radius increase
2013-10-12 18:21:19 +11:00
Chiss 0564bd740a SSM wolf balance 2013-10-12 17:17:24 +11:00
Chiss 4eecca3063 Wolf fixes 2013-10-12 17:13:28 +11:00
Chiss 8766767d96 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-12 16:59:38 +11:00
Chiss 27fb3b4262 Snake changes
SSM Wolf fixes
2013-10-12 16:59:23 +11:00
Jonathan Williams f2c295c391 Fixed global ultra joining full games. 2013-10-11 22:03:17 -07:00
Chiss 0b2dcc2617 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-12 09:34:59 +11:00
Chiss 8376316994 Added Paintball
Added SSM Kit: Wolf
UPDATES.
2013-10-12 09:34:46 +11:00
Jonathan Williams fc18d0fbb1 Added null check logging to arcade custom kit name.
Removed wolf kit in SSM for release
Cleaned up PlayerAccountController
Fixed connection leak for mysql connections.
Added server shutdown if server is empty for dominate.
2013-10-10 09:01:48 -07:00
Chiss ed804e3336 Dragon escape update 2013-10-09 21:50:39 +11:00
Chiss 1fc446ae13 Lobby text now displays map 2013-10-08 17:56:57 +11:00
Chiss b64803e499 Smash Wolf 2013-10-08 17:44:04 +11:00
Chiss e7de90c267 Bridge changes to allow for 12 team map
Bridge timer fix
Smash wolf remove
World parser allows more than 4 teams.
2013-10-05 22:14:57 +10:00
Chiss ab45c717dd Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-10-05 07:49:21 +10:00
Chiss 3ba848567c paintball added
hg additions
minor changes to other games
2013-10-05 07:49:05 +10:00
Jonathan Williams 57b0d06786 Added DisguiseWolf
Added lobby menu (disabled autogive for testing)
Removed unused commands.
2013-10-02 22:23:01 -07:00
Chiss 34521eef8f minor game fixes
portal method in StackerManager.java
2013-09-27 17:08:32 +10:00
Chiss 2a3d7426d5 Some scoreboard fixes 2013-09-26 12:38:32 +10:00
Chiss f0e6a7294e squid hitbox larger 2013-09-24 09:18:36 +10:00
Chiss 0390d4f63b desc update suqid 2013-09-24 08:56:51 +10:00
Chiss 064dd97d00 HitBox support for disguises
Squid hitbox added
Changed squid swimming!
2013-09-24 08:56:09 +10:00
Chiss ea5cc7161a pigssss 2013-09-24 08:19:07 +10:00
Chiss d8d4b69dda baby pig to pig 2013-09-24 08:15:48 +10:00
Chiss 82f5fcb963 Pig Fix! 2013-09-24 08:12:51 +10:00
Chiss d4775a91a1 hitbox reduction 2013-09-23 17:45:14 +10:00
Chiss 0f9f28dcc2 fixed weapon names in pigs, + baby pig on platform 2013-09-23 17:36:53 +10:00
Chiss 5ba494c381 Made player names more visible in squid 2013-09-23 16:05:05 +10:00
Chiss ce89108aea Fixed disguises in bacon brawl 2013-09-23 16:00:35 +10:00
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 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
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 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
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 3ae6ba709d smash kit display update 2013-09-14 09:34:05 +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
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 2a65086b70 Added Milk the Cow
Maps now set Min/Max Y
2013-09-12 08:57:51 +10:00
Chiss ea81e558ea Added;
- Death Tag
- Dragon Escape
- Barbarians

Spleef; added hunger
Dragons; added knockback
Turf Forts; buffed shredder + fixed infil on respawn

Added knockack to 1 damage attacks.
Removed 'hit sound' from hitting mobs (just plays animal sound)
2013-09-11 12:22:55 +10:00
Chiss c46a550282 restructured games in arcade 2013-09-10 07:56:55 +10:00
Jonathan Williams 6b7b6c9fdf Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2013-09-09 01:30:28 -07:00
Jonathan Williams d4b3c5d461 Fixed memory leaks.
Added in party joining for servers in Hub
Modified server status's in server UI.
2013-09-09 01:28:35 -07:00
Chiss 9fe33bab84 Added UHC
Added pig disguise
Added func to Game base to support UHC
Moved map to Core
2013-09-09 18:06:44 +10:00
Chiss 8b2cc7993f Added UHC
Disabled Join Maps
2013-09-08 19:31:58 +10:00
Chiss 8dec407f16 SSM: wither image dies when you die
Turf Forts: you retain infil slow if you go onto enemy spawn
Hub Maps
2013-09-08 10:16:39 +10:00
Chiss f612826787 SSM: dont give passive item descs in game. 2013-09-07 19:30:06 +10:00
Chiss ff0e39067a Added Mount Manager 2013-09-07 16:01:10 +10:00
Jonathan Williams 7a9a3fea4f Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-06 17:43:59 -07:00
Jonathan Williams 2266cc4556 Added stop override and player redirect to Hub
Added prevention of items going into inventory for ServerNpcPage
Fixed issue with ClientClass and Competitive ULTRA
Fixed issue with CustomBuildPage and Competitive ULTRA
Added ULTRA joining full servers for Arcade.
Added ULTRA packs displaying in Arcade chat/tab.
Removed IChat from TeamGameEngine and Dominate.
2013-09-06 17:43:45 -07:00
Chiss 213b1efb0c Added Dragon Escape
fixed kit availability for runner
SSM: wither skel projectile continues after releasing block
SSM: nerfed blizzard
SSM: reduced gem price of a few kits
2013-09-06 15:58:58 +10:00
Chiss 768f57ae5e SSM: Added Wither Skeleton and Creeper kits
Compass: no longer teleports if not holding compass (on click)
SSM: various balance changes.
2013-09-05 13:55:42 +10:00
Chiss f29b844798 Merge branch 'master' of ssh://198.245.50.91:7999/min/master
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
resolved
2013-09-05 07:50:13 +10:00
Chiss 87fa103711 WHITE SPACE CHANGES! 2013-09-05 07:44:53 +10:00
Jonathan Williams 34dd5a1af3 Added broadcast command.
Added Chat to hub.
Disabled /me
Fixed Pets not returning when pushed off into the void.
Prevented eggs from spawning in hub.
2013-09-04 11:35:59 -07:00
Jonathan Williams 55b6bd6e95 Fixed memory leaks in SSM kits. 2013-09-04 10:46:33 -07:00
Jonathan Williams 552675b1bf Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-04 10:36:13 -07:00
Chiss 010336983a SSM: fixed fissure not working
Hub: fixed invisibility for tutorial players (others could still see them and throw em)
2013-09-04 18:03:01 +10:00
Jonathan Williams 2a2c48087f Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-03 23:31:44 -07:00
Jonathan Williams d5ef0208a1 Added lag meter to hub and arcade. 2013-09-03 23:31:29 -07:00
Chiss 93e59c1c43 Merge branch 'master' of ssh://198.245.50.91:7999/min/master
Conflicts:
	Plugins/Libraries/craftbukkit.jar
2013-09-04 16:13:12 +10:00
Chiss ca6131d1d5 SSM Minor patches 2013-09-04 16:11:50 +10:00
Chiss 48c4ca0e24 SSM minor changes 2013-09-04 15:40:02 +10:00
Jonathan Williams 37897037a3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-03 20:46:48 -07:00
Jonathan Williams 63b4776893 Garrrr, fixed craftbukkit building. 2013-09-03 20:43:32 -07:00
Chiss e3eae200ae arcade: fixed kit material NPE
SSM: added knight
SSM: added placeholder for wither skel
2013-09-04 11:55:19 +10:00
Chiss 23ac045a41 Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-04 08:14:20 +10:00
Chiss 6b57a87285 SSM Kit Item Lore 2013-09-04 08:13:59 +10:00
Jonathan Williams 346bdb030e Cleaned warning.
Fixed punish command on web side.
2013-09-03 14:10:14 -07:00
Jonathan Williams c2ec238af5 Fixed kit purchase in SuperSmashMobs 2013-09-03 12:13:15 -07:00
Chiss 564c1720bd SSM Balances 2013-09-03 19:18:56 +10:00
Chiss 83567fce50 SSM slime nerf
disguise 0 velocity packet fix
2013-09-03 10:47:15 +10:00
Jonathan Williams 66131ad0b0 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-02 04:20:18 -07:00
Jonathan Williams 8840f04977 Fixed FileUpdater.
Added FileUpdater to DOM and Arcade.
2013-09-02 04:19:56 -07:00
Chiss ad26c519ba Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-02 18:45:31 +10:00
Chiss 45d28569e0 Added idle fix
fixed hub Dragon.java
ate the rabbit stew.
2013-09-02 18:45:12 +10:00
Jonathan Williams af7a41ae71 Implemented ServerRestart event on FileUpdate check.
Implemented cancels in arcade/dom/mk
Implemented Restart updates in server manager page.

Implemented lobby removal is restarting.
2013-09-02 01:09:28 -07:00
Jonathan Williams 43c3f8cc87 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-01 23:28:22 -07:00
Jonathan Williams 63d2563f92 Added Disguise hurt sounds.
Enabled disguised hurt sounds in DamageManager
2013-09-01 23:28:07 -07:00
Chiss 441e6d80b7 lobby kit disguises :D
slime NPE fix
2013-09-02 16:01:14 +10:00
Chiss ee20174d80 lobby adv messagfe 2013-09-02 15:47:08 +10:00
Chiss d5fd95c53b Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-02 15:07:27 +10:00
Chiss 98b285d819 turf forts self kill fix. 2013-09-02 15:07:07 +10:00
Jonathan Williams a49f67b33c Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-01 22:06:35 -07:00
Jonathan Williams f0b0c72ddb Fixed arcade packethandler problem.
Fixed skill page issue for class combat.
2013-09-01 22:06:20 -07:00
Chiss c483d869a5 Added SSM Spider and Squid Kit
prepared DamageManager.java for disguise sounds
minor SSM balance changes
fixed compass targetting self.
2013-09-02 14:40:06 +10:00
Chiss 789a26471d smash stats Perk 2013-09-02 09:51:53 +10:00
Jonathan Williams 3041cacb26 Renamed disguise methods to lowercase. 2013-09-01 16:38:32 -07:00
Chiss 668a6e4854 changed utilplayer health method to double
spleef eventhandelr removal
turf forts kit green/blue
added kit stats for smash
nerfed flap in smash
2013-09-02 09:35:04 +10:00
Chiss 9149cc565e Hub turns off flight (people were staying in flying somehow)
Spleef block damage fix
Smash kit balances
2013-09-02 08:16:35 +10:00
Chiss 07dcfeb266 Compass in smash
can break windows in OITQ
block toss cannot dig tunnels, or take from walls.
chicken missile fixes
remove fire ticks from players on respawn
2013-09-01 12:18:48 +10:00
Chiss 72bec77237 Queueing now works with less players than teams.
Added DragonName text-input for hub
Fixed smash bug, where spectators were causing lightning effect
2013-09-01 08:34:53 +10:00
Chiss dab3f33cbf Hub text changes
Hub animal spawns
Hub spawn invisibility
Smash kit balances
2013-08-31 18:19:23 +10:00
Chiss 6ee2e427b5 Changed TeamEntity from Creature to LivingEntity 2013-08-31 13:58:40 +10:00
Chiss fb592640a1 Fixed various merge errors.
(Updates)
2013-08-31 13:47:48 +10:00
Chiss 81f8503180 Merge commit '13110356aabbcc69d83ce29d8f9e5bec27812009'
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/deathtag/kits/KitArcher.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitCoward.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitMarksman.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitPyrotechnic.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitDefenceArcher.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitHorseKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitBrawler.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitElementalist.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitLeaper.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitInfiltrator.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitMarksman.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitShredder.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanElementalist.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanMarksman.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanPeasant.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorArcher.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorRogue.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitUndeadAlpha.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2013-08-31 13:41:58 +10:00
Chiss e17368a9ac >.< Updates 2013-08-31 13:15:16 +10:00
Jonathan Williams 13110356aa Added Enjin Translator poll ability.
Fixed up kits for arcade.
Fixed disguise for enderman to not teleport on fire ticks.
2013-08-30 16:37:21 -07:00
Chiss 7dbfe9d0dc Moremissing stuff. 2013-08-29 16:20:36 +10:00
Chiss aad017690e FIREFLY 2013-08-29 16:17:52 +10:00
Chiss a198d0d3cb Added events... 2013-08-29 16:16:22 +10:00
Chiss 8559e77a24 "UPDATES!"loooooooool 2013-08-29 16:13:05 +10:00
Jonathan Williams a1d622c790 Tweaked disguise movement to cut out jitters. 2013-08-28 15:00:39 -07:00
Jonathan Williams 1b7b549647 Removed class files from source control. 2013-08-27 16:21:57 -07:00
Jonathan Williams 3fb52c5c71 Initial Commit 2013-08-27 08:14:08 -07:00