Cheese
048919491f
Merge branch 'master' into monster-maze
2015-09-25 11:59:32 +10:00
Mysticate
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
Mysticate
9a70d4997a
Fix
2015-09-24 21:10:12 -04:00
Mysticate
d9b6d8f0e3
Changes
2015-09-24 21:01:18 -04:00
AlexTheCoder
cd33bf8dd8
- Fixed updaterank and testrank scoreboard conflict
2015-09-24 11:47:50 -04:00
AlexTheCoder
a488bfab3e
- Rewritten testrank system
...
- Multiple rank improvements for real-time use
- Removed /updaterank from Jr.Dev
2015-09-24 11:44:45 -04:00
Mysticate
7445fda922
Made the thing a lot better. Yay! :D
2015-09-24 11:04:05 -04:00
fooify
4663aa3eaa
updated mazes
2015-09-24 07:29:48 -07:00
Mysticate
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
Mysticate
842da3d6fb
Tons of changes.
2015-09-23 23:44:10 -04:00
fooify
a301c87efc
workstuffchanges on monster maze
2015-09-23 19:23:21 -07:00
Christopher Jozsa
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
Mysticate
125b823a65
Fixed achievement arcade page size.
2015-09-23 15:43:14 -04:00
Mysticate
71408fabd2
One thing.
2015-09-23 15:24:34 -04:00
Mysticate
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
Mysticate
84331901d4
Added achievements and final polish.
2015-09-23 15:18:44 -04:00
fooify
0ad91a6b0b
more changes! :D
2015-09-23 07:10:48 -07:00
Shaun Bennett
2b902c5193
Add created by, enabled by, and disabled by to botspam module
2015-09-23 00:25:39 -04:00
Shaun Bennett
3ae043e7d8
Merge remote-tracking branch 'origin/master'
2015-09-22 01:38:52 -04:00
Shaun Bennett
cf618abd4e
BotSpam Module
2015-09-22 01:38:45 -04:00
Cheese
4519f2dda1
Merge branch 'EventGameUpdates'
2015-09-22 14:59:17 +10:00
fooify
1f84907309
more changes to monstermaze
2015-09-20 07:40:24 -07:00
fooify
0581474a16
lots of work on Monster Maze
2015-09-18 08:25:11 -07:00
Shaun Bennett
901dad2f8a
Add vote3 to bonusmanager
2015-09-17 22:31:18 -04:00
libraryaddict
5e8fc77164
Add pages to spectator and in-progress server menu
2015-09-17 04:34:45 +12:00
Sarah
362d99a819
Fixing up Gem signs, Effects etc.
2015-09-15 07:10:39 +02:00
fooify
2de7fff267
Merge remote-tracking branch 'origin/master' into monster-maze
2015-09-13 08:45:34 -07:00
fooify
aa8cb8943e
more work on monster maze
2015-09-13 08:42:26 -07:00
Sarah
7ca6f58108
Adding Gem signs.
2015-09-13 10:25:44 +02:00
Sarah
a46cb2c274
last fix in the listAreaInfo method.
2015-09-13 00:35:22 +02:00
Sarah
53d5c2fd0e
adding area info command.
2015-09-13 00:30:55 +02:00
Sarah
112f94a842
forgot to add command to remove potion effects.
2015-09-13 00:00:47 +02:00
Sarah
fcec6253cd
fixing @p on signs, adding potioneffects and gadgets to areas.
2015-09-12 23:56:38 +02:00
Sarah
b6ffee73f5
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into EventGameUpdates
2015-09-12 21:17:45 +02:00
fooify
55ac104e2c
took forever to get it working, but the maze parsing works! :)
2015-09-12 09:50:06 -07:00
Jonathan Williams
1417d31b73
Added 60s delay to timings enable check.
2015-09-11 23:57:26 -07:00
Cheese
c9971bb117
fixed duplicate rank name
2015-09-12 16:45:22 +10:00
Cheese
6216f2ced4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-09-12 16:33:44 +10:00
Jonathan Williams
a7d4a7534f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-09-11 22:51:04 -07:00
Jonathan Williams
2380b9041d
Added automatic timings report in the event of lag.
...
Added more exception handling around LoadingWindow
2015-09-11 22:50:53 -07:00
Cheese
119dc8ab52
changed name of method
2015-09-12 15:01:18 +10:00
Sarah
5c0ada3df6
Implementing RequiredRank file and command.
2015-09-12 06:39:40 +02:00
Cheese
4184fe20cf
minor fixes
2015-09-12 14:09:04 +10:00
Sarah
b56813deef
Improving /e commands (/e kick, /e area, etc)
2015-09-12 04:33:10 +02:00
Cheese
5a79c51506
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-09-10 13:57:48 +10:00
Cheese
a4cc70c3f0
new small youtuber rank
2015-09-10 13:17:11 +10:00
fooify
5824ec6df0
lots of changes to monster maze, check trello for list
2015-09-07 07:08:00 -07:00
Sarah
4240026024
Adding Areas and a few more commands like /e kick and /e tempgadget to the event game.
2015-09-06 18:55:00 +02:00
Sarah
5712af8ddc
Adding Redstone function signs for events.
2015-09-05 20:38:51 +02:00
fooify
c648d7c186
stuff, things...things, stuff (Monster Maze)
2015-09-05 09:30:51 -07:00