e4a86e0600
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-22 10:45:01 +11:00
fe09c3fc49
More CS Update
2014-03-22 10:44:31 +11:00
8bf78fe14d
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-21 15:30:06 -07:00
33d342b049
updated 1.7 stuff.
2014-03-21 10:57:31 -07:00
ab2a72ba16
CS Update
2014-03-21 11:59:56 +11:00
f24f81b7c3
Finished conversion.
2014-03-19 04:09:40 -07:00
515a01fd7d
Updated utils.
2014-03-19 02:40:36 -07:00
7f58453688
Updated Particle.
2014-03-19 02:25:28 -07:00
7042159f46
Updated to 1.7 and changed namespaces to 1.7
2014-03-19 02:24:26 -07:00
98baef09bf
Added 1.7 files.
...
Removed 1.6 files.
2014-03-19 00:58:43 -07:00
a7888b0c02
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-19 17:51:48 +11:00
7714ff4a09
CS Update
2014-03-19 17:51:37 +11:00
24f1c6c722
Fixed saving custom builds.
...
Fixed items staying from previous class in game.
2014-03-18 23:40:54 -07:00
9715f5454a
Removed double gems.
...
Removed unused code for ssm time
2014-03-18 12:55:04 -07:00
6830033d8a
PLEASE JUST WORK :(
2014-03-16 10:52:34 +11:00
d6e3f076cd
PLEASE JUST WORK MR TORTOISE
2014-03-16 10:42:30 +11:00
3277a0a2f8
Making sure puushed
2014-03-16 10:35:58 +11:00
d695ec72ca
Added SSM Team Game
2014-03-16 10:28:46 +11:00
3603d3ef8b
Removed afk kick from arcade.
2014-03-14 21:49:01 -07:00
0094c0ebeb
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-14 02:20:01 -07:00
246f28a464
Enabled DoubleGem weekend.
...
Added 3 new maps
updated news
2014-03-14 02:19:52 -07:00
aa206d9c91
Gravity fixes
2014-03-14 20:17:06 +11:00
24efe3d0d8
SQ kit restrictions
2014-03-14 13:24:38 +11:00
de1365b5cf
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-13 17:56:16 -07:00
efee9fdcbf
Fixed Hub class shop.
...
Added chat logging.
Added message with file updater.
2014-03-13 17:56:05 -07:00
f4cd2fcbb9
Staggered game teleports/start
2014-03-13 18:18:22 +11:00
27f554ab61
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-13 16:33:03 +11:00
82644002c5
A little bit o dem ol bug fixles. yknow what im sayin?
2014-03-13 16:32:48 +11:00
b6ee99596a
Work on Dom shop page.
...
Removed unused shops
Removed unnecessary include of Core project files in build xml
2014-03-12 01:06:56 -07:00
c4b7cd19c8
Added default builds for kits in Champions/Dominate
...
Added default build selection in lobby when only hitting kit and not selecting a build.
2014-03-11 03:29:11 -07:00
f277b1da23
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-09 19:43:14 -07:00
02a1e68c8c
Fixed kits opening correct page.
2014-03-09 19:42:54 -07:00
105b210afa
mob spawnin'
2014-03-10 13:42:05 +11:00
464fdb1e5e
Renamed Champions to Dominate
2014-03-10 13:35:36 +11:00
8593eb326e
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-10 13:32:52 +11:00
1bc5fef625
Kit npc location change
2014-03-10 13:32:39 +11:00
a565da45e4
Added classes to champions.
...
Added ability to open direct classes page.
2014-03-09 19:32:27 -07:00
f51a6747fd
Moved files into Mineplex.core
...
Removed references to Core project.
2014-03-09 00:50:13 -08:00
2cc50d5725
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-03-06 02:15:46 -08:00
d05c2f906c
Fix for ServerNpc page beta join.
...
Work on Dom 2.0
Added sheep quest map.
2014-03-06 02:15:16 -08:00
60bc3f15bb
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-03-05 14:35:01 -08:00
c9a938d2c5
Sheep Quest Fixes
2014-03-05 14:34:51 -08:00
a09a2aaa30
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-03-05 00:40:51 -08:00
f0b347f97f
Changed beta testing to Ultra and up.
...
Did some work on DOM 2.0
2014-03-05 00:34:20 -08:00
af2cf4e7a9
this is the one change i needed to push
2014-03-04 23:27:37 -08:00
2b56b970fa
Sheep Game?
2014-03-04 22:39:48 -08:00
d99a3c9253
Optimized mysql queries with server status' address/updated fields.
...
Removed double gems.
Added BETA check for Hero only beta games.
2014-03-03 12:47:57 -08:00
b3f10b9d62
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-03-01 01:59:25 -08:00
750fff32c7
Added Skeletal horse.
2014-03-01 01:58:58 -08:00
b54e4dfbc4
hunger
2014-03-01 11:29:01 +11:00
18880a00f4
fletcher doesnt give to specs
2014-03-01 11:09:15 +11:00
dfa4ea0edc
fix
2014-03-01 11:06:01 +11:00
8d0115f874
News update
2014-03-01 10:40:55 +11:00
bfaa138526
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2014-03-01 10:35:20 +11:00
7cf6391ddd
Sheep Quest
...
Double Gem Weekend
2014-03-01 10:35:06 +11:00
8550307904
Removed unnecessary mysql call on client login.
2014-02-28 13:22:30 -08:00
c2044f7e8a
Added horse disguise.
...
Added Hub redirect on full.
Fixed Repo for ServerMonitor.
Fixed Bridge QuitOut/AutoBalance issue.
Removed unnecessary region folder create in dominate.
2014-02-28 01:18:32 -08:00
f2570caad5
Swapped default connections to new dns names.
...
Fixed bug with LobbyBalancer and retrieving no lobbies.
2014-02-21 13:32:14 -08:00
55c9a85763
Fixed Dynamic Server monitor stuff.
...
Fixed EnjinTranslator Gem command.
2014-02-18 00:40:41 -08:00
ac8748312f
Fixed Account login issues....Nasty LoadNavigationProperties()
...
Tweaked dynamic server monitor sleep ordering to prevent multiple duplicate starts on boxes.
2014-02-14 13:39:24 -06:00
95210de788
Added auto restart for Dominate if startup errored.
...
Added extra check for <= 1 players in Dom game to shutdown.
Added 5 second delay to Dom kick after game finish.
2014-02-12 02:31:35 -08:00
a75ced170c
Added whitelist check in CoreClientManager
2014-02-10 02:04:20 -08:00
525df6c2b0
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-02-07 09:46:54 -08:00
516e5f7f99
Moved Rejoin ability into TeamGame.
...
Added autobalance flag for game.
Punish only does exact name lookup.
2014-02-07 08:50:13 -08:00
b776c1bf60
spacehelemettts
2014-01-22 08:28:06 +11:00
d868c9b73d
fixed gold blocks being destroyed.
2014-01-22 08:02:01 +11:00
567b7c4a7b
minor fixes
2014-01-21 23:14:23 +11:00
9118e79d9a
Minor fixes
2014-01-21 22:57:49 +11:00
b0ea211ae3
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2014-01-21 22:52:05 +11:00
e124dde006
Finished Gravity
...
INcluded map
2014-01-21 22:48:18 +11:00
6f43d91bcf
Added Vegetate for Bat.
...
Added missing ProcessRunner.java
2014-01-20 21:01:52 -06:00
0fba94f8ae
Derp
2014-01-20 20:22:59 -06:00
f657b8a3ac
Added isFlying and setFlying to DisguiseBat
2014-01-20 20:18:09 -06:00
bdb7f3cc28
UHC season 5
2014-01-21 11:56:35 +11:00
76b2baf626
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2014-01-21 11:28:37 +11:00
7bbfdd1a42
Gravity Update
2014-01-21 11:28:12 +11:00
dea96a9e65
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-01-18 09:08:12 -06:00
177f4a878b
Removed bad eventhandler line
...
Refactored StatsManager
Removed Pvp Table add for StatsManager
Added commented out hooks for HG stats
2014-01-18 09:02:56 -06:00
75669e2333
Hub News Changes
...
AntiHack Autokick for Severe Hackers
2014-01-18 20:33:38 +11:00
1333f2ee9f
SSM Horse Disabled
2014-01-18 12:56:00 +11:00
1031846198
SSM Update
...
Gravity game start
2014-01-18 12:34:24 +11:00
8e51e4061a
Reverted Hub.
...
Fixed server monitor issues.
2014-01-14 02:04:06 -06:00
ea320e7f5b
Removed Client cleanup.
...
Modified server monitor process handling.
2014-01-08 15:18:52 -05:00
6904f9cf3d
Minor verbage "Starting in 1 Second."
...
Fixed NPE in client cleanup.
2014-01-03 05:50:05 -05:00
faea1072a1
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-01-03 01:37:49 -05:00
93c0575fe2
Fixed naming in some hub modules.
...
Fixed StatusManager ip and DynamicServer comparison.
Tweaked Bungee Lobby selection so it doesn't select a Lobby with < 10 slots left
Added client cleanup in CoreClientManager
Added Paintball cleanup
Added AntiHack ignore list cleanup.
Added clearDisguises call in DisguiseManager
Added ServerMonitor tracking based on Private Address.
2014-01-03 01:37:39 -05:00
dd7b178a9f
Fixed Hero rank in EnjinTranslator
2013-12-26 19:44:36 -05:00
fa2e24d686
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
2013-12-25 09:08:03 +11:00
375d689cc6
fixed visual bug with hero gems
2013-12-25 09:06:22 +11:00
3fefc8fa73
Fixed Hero message in Arcade.
2013-12-24 04:13:52 -05:00
f510083e7e
formatting
2013-12-24 19:26:30 +11:00
d25487d545
Rank color
2013-12-24 19:21:21 +11:00
d92515eef9
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-24 19:14:54 +11:00
74e49a3ff1
Hero Rank stuff
...
New SSM Kit
2013-12-24 19:14:40 +11:00
592d49e57c
Added ghost check flag to ender dragon.
...
Re-enabled Dragon Gadget.
2013-12-24 03:09:15 -05:00
6595d33899
Tuned chunk load for disguise manager.
...
Disabled dynamic text in hub.
2013-12-24 00:39:33 -05:00
e60f52ff9c
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-12-23 04:17:06 -05:00
79de7f2bfc
Fixed portal breaking with Frost horse.
...
Added memory clean up for disguises
2013-12-23 04:16:53 -05:00
200504ec8b
made snowman boss a little tougher.
2013-12-22 00:10:15 +11:00
b895c66005
snake even more easy
2013-12-22 00:02:38 +11:00
3bd7a7cd1f
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-22 00:01:24 +11:00
2f063e9f8e
wave 3 snowman invul fix
2013-12-21 23:54:10 +11:00
a02ca4513e
Added undead/batgun and frost to in game shop for gems.
2013-12-21 07:29:04 -05:00
e94784a908
dragon mount removed
2013-12-21 23:09:49 +11:00
d6c37055da
cleaner leak fix.
2013-12-21 23:06:27 +11:00
1c3d90a70f
leak fixes
2013-12-21 23:00:51 +11:00
58e049acf9
snake bit is easier :)
2013-12-21 22:34:04 +11:00
c08b7c7b96
hub news update
2013-12-21 22:21:16 +11:00
bfd76474e8
Dragon particles
2013-12-21 20:44:56 +11:00
a6eb7ea665
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-21 20:07:04 +11:00
0585116e78
Hub Gadgets
...
Hub Dragon (Hero Only)
XMAS block efficiency
2013-12-21 20:05:42 +11:00
793b17e878
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-12-21 03:23:07 -05:00
7574a5972b
Prevented sounds from silenced vegetables.
2013-12-21 03:22:58 -05:00
c969775df3
Hub gadgets for xmas
2013-12-21 19:00:30 +11:00
5fffcf89b6
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-12-21 02:44:20 -05:00
70c14268e1
Fixed Leash issue.
...
Added invis for utilent.ghost
2013-12-21 02:44:12 -05:00
f50ae06dff
NPE fix
2013-12-21 16:52:59 +11:00
50c2b10b50
25% easier boss
2013-12-21 15:10:17 +11:00
c52a7d2fe1
Christmas update
...
Hub Update
2013-12-21 15:06:01 +11:00
bc9c309aa1
Xmas Game
2013-12-21 10:17:22 +11:00
5dc0a7d4d6
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-21 08:43:02 +11:00
ac723c14bd
Push so i can pull :O
...
just some xmas stuff
2013-12-21 08:42:49 +11:00
f504cb5a8d
Added vegetation to horse.
...
Added Leash method to UtilEnt
2013-12-20 03:52:43 -05:00
379b0d0d75
Check for PullWhileLeashed in EntityCreature.
2013-12-20 03:14:18 -05:00
44145e01f0
Removed weather for hub update.
2013-12-18 13:52:44 -05:00
a24e8e233c
Enabled pvp in hub for snowballs.
2013-12-18 05:56:59 -05:00
6b33306755
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-18 21:46:40 +11:00
e55885c85d
itsy
2013-12-18 05:22:40 -05:00
f4edcedce3
push so i can pull :\?
2013-12-18 21:17:28 +11:00
0ba8349e03
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-12-18 04:48:24 -05:00
64dab19003
Cleanup
...
Prep work on leash disable functionality.
2013-12-18 04:48:16 -05:00
54f2cb3467
Christmas hub snowman target cancel
2013-12-18 19:58:39 +11:00
ab8013091d
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2013-12-17 11:10:11 -05:00
938e72b06d
Remove tourney stats.
2013-12-17 11:09:36 -05:00
de99a642d3
Hub tourney text removal
2013-12-17 11:06:04 +11:00
4bef100c6a
Xmas Hub
2013-12-16 14:32:51 +11:00
c582b210b5
Hub + Stats + Tournament
2013-12-14 16:51:08 +11:00
3ca67d60c0
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-14 16:38:46 +11:00
9af8676307
Hub/Stats
2013-12-14 16:38:16 +11:00
ac049e0397
FINE JUST FINE>>>>>> STUPID CHICKENS
2013-12-13 21:36:57 -08:00
69fa9eaba5
Added getters for stats/StatsManager.java
2013-12-13 21:35:04 -08:00
e054b06cc2
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-12-13 21:01:08 -08:00
6b92b6c4a8
Added stats manager.
...
Added lots of missing files.
2013-12-13 21:00:56 -08:00
1eebed737e
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
2013-12-13 18:05:08 +11:00
5f2e457362
Minor HG Stuffs ;o
2013-12-13 16:21:39 +11:00
d6544202f0
Added ghost ability for mobs.
2013-12-12 02:19:58 -08:00
97d8923678
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-07 23:04:59 +11:00
2fb4bc4fbc
UHC stuff
2013-12-07 23:04:10 +11:00
9382271315
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-12-06 01:57:18 -08:00
03627eb0c3
Changed all mysql connections to be persistent.
2013-12-06 01:57:09 -08:00
db7b4f3a40
more draw words
2013-12-04 15:25:18 +11:00
00bccdc1f7
More draw words
...
UHC complete! probably not :'(
2013-12-04 13:31:23 +11:00
a29cc4664f
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
2013-12-04 12:48:12 +11:00
28c928b4c3
Xmas + UHC changes
2013-12-04 12:45:17 +11:00
8984309c56
Cleaned up portal cancellation.
2013-12-03 17:41:58 -08:00
022c343a98
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
2013-12-03 13:58:28 -08:00
09a77e98cc
Prevent Enderdragon from creating portal.
2013-12-03 13:57:43 -08:00
36a98d5e41
UHC changes
2013-12-03 21:31:02 +11:00
f972418fd1
UHC!
2013-12-03 17:13:29 +11:00
d10871abd9
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-03 16:27:12 +11:00
43196dd7af
UHC Update
2013-12-03 16:26:47 +11:00
ce4eb43145
UHC end transfer.
2013-12-02 21:20:28 -08:00
27c79e7c92
Turned lobby balancer back to US
...
Added Draw map
2013-11-30 16:38:02 -08:00
f4e3b6efdc
hub news/skytext for draw game
2013-11-30 22:11:26 +11:00
c8fc792fdd
UHC prep for s4
...
Draw updates
2013-11-30 20:40:09 +11:00
8807854b57
Added Draw
2013-11-29 23:38:38 +11:00
f927f2c1be
wolf tackle fix
...
HG furnace no use
2013-11-27 12:48:16 +11:00
0d811272cc
final HG fix :D
2013-11-27 11:52:20 +11:00
6f06ac2018
HG lag fixes
...
item frames cannot be broken
creep damage messages
2013-11-26 23:54:02 +11:00
25782813f4
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-26 02:35:05 -08:00
9a7a815a21
Added multiblock packets only for sg.
...
RE-tweaked loot.
Fixed blocks pawns in lobby.
2013-11-26 02:34:54 -08:00
e57722ed0b
HG snowball fix
2013-11-26 12:02:03 +11:00
48e392fdf0
HG;
...
-compass
-deathmatch
-various fixes
2013-11-25 20:59:46 +11:00
e469c5705b
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-25 10:23:28 +11:00
b941359840
HG
2013-11-25 10:23:10 +11:00
2ebf13aba6
Added commented out chunk change stuff.
2013-11-24 15:22:29 -08:00
e2646a982f
Added MultiBlock packet.
...
Tweaked performance for chunks that are < 64 changes for HungerGames.
2013-11-24 04:54:41 -08:00
0a1f4ecfd5
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-24 03:04:07 -08:00
276898dced
HG
2013-11-24 21:58:55 +11:00
8d19f3ecac
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-24 02:44:59 -08:00
dbd7820279
Loot tweak.
2013-11-24 02:44:52 -08:00
4c7e42760b
debugz
2013-11-24 21:44:43 +11:00
83bec39aef
game not end
2013-11-24 21:36:35 +11:00
c9e1c0a0f4
HG lag fix
2013-11-24 21:29:49 +11:00
fd63a0a0b1
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-23 23:59:04 +11:00
2a41979277
HG Lag Fixes!
2013-11-23 23:58:51 +11:00
e04815f077
Removed Beta ultra only checking in server NPc page.
2013-11-23 02:40:56 -08:00
b0bfa860c7
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-23 02:04:30 -08:00
ae779d063e
Added quick menu buttons for Block Hunt and Survival Games
2013-11-23 02:04:22 -08:00
f299b4f650
hub changes
2013-11-23 20:55:01 +11:00
7752d0e8a2
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-23 00:57:54 -08:00
11378f967f
Fixed npc page ultra beta stuff.
2013-11-23 00:39:32 -08:00
0d7444f35a
TNT Damage off
2013-11-23 19:38:58 +11:00
e6080c9192
drop fixes
2013-11-23 18:39:26 +11:00
d5ae42910f
OOPDOOTS
2013-11-23 18:19:26 +11:00
11bd4804f4
skeleton/wolf removal on death
2013-11-23 11:03:52 +11:00
8752a7a6ac
HG Ice Speed + TNT Delay
2013-11-23 10:21:06 +11:00
3a3ac9f8ce
redblockstore
2013-11-23 10:04:37 +11:00
189b22ab4c
Pushed fixes
2013-11-23 09:55:48 +11:00
6e1f88c14f
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-23 09:28:39 +11:00
42cab3a39c
HG STUFF
2013-11-23 09:28:27 +11:00
8a5e9e2f48
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-22 14:17:07 -08:00
affc9eeb9c
Added inventory click for creative users in Hub
...
Added Ultra/Survival games beta stuff do servernpcpage
2013-11-22 14:17:00 -08:00
a5a80378f7
Loot fixes
2013-11-23 09:15:13 +11:00
3d13fb0dc9
HG Fixes
2013-11-22 23:12:39 +11:00
9c9e5f1ae0
Added goal selector clear for entities in UtilEntity
2013-11-22 00:38:24 -08:00
0b7bf00ca7
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-22 18:41:31 +11:00
0a683416ff
SG Update
2013-11-22 18:40:38 +11:00
7885df35ae
Added spectating flag for EntityTNTPrimed
2013-11-21 23:32:41 -08:00
9e8cd9db7d
Disabled painting in parkour areas.
2013-11-21 12:38:16 -08:00
44416001b3
Disabled Bat Blaster near Parkour.
...
Disabled Painting blocks near cactus.
2013-11-21 12:16:24 -08:00
be7ea65033
Website bin/obj cleanup
...
Fixed Pet Rename problem.
Fixed Extra Pet tag problem.
Added ServerStatus for dedicated servers.
2013-11-21 12:08:58 -08:00
4bd4943bd8
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-17 17:00:20 -08:00
9ba122a4cb
Added recursive retrieval for Bungees
2013-11-17 17:00:12 -08:00
7aec2d572b
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-17 21:04:51 +11:00
18c70901ca
gem kit fix
2013-11-17 21:04:27 +11:00
0fa953715e
Fixed interact cancel in Hub.
2013-11-16 18:49:17 -08:00
fff13a14bf
Gem lowered on firework/meow
2013-11-17 12:31:13 +11:00
0aae7d24ed
BH Gem Fixes
2013-11-17 12:30:14 +11:00
85a3edc75e
Mute should now correctly block all command input too.
2013-11-17 11:04:54 +11:00
be4de5f7bb
Europe server in news
2013-11-17 10:59:02 +11:00
e91ed271c2
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-17 09:54:06 +11:00
630281c663
SSM Hunger Fix
2013-11-17 09:53:53 +11:00
3a725246dc
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-16 02:59:35 -08:00
c1de12a8e7
Added autoreconnect to bungee repos
...
Fixed up disguise for block hunt.
2013-11-16 02:59:28 -08:00
07d9610bf7
Hub sky text
2013-11-16 21:21:04 +11:00
2a9c11d700
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-16 21:10:23 +11:00
1e0a456286
hub changes
2013-11-16 21:09:59 +11:00
a9241bc7f3
Changed Hub to normal.
2013-11-16 02:07:51 -08:00
3f93e6daf1
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/CreatureForm.java
2013-11-16 01:56:22 -08:00
75c2a5fd6e
Added sound disguises
...
Removed purchasable batgun.
2013-11-16 01:55:10 -08:00
9c6ebcea52
shocking nerf
2013-11-16 18:25:19 +11:00
37ed58cea9
axe boost nerf
2013-11-16 17:57:21 +11:00
690811dd05
cased SG debug properly
2013-11-16 17:54:30 +11:00
b8e1c22967
BH updates
2013-11-16 17:53:42 +11:00
d71a8002d3
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-16 17:11:05 +11:00
ea8d28abc1
Formula
2013-11-16 17:10:54 +11:00
ef54732531
DISGUISE THEM CATS
2013-11-16 16:43:03 +11:00
39384470e7
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-15 21:41:23 -08:00
84acc952fa
Added DisguiseCat.
...
Added CookieTown Block Hunt.
2013-11-15 21:41:14 -08:00
2e6758e23c
BH Updates
2013-11-16 13:15:16 +11:00
29ce493f64
Hide and SEEEEEEK (block honts)
2013-11-15 18:52:46 +11:00
99c97d1ecd
Block Hunt changes
2013-11-14 16:28:29 +11:00
0013b1bacf
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-14 16:28:06 +11:00
115109e5b8
Added sound disguise for DisguiseBase
...
Small desc tweak on server monitor.
2013-11-14 00:01:41 -05:00
6ebda931fd
Fixed bug where backtracking players could be in the scoreboard twice.
2013-11-11 07:27:41 +11:00
980ce0a5a3
Block disguise velocity tweak.
2013-11-08 16:06:17 -08:00
255307088c
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
2013-11-09 10:03:49 +11:00
3c5b1fe74f
H&S Updates
...
some punish fixes
hub toggles no longer pulse on pressure plate
2013-11-09 09:48:40 +11:00
ef0d233512
Dynamic server tinkering again.
2013-11-08 14:46:05 -08:00
cae10fe7b4
Fixes to DynamicServer Monitor
...
Fixed SSM disguise clunky movement.
2013-11-08 10:52:56 -08:00
dc062c7bb6
H&S Push
2013-11-07 19:49:21 +11:00
79b739fc14
Project for servermonitor
2013-11-07 00:22:42 -08:00
7cc880afd1
ServerMonitor tweaks.
2013-11-07 00:22:04 -08:00
8fa7b9f283
Helpers can use WARNINGS
2013-11-07 17:03:34 +11:00
e27f01e916
Fixed punish constructor bugs for dom/mk
2013-11-06 21:36:00 -08:00
079a58d2cd
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-06 20:38:41 -08:00
f8567dcfa6
Fix for scoreboard uppercase issue in hub.
2013-11-06 20:38:33 -08:00
8e7b5ac6fe
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-07 15:26:37 +11:00
6b577af7b4
Punish Update
...
H&S Additions
2013-11-07 15:25:46 +11:00
49e796c39d
Fixed Game.Core build issue.
...
Cleaned up a lot.
Added missing files for Mineplexer
2013-11-06 20:19:56 -08:00
e0d10f6550
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-06 19:48:27 -08:00
41e9ffb018
Removed BungeeSigns
...
Updated Bungee plugin to pull US servers only.
Added dynamic MOTD from mysql for BungeeCord.jar
Fixed crash for disguise block arm animation.
2013-11-06 19:48:00 -08:00
0d5b174ebe
Stacker/Party exceptions for YouTubers
2013-11-07 10:33:39 +11:00
9f11352f10
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-07 10:19:30 +11:00
03731de7f8
Rank changes
...
MAC no longer kicks lag/fly
some H&S stuff :O
2013-11-07 10:18:36 +11:00
70dae64389
added missing file.
2013-11-06 10:26:33 -08:00
0a50d9b127
ServerMonitor files.
2013-11-06 09:14:08 -08:00
9327e71519
MOre work on dynamic server baby!
2013-11-06 01:03:02 -08:00
ff6488b371
safe file separators
2013-11-05 16:10:14 -08:00
43d5b6441b
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-05 10:19:17 -08:00
2064c58d1b
Fixed up ServerStatusRepository to insert into specific columns
...
Fixed Dominate shop.
Some work on Server Monitor
2013-11-05 10:19:04 -08:00
bcb86fc911
PB gem for healing remove
2013-11-04 09:46:09 +11:00
e14bc76639
arcade map directory up up right left down up right update!
...
some paintball fixes
H&S start
2013-11-04 08:59:29 +11:00
6999d7979f
Added paintball to LobbyMenu
...
Fixed Lobby count in lobby menu
Fixed ultra/green kits in Paintball
2013-11-02 12:26:28 -07:00
a468ac1ae0
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-02 00:59:39 -07:00
b9560cf4da
Work on Dynamic server monitor.
2013-11-02 00:56:31 -07:00
1545873f62
news feed for hub
2013-11-02 18:56:21 +11:00
0cbefc1280
Paintball update!
2013-11-02 15:42:37 +11:00
24723cd5e5
paintball update
2013-11-02 10:09:07 +11:00
c72f1337e8
fixed memory leak in antihack
2013-11-01 10:40:33 +11:00
08497e474d
mobs no longer move as soon as they spawn. GET IN LINE BOYS!
2013-11-01 08:34:32 +11:00
7dcd58ec2d
HH debug prints
2013-11-01 08:27:45 +11:00
d41338b76a
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/Champions.java
2013-10-31 17:38:44 +11:00
ae4bf75485
Champs update
2013-10-31 17:36:41 +11:00
7b8608de95
Rah Rah, Custom Class Combat in Arcade!
2013-10-30 23:35:24 -07:00
bac425235d
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-30 20:26:08 -07:00
52ac670f3f
More dom changes
2013-10-31 12:43:54 +11:00
386e2e3067
Added Champs
...
MAC update
2013-10-31 09:45:11 +11:00
a307a4854f
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-28 18:45:19 -05:00
33c7d594a0
robin hood regen nerf
2013-10-29 10:43:04 +11:00
ad487e48bd
THIS IS HALLOWEEN THIS IS HALLOWEEN
2013-10-29 10:41:53 +11:00
7279f58b92
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-28 08:53:36 -05:00
c70b5c712b
Fixed crash items in Server Game Menu for Hub
2013-10-28 08:52:32 -05:00
ab9cce3910
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-28 22:31:03 +11:00
91ec162c88
slightly easier
2013-10-28 22:30:51 +11:00
3142bd517d
Fixed regen aura... wasnt working at all
2013-10-28 21:35:16 +11:00
9d47864503
Fixed player count in bungee plugin
2013-10-28 03:24:18 -05:00
afee32257d
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-28 02:22:30 -05:00
f0f7a4156f
saving heads to file
2013-10-28 17:53:25 +11:00
4306d2444f
Updated bungee library
...
Fixed server ping Event.java
Removed crash item in hub.
2013-10-28 01:37:23 -05:00
980b6420fe
fixed stacker item for 1.7
2013-10-28 15:48:06 +11:00
09a8cbe558
re-enabled waves
2013-10-28 14:08:55 +11:00
1d4f902298
HH CPU fixes
2013-10-28 13:54:10 +11:00
505dd57715
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-27 15:25:12 +11:00
4974fc17aa
Halloween balance (slightly easier)
...
Giant hitbox improved
2013-10-27 15:24:28 +11:00
845535991d
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-26 16:37:07 -05:00
0aee445e00
Added timeout check for status retrieval
2013-10-26 16:36:48 -05:00
7948fa6f71
cpu fix ;o
2013-10-27 06:21:43 +11:00
3892cd13f7
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-27 05:32:34 +11:00
c9a295d56e
Halloween event changes final
2013-10-27 05:32:21 +11:00
1781ed15c4
Fixed some drop item stuff.
2013-10-26 12:02:18 -05:00
95449fec26
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-26 11:06:19 -05:00
64e98c4a30
text now has glowstone behind it (for darkness)
2013-10-27 03:05:19 +11:00
7d8e79a234
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-26 11:01:22 -05:00
88eab4b1a3
Fixed gadget item slot.
...
Fixed some desc on mounts
2013-10-26 11:01:01 -05:00
d4affc8bb6
paintballs wont change near portals.
2013-10-27 02:53:38 +11:00
df36145800
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ItemGadget.java
Plugins/Mineplex.Hub/src/mineplex/hub/mount/types/Mule.java
2013-10-26 10:47:14 -05:00
0b0fa383f6
Finished up Gadget shop.
2013-10-26 10:45:41 -05:00
935599030b
moved witch (so its not default kit)
2013-10-27 02:44:14 +11:00
9a025eb540
Potion rename
2013-10-27 02:37:11 +11:00
55de25fded
removed testing toggle for mount
...
changed item gadget slot from 2 to 3
2013-10-27 02:22:38 +11:00
f838452b5c
uncommented waves
2013-10-27 01:46:46 +11:00
19e2946ce4
mule rename
2013-10-27 01:44:18 +11:00
b4e2145ad7
giant speed decrease
...
ghast teleports back if it flies too far away.
2013-10-27 01:43:41 +11:00
cd2c9dcdda
more tips
2013-10-27 01:20:10 +11:00
9bc9cc2bb8
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_Helmet.java
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ArmorGadget.java
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/Gadget.java
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ItemGadget.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/creatures/MobGhast.java
2013-10-26 08:53:38 -05:00
39cf5c3ed1
Tweaking on ghast.
...
Added gadget costs
Working on Gadget shop.
2013-10-26 08:50:12 -05:00
c672e68713
some help during boss fight.
2013-10-27 00:14:38 +11:00
7eb1cc6519
Halloween game additions
2013-10-27 00:06:44 +11:00
01cb69d28b
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-26 19:01:41 +11:00
723b57cd46
Added paintball gun Gadget
...
Added bat blaster Gadget
Halloween Game near-completed
Added SSM Witch
2013-10-26 19:01:26 +11:00
ca3979f4fa
Added witch disguise hurt sound
2013-10-25 20:12:01 -05:00
8958b8998f
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-26 11:35:02 +11:00
a52bd69558
Witch SSM
2013-10-26 11:34:05 +11:00
5470f847a9
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-25 19:06:43 -05:00
8883855297
Added witch disguise
...
Added missing files.
2013-10-25 19:05:26 -05:00
49e8c15f44
important update
2013-10-25 22:56:28 +11:00
e8ddfc266e
fsd6gty72 tjn6g wgh
2013-10-25 22:20:46 +11:00
61b7a86b67
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-25 21:25:36 +11:00
b74b8e3915
Halloween event changes
2013-10-25 21:25:23 +11:00
e5f99331dd
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-25 05:16:15 -05:00
c3754d766b
Added in vegetate check for EntityGhast.
2013-10-25 05:15:17 -05:00
5563d94111
Halloween event update
...
hub News
hub mounts
hub gadgets
2013-10-25 19:20:14 +11:00
21128eb153
Prepping filterChat and CoreClientManager for mysql
...
Removed get all clients at server start.
2013-10-23 16:36:13 -05:00
1977572ced
Added Halloween Minigame
...
Updated gadgets and other minor things.
2013-10-22 15:46:31 +11:00
7cec55713c
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-19 16:52:27 +11:00
1944c0003c
Hub gadgets
2013-10-19 16:52:15 +11:00
985ce795d2
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-18 00:50:49 -07:00
90fbc397ff
Converted gem rewards to boolean return from website.
...
Implemented gem transactions and source.
2013-10-18 00:46:06 -07:00
Chiss
Jonathan Williams
Jonathan Williams