AlexTheCoder
|
09e44d3372
|
- Fixed version stuff
|
2015-09-23 13:47:49 -04:00 |
|
AlexTheCoder
|
3ee6c5c7c8
|
- Fix Merge Error
|
2015-09-23 13:25:41 -04:00 |
|
AlexTheCoder
|
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 |
|
AlexTheCoder
|
512714219b
|
- Visual edits
|
2015-09-23 13:04:30 -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 |
|
AlexTheCoder
|
05f47be864
|
- Some fixes
|
2015-09-19 16:38:07 -04:00 |
|
AlexTheCoder
|
3a1acb9f37
|
- Code Cleanup
- Transitioning to banners fully
- Preparation to remove banner bugs
|
2015-09-19 00:41:23 -04:00 |
|
AlexTheCoder
|
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 |
|
AlexTheCoder
|
d4b8cb253c
|
- Edited messages as per owner request
|
2015-09-18 20:08:22 -04:00 |
|
libraryaddict
|
8015f5428d
|
Flags stuff
|
2015-09-19 08:36:23 +12: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 |
|
Cheese
|
aa30c866fd
|
flurrry
|
2015-09-18 10:22:16 +10:00 |
|
libraryaddict
|
5e8fc77164
|
Add pages to spectator and in-progress server menu
|
2015-09-17 04:34:45 +12:00 |
|
AlexTheCoder
|
e6ecd2d5e1
|
- Fix for stolen message
|
2015-09-15 18:38:02 -04:00 |
|
Sarah
|
362d99a819
|
Fixing up Gem signs, Effects etc.
|
2015-09-15 07:10:39 +02:00 |
|
AlexTheCoder
|
6c5c2f4c4e
|
- Added slowness to flag carriers and removed any active potion effects they had
|
2015-09-14 20:38:32 -04:00 |
|
AlexTheCoder
|
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 |
|
AlexTheCoder
|
2018374b06
|
- Fixed a color bug
|
2015-09-14 18:53:10 -04:00 |
|
AlexTheCoder
|
abaf94618c
|
- Increase flag respawn time
- Fix flag timer being black
|
2015-09-14 18:42:08 -04:00 |
|
Cheese
|
ac269839c5
|
squid skill
|
2015-09-14 14:14:06 +10:00 |
|
Cheese
|
d9142ac33f
|
smash balance
|
2015-09-14 12:34:55 +10: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 |
|