6cc33fd6c6
Merge branch 'thanos-bug-fixes'
2015-10-16 12:53:43 +11:00
41511dce7b
Merge remote-tracking branch 'origin/master' into monster-maze
2015-10-15 21:19:24 -04:00
3dda9352e7
Progress
2015-10-16 13:32:23 +13:00
4205dc6c25
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
2015-10-15 12:34:34 +13:00
1c52bd4f64
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-14 14:34:51 +11:00
86bad0be30
mods can check other players skills
2015-10-14 14:34:30 +11:00
0df637b80a
Run punishBot in main server thread
2015-10-13 22:56:14 -04:00
a049d7666f
Merge remote-tracking branch 'origin/master' into monster-maze
2015-10-13 22:14:19 -04:00
45cd2a38e1
admins can botspam
2015-10-14 11:55:59 +11:00
1842eae7f0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-13 23:22:58 +11:00
d105ea5d7e
botspam addition
2015-10-13 23:19:48 +11:00
58a86c5abb
That's the easy stuff done..
2015-10-13 19:49:15 +13:00
e1d8b25e91
- Fix misc champs bugs
2015-10-13 01:24:57 -04:00
a292fdb3c5
Added failsafe for ServerMonitor.
2015-10-12 22:26:24 -05:00
f5b80c941c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-13 11:58:27 +11:00
e8388437b6
botspam now checks for chat as well
2015-10-13 11:58:14 +11:00
3e5ac58ae9
helpers!
2015-10-13 11:23:00 +11:00
37639a413c
fixed skill stuff
2015-10-13 11:22:10 +11:00
0bd026f506
- Fixed merge issues
2015-10-12 18:04:35 -04:00
f497eab633
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-10-12 17:54:11 -04:00
be96842de5
Ultra
2015-10-12 17:02:34 -04:00
dceba51060
- Fix random blockhunt bug with mounts and infestor
2015-10-12 03:09:40 -04:00
bbb863ba92
- Merge conflict patch
2015-10-12 02:36:10 -04:00
2b9a66e7b2
more ssm update
2015-10-12 16:32:23 +11:00
1aecc9505c
Add region to titan, new MOTD
2015-10-12 01:30:31 -04:00
bef942f6da
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank
2015-10-12 00:47:56 -04:00
6a173073a4
added flag to projectiles
...
work on cow kit
2015-10-12 14:39:14 +11:00
dab258dcdd
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Libraries/BungeeCord.jar
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java
Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java
Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
2015-10-12 16:22:52 +13:00
3eb36a6581
Prevented farming
2015-10-11 22:43:21 -04:00
2abf3edad4
Made items for titanic cosmetics dyes.
2015-10-11 22:29:26 -04:00
b6d573a4d5
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
2015-10-11 22:25:25 -04:00
7a4ccdf680
Bug fixes
2015-10-11 22:17:34 -04:00
dda65b4c77
Fixed tnt exploding lobbies
2015-10-11 19:56:36 -04:00
20dd9c683b
Merge remote-tracking branch 'origin/master' into monster-maze
...
Conflicts:
Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
Changed the scoreboard a bit, added it to MPS.
2015-10-11 10:52:45 -04:00
606937d227
Fixed flashbang glitch
2015-10-11 09:42:36 -04:00
e6485a9009
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-10 23:02:36 -06:00
5866e0cce6
Reducing max connections for the DBPool to 3.
2015-10-10 23:02:08 -06:00
f23bf18928
adhering to mysts OCD
2015-10-11 14:50:57 +11:00
f3e2f3c145
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-11 14:48:17 +11:00
cb9e8f8e0b
pumpkin smasher achievement
2015-10-11 14:48:02 +11:00
435e74225a
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
2015-10-10 23:35:33 -04:00
83d1e011fc
Changes.
2015-10-10 23:33:54 -04:00
998d5f6984
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-10 21:25:29 -06:00
061a7b7c73
Fixed Pet FK errors.
...
Added SUPPORT to acceptable updateRank command.
2015-10-10 21:24:47 -06:00
8b75664627
queued holiday transactions
2015-10-11 12:54:35 +11:00
6860fa608a
titan placeholder perks
...
art
fixed pumpkin gem count
2015-10-11 11:26:09 +11:00
72d943f51b
Restored skills to pre-eula ultra
2015-10-10 16:20:28 -04:00
5a8e500ec0
Fixed another thing
2015-10-10 16:15:10 -04:00
5e7ddb968e
Changes and bug fixes.
2015-10-10 15:54:18 -04:00
da6b1316d3
removed pumpkins from MPS
2015-10-10 22:47:19 +11:00
323842c693
fixed mods staying in flight
2015-10-10 19:36:38 +11:00
6f14c75f70
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-10 19:28:26 +11:00
6cf786eb8c
Merge branch 'Myst_HALLOWEEN'
2015-10-10 19:28:08 +11:00
1026a2ae22
fixed explosions
2015-10-10 19:27:54 +11:00
a242c6b592
Halloween Update finishes
2015-10-10 03:23:37 -04:00
e9207acd7f
Merge branch 'alex-halloween'
2015-10-10 17:38:09 +11:00
7bc3b4970b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java
2015-10-10 17:34:17 +11:00
67a1f4ce8d
Titan Giveaway:
...
- Added Titan pumpkin animation
Titan Perks (For later, Removed from Menu):
- Added Kronos Particle
2015-10-10 02:31:52 -04:00
930cfa5cb8
DONE
2015-10-10 02:30:11 -04:00
f1e9acbb58
Titan giveaway
2015-10-10 02:19:05 -04:00
245a42c8e0
animation is sexi
2015-10-10 02:13:04 -04:00
30a9196430
Done with animation.
2015-10-10 01:43:31 -04:00
9a7357e484
Work
2015-10-10 01:00:49 -04:00
88b4ac96e5
- Achievement stuff
2015-10-09 23:15:19 -04:00
36fabf93b6
Merge remote-tracking branch 'origin/master'
2015-10-09 23:14:13 -04:00
bc7bf8a2e2
fixes/debug
2015-10-09 23:13:39 -04:00
512e08af19
Removed all create table statements.
2015-10-09 21:02:35 -06:00
1127764cc3
Secsi
2015-10-09 22:44:49 -04:00
7851cb451a
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
2015-10-09 22:34:05 -04:00
aa9fd1abf3
Titan giveaway work
2015-10-09 22:14:10 -04:00
90c685617d
Animation
2015-10-09 22:14:01 -04:00
611fb88f15
Commented out unnecessary table creation statements (tables already exist in database and these statements are causing database lag under high player load).
2015-10-09 20:40:50 -04:00
ed89f5f4cc
anim example for myst
2015-10-10 10:46:12 +11:00
43f38c18ee
animation
2015-10-10 10:40:44 +11:00
d99c64e45d
fixed merge error
2015-10-10 10:37:20 +11:00
02c6eccfda
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
2015-10-10 10:36:42 +11:00
7dbd9da582
dragon sale Bar
2015-10-10 10:35:48 +11:00
ba36ff565d
Merge remote-tracking branch 'origin/master'
2015-10-09 18:23:55 -04:00
97ef4a4252
Pushing titan giveaway stuff for laptop
2015-10-09 18:23:47 -04:00
586cc6e3e0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-09 09:40:58 -06:00
ff1431b652
Fixed players glitching to chests before game starts.
2015-10-09 10:21:35 -04:00
ff42e05a8d
Merge branch 'Myst_HALLOWEEN'
2015-10-09 14:20:58 +11:00
99fd88473b
rank colors
2015-10-09 14:20:02 +11:00
fb4d08931c
Spider mount improvements.
2015-10-08 23:18:37 -04:00
d9dd471db6
removed annoying debug
2015-10-09 14:04:12 +11:00
c03c8163c5
fixed exploision stuff
2015-10-09 14:01:58 +11:00
90d0fcb36d
Merge branch 'Myst_HALLOWEEN' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into Myst_HALLOWEEN
2015-10-08 22:53:45 -04:00
598ea84e7a
Fixed explosions and cleaned up.
2015-10-08 22:52:57 -04:00
d18353e592
Merge branch 'Myst_HALLOWEEN' of ssh://184.154.0.242:7999/min/Mineplex into Myst_HALLOWEEN
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
2015-10-09 13:44:41 +11:00
41678eaf35
fixed scoreboard bug
2015-10-09 13:42:37 +11:00
1011c36c43
Fixed lobby being destroyed.
2015-10-08 22:41:45 -04:00
96f14f4fda
Fixed kit item names.
2015-10-08 22:31:20 -04:00
3802d47a37
Made the thing bold.
2015-10-08 22:29:22 -04:00
082b16fe0d
Stuff and things to help make mounts be cool.
2015-10-08 22:28:07 -04:00
54c76c9d9c
fixed text
2015-10-09 12:27:30 +11:00
a234fbce1e
Merge branch 'Myst_HALLOWEEN'
2015-10-09 12:17:57 +11:00
ed31bf9886
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
2015-10-08 21:16:24 -04:00
9254ca9162
K reverted + fixed bug
2015-10-08 21:12:38 -04:00
24568a40f3
Merge branch 'Myst_HALLOWEEN'
2015-10-09 12:05:24 +11:00
483ab13c2b
workaround for error where accountid is never set
2015-10-09 12:04:35 +11:00
17ba04348d
stats debug
2015-10-09 11:53:08 +11:00
84cbee4535
Fixed it again
2015-10-08 20:52:17 -04:00
145832b326
Fixed mounts bc chiss is bad
2015-10-08 20:50:39 -04:00
21dc0dc962
Merge branch 'Myst_HALLOWEEN'
2015-10-09 11:47:20 +11:00
ec5694737c
statsmanager debug
...
rank fix
2015-10-09 11:44:12 +11:00
2cace7419f
Made Destructor sexi
2015-10-08 20:42:29 -04:00
92bab25a3f
Fixed Gust void stealing.
2015-10-08 20:38:33 -04:00
b8597d7161
Paintball stats.
2015-10-08 20:37:26 -04:00
cdb9741438
Changed the SG icon in hub, fixed EULA breaking thing in Class Shop
2015-10-08 20:36:16 -04:00
97d6f8fb42
Fixed placing walls in water.
2015-10-08 19:10:19 -04:00
8f826f6e83
Fixed blocks falling into floor in Build.
2015-10-08 19:04:51 -04:00
30e3c56635
Fixed ground issues in BUILD.
2015-10-08 18:58:30 -04:00
46bf963d44
Fixes not being able to reload dropped guns w/ 0 ammo.
2015-10-08 18:56:23 -04:00
979e68dcc7
Fixed the Minestrike multiple grenades bug.
2015-10-08 18:41:40 -04:00
ef62fb5adf
Made it so that when played on an MPS, HH won't give items. Yay!
2015-10-07 22:57:30 -04:00
8a8591ae7f
Merge branch 'master' of
...
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
Myst_HALLOWEEN
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/mount/MountManager.java
2015-10-07 22:19:10 -04:00
668454f156
Fixed things
2015-10-07 22:10:57 -04:00
f2485854ef
Improved spider.
2015-10-07 22:06:57 -04:00
70f3ccf703
Fixed spider morph
2015-10-07 21:53:23 -04:00
e864e0867a
Adds mount spider and fixes a BH bug.
2015-10-07 21:47:10 -04:00
3c437925f1
halloween prep
2015-10-08 12:36:00 +11:00
191392825f
Merge branch 'Myst_EVO'
2015-10-08 12:07:21 +11:00
f28d83cbd7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-08 12:05:51 +11:00
c94184c5ae
reduced number of falling blocks in skywars by 80%
...
added halloween horror mount
2015-10-08 12:04:28 +11:00
5378ece214
Fixed chicken being able to fly..
2015-10-06 21:09:53 -04:00
a0d0590777
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-10-06 21:04:49 -04:00
8fb82507e1
Merge remote-tracking branch 'origin/master'
2015-10-06 12:24:34 -04:00
9cb3f250e2
Remove streak record data until a better solution is done
2015-10-06 12:24:16 -04:00
e2e2356b04
stuffs
2015-10-06 13:25:15 +11:00
643f47763e
Improved consistency with the F5 message
2015-10-04 20:28:21 -04:00
0de34c15ab
NO more endercrystal go boom boom yay
2015-10-04 20:23:41 -04:00
9c1ba5f3d1
Changes on bomb error messages after QA recommendations.
2015-10-04 21:23:50 +03:00
0eeea58a01
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-04 11:50:20 -05:00
9f1c4653f4
Fix for Customer support item command with the removal of item categories.
2015-10-04 11:48:16 -05:00
6c73b1a5ac
Start moving i18n into master.
2015-10-04 15:24:58 +01:00
c2518bc6c4
Some additional bug fixes were applied on the previous commit.
...
Water damage by TNT on game lobbies is now patched.
2015-10-04 16:32:34 +03:00
026c596de2
Minestrike bug fixes and minor changes
...
- Added a right-click message tip when the player with a bomb tries to place by left clicking.
- Changes in one of the tip messages while in game lobby.
- Moltovs and Incendiaries were not triggered once thrown to the ground.
- Players were able to extinguish grenade fire with a knife.
- The bomb was able to be planted after a round was over.
- On sniper rifles, scope was not removed if the match was ended.
2015-10-04 13:22:12 +03:00
f9ea325da1
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-04 00:24:11 -05:00
ba17404212
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-04 00:20:52 -05:00
1830705692
Removed ItemCategories to reduce strain on the database with queries that are more complex than they need to be.
...
Increased Firework recharge time.
2015-10-04 00:20:41 -05:00
2504493ebc
Fixed four super paintball bugs.
...
- Projectiles could paint wool in the waiting lobby.
- When players fell in the void, they didn't got killed.
- Players that were painted could take off their armor.
- Players that were painted could logout and the skeleton would still stay there.
2015-10-04 00:34:00 +03:00
a7ab0cd723
ADDED MORE KITS I'M DONE HOORAY LOVE ME @CHISS
2015-10-02 22:43:29 -04:00
c9ff420a79
Now chooses a different maze every game.
2015-10-02 20:43:57 -04:00
993c9783ec
Add Votifier Jar, display team stats for SG, SW, SSM
2015-10-02 13:15:02 -04:00
8911617a0c
Remove BungeeSigns again?
2015-10-01 14:01:36 -04:00
3f6490f14a
Gave health on safe pad <<<<<3
2015-10-01 10:47:37 -04:00
bc84dc6817
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-01 07:39:17 -07:00
631bd9cfa6
Removed sale notification.
...
Removed queue create table query.
Added try-catch for ServerMonitor to prevent stat storage from affecting normal operation.
2015-10-01 07:38:59 -07:00
a6d7cccbe5
Fixes
2015-09-30 22:31:03 -04:00
4a023c4644
Tweaks - I THINK I'M DONE HOORAY
2015-09-30 21:21:29 -04:00
05b735ba40
Fixed jump system
2015-09-30 20:28:35 -04:00
c39806a4e3
Kewl stuff. Yay
2015-09-30 20:01:51 -04:00
09ef2d73ae
Grammar <3
2015-09-30 19:45:29 -04:00
68c6ba595e
Visual enhancements.
2015-09-30 19:31:36 -04:00
d089ffeb30
Added a firework when a mob gets rekt
2015-09-30 18:48:45 -04:00
250e9cff13
Fixed a possible NPE
2015-09-30 18:43:52 -04:00
a25e2c575d
Peace of mind stuff.
2015-09-30 18:35:56 -04:00
c3b2c10934
FINALLY FIXED THIS MONSTER MAZE BUG :D
2015-09-29 19:14:18 -07:00
2d173a5be4
Fixed a jumper perk.
2015-09-28 21:03:58 -04:00
bcfd8fcec7
bug fixes:
...
- fixed bugs
- fixed more bugs
- after that, more bugs were fixed
2015-09-28 17:54:56 -07:00
437e62c7db
Fix priority for dupe fix
2015-09-28 20:44:57 -04:00
8a9cc9ff14
Food Dupe Fix
2015-09-28 20:42:14 -04:00
00eecc0325
Fixes
2015-09-28 20:33:38 -04:00
3a10677b10
AI bug should be fixed, I need Mysticate to test though
2015-09-28 15:15:51 -07:00
92436c8f9d
Merge pull request #60 in MIN/mineplex from alex-bugfixes to master
...
* commit '8a94602aefc1e4ea3490da434f14205f99ba1d8e':
Fixed bug https://trello.com/c/KBhgw0zK/115-hg-mismatching-achievement-text
Made rank unlock lore colored based on rank required for item (QA Requested)
Made Legend cosmetics follow the same rules as all other premium rank cosmetics, as many staff were previously legend and lacked access to features they had paid for.
Marked the Bunny Morph to reflect its no longer available status
Fixed previous ownership not being transferred
Fix bug https://trello.com/c/Jf7bht6V/138-general-tp-before-game-starts
Fixed bug https://trello.com/c/ZYS3Ddxw/134-hub-emerald-twirl-particles-are-called-green-ring-in-the-gui
2015-09-27 22:39:50 -05:00
5a5dbcfe67
- Assorted bugfixes
2015-09-27 23:36:51 -04:00
00a8cf769b
Swag
2015-09-27 14:55:37 -04:00
7e40d0d4bb
Lots of cool stuff
2015-09-27 12:10:52 -04:00
eea7ef8350
Swag
2015-09-27 02:11:28 -04:00
54eca7fa9e
Lots of work.
2015-09-26 23:18:05 -04:00
cddc6674a5
- Fixed bug with Dwarf Toss
2015-09-26 19:22:17 -04:00
eae894c879
Merge pull request #65 in MIN/mineplex from mrsomeone12_SmallFixes to master
...
* commit '436f63860ecef028d23dae28ceb52e466e90270b':
NBT overflow patch
2015-09-26 17:32:30 -05:00
ee5934c7aa
Fix for punishments to match names exactly
...
Fix for expiring ranks.
Fix for EU Lobby count.
2015-09-26 18:31:37 -04:00
1ad61a09e4
Should include the file with the change commit.
2015-09-26 18:30:45 -04:00
0d8ef7fea3
Fixed lobby balancing technique.
...
Removed random UUID for bungee redis database.
Enabled bungee name in debug output for bungee rotator.
2015-09-26 18:25:29 -04:00
9350386361
Lots of things. :D
2015-09-26 15:08:43 -04:00
8e9a3e90a7
Merge branch 'monster-maze' of
...
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/Maze.java
2015-09-26 00:00:46 -04:00
30d2281785
Lots of things
2015-09-25 23:59:31 -04:00
1e018cf74a
Improved Smasher
2015-09-25 20:21:06 -07:00
2de409c2f2
Made the mazes do things.
2015-09-25 20:14:46 -04:00
436f63860e
NBT overflow patch
...
Patch for the NBT overflow exploit which allowed any player to overflow
and drain the server for memory making it freeze and eventually crash.
2015-09-26 01:48:38 +02:00
a0ec656bc1
Fixed another tracker.
2015-09-25 12:49:21 -04:00
b2f1f7d2ae
Fixed the tracker for pilot.
2015-09-25 11:38:32 -04:00
1cc503bd3b
- Added resupply points [requested]
2015-09-25 04:37:54 -04:00
49908e7550
- Added game to hub text
2015-09-25 04:28:11 -04:00
03d1d85388
- Testing improvements
2015-09-25 04:23:24 -04:00
7c04e5608d
- Added new achievement 'Clutch'
...
- Made new achievements needed for achievement skills
2015-09-25 04:17:20 -04:00
218aa8c584
- Fixed all formatting
2015-09-25 03:52:34 -04:00
f23ef8eea0
- Returned to temporary placeholder block system to prepare for 1.8 update
2015-09-25 03:41:29 -04:00
88a48277c0
Flags, change to packets
2015-09-25 17:15:09 +12:00
5f45e8c1d3
- Misc changes [increased game time, captures required]
2015-09-25 00:44:28 -04:00
5b42d25bff
- Added achievement and stat stuff
...
- Fixed banner bugs
2015-09-24 23:16:44 -04:00
e66d8765e7
Merge branch 'monster-maze' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into monster-maze
2015-09-24 23:02:27 -04:00
60c4e5812a
Fixed trackers
2015-09-24 23:02:19 -04:00
69ed764483
Added another maze.
2015-09-24 19:55:43 -07:00
a9f20a573c
Merge branch 'monster-maze' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into monster-maze
2015-09-24 21:10:31 -04:00
9a70d4997a
Fix
2015-09-24 21:10:12 -04:00
d9b6d8f0e3
Changes
2015-09-24 21:01:18 -04:00
cd33bf8dd8
- Fixed updaterank and testrank scoreboard conflict
2015-09-24 11:47:50 -04:00
a488bfab3e
- Rewritten testrank system
...
- Multiple rank improvements for real-time use
- Removed /updaterank from Jr.Dev
2015-09-24 11:44:45 -04:00
7445fda922
Made the thing a lot better. Yay! :D
2015-09-24 11:04:05 -04:00
4663aa3eaa
updated mazes
2015-09-24 07:29:48 -07:00
5de016c077
Merge branch 'monster-maze' of
...
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MonsterMaze.java
2015-09-23 23:46:21 -04:00
842da3d6fb
Tons of changes.
2015-09-23 23:44:10 -04:00
a301c87efc
workstuffchanges on monster maze
2015-09-23 19:23:21 -07:00
9a3ef895c9
Merge pull request #38 in MIN/mineplex from mrsomeone12_SmallFixes to master
...
* commit '633cbdabe279a9ec1a57d96d6585f58a6d3754df':
player.isOnGround() is controlled by packets from the player, meaning players can easily fake being on the ground resulting in infinite double jumps. player.getFallDisance() is also reset when isOnGround() returns true, meaning we'll need to manually check if the player is on the ground.
2015-09-23 19:37:48 -05:00
125b823a65
Fixed achievement arcade page size.
2015-09-23 15:43:14 -04:00
71408fabd2
One thing.
2015-09-23 15:24:34 -04:00
81e780d400
Merge branch 'monster-maze' of
...
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MMMazes.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/Maze.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MonsterMaze.java
2015-09-23 15:23:08 -04:00
84331901d4
Added achievements and final polish.
2015-09-23 15:18:44 -04:00
d5ef15cd6d
- Trying to fix errors
2015-09-23 14:00:19 -04:00
09e44d3372
- Fixed version stuff
2015-09-23 13:47:49 -04:00
3ee6c5c7c8
- Fix Merge Error
2015-09-23 13:25:41 -04:00
c709980db3
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-09-23 13:08:25 -04:00
512714219b
- Visual edits
2015-09-23 13:04:30 -04:00
0ad91a6b0b
more changes! :D
2015-09-23 07:10:48 -07:00
2b902c5193
Add created by, enabled by, and disabled by to botspam module
2015-09-23 00:25:39 -04:00
3ae043e7d8
Merge remote-tracking branch 'origin/master'
2015-09-22 01:38:52 -04:00
cf618abd4e
BotSpam Module
2015-09-22 01:38:45 -04:00
4519f2dda1
Merge branch 'EventGameUpdates'
2015-09-22 14:59:17 +10:00
1f84907309
more changes to monstermaze
2015-09-20 07:40:24 -07:00
05f47be864
- Some fixes
2015-09-19 16:38:07 -04:00
3a1acb9f37
- Code Cleanup
...
- Transitioning to banners fully
- Preparation to remove banner bugs
2015-09-19 00:41:23 -04:00
52a5c63166
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-09-18 20:08:43 -04:00
d4b8cb253c
- Edited messages as per owner request
2015-09-18 20:08:22 -04:00
8015f5428d
Flags stuff
2015-09-19 08:36:23 +12:00
0581474a16
lots of work on Monster Maze
2015-09-18 08:25:11 -07:00
901dad2f8a
Add vote3 to bonusmanager
2015-09-17 22:31:18 -04:00
aa30c866fd
flurrry
2015-09-18 10:22:16 +10:00
5e8fc77164
Add pages to spectator and in-progress server menu
2015-09-17 04:34:45 +12:00
e6ecd2d5e1
- Fix for stolen message
2015-09-15 18:38:02 -04:00
362d99a819
Fixing up Gem signs, Effects etc.
2015-09-15 07:10:39 +02:00
6c5c2f4c4e
- Added slowness to flag carriers and removed any active potion effects they had
2015-09-14 20:38:32 -04:00
0035f3abb0
- Added requested flag location updating
...
- Added sudden death mode when the timer runs out and the game is tied, respawning is turned off and the first to capture a flag wins
2015-09-14 18:54:40 -04:00
2018374b06
- Fixed a color bug
2015-09-14 18:53:10 -04:00
abaf94618c
- Increase flag respawn time
...
- Fix flag timer being black
2015-09-14 18:42:08 -04:00
ac269839c5
squid skill
2015-09-14 14:14:06 +10:00
d9142ac33f
smash balance
2015-09-14 12:34:55 +10:00
2de7fff267
Merge remote-tracking branch 'origin/master' into monster-maze
2015-09-13 08:45:34 -07:00
aa8cb8943e
more work on monster maze
2015-09-13 08:42:26 -07:00
7ca6f58108
Adding Gem signs.
2015-09-13 10:25:44 +02:00
a46cb2c274
last fix in the listAreaInfo method.
2015-09-13 00:35:22 +02:00
53d5c2fd0e
adding area info command.
2015-09-13 00:30:55 +02:00
112f94a842
forgot to add command to remove potion effects.
2015-09-13 00:00:47 +02:00
fcec6253cd
fixing @p on signs, adding potioneffects and gadgets to areas.
2015-09-12 23:56:38 +02:00
b6ffee73f5
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into EventGameUpdates
2015-09-12 21:17:45 +02:00
55ac104e2c
took forever to get it working, but the maze parsing works! :)
2015-09-12 09:50:06 -07:00
1417d31b73
Added 60s delay to timings enable check.
2015-09-11 23:57:26 -07:00
c9971bb117
fixed duplicate rank name
2015-09-12 16:45:22 +10:00
6216f2ced4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-09-12 16:33:44 +10:00
Cheese
Mysticate
libraryaddict
Shaun Bennett
AlexTheCoder
Jonathan Williams
Peter Miller
Shaun Bennett
Thanos paravantis
alexmack929
fooify
xGamingDudex
Sarah