Commit Graph

3394 Commits

Author SHA1 Message Date
Aaron Brock
762772a079 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-07 03:28:38 -04:00
Aaron Brock
f61d6fc69d Time to day!
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-07 03:28:14 -04:00
Aaron Brock
63fb1a49d4 Moo
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-07 03:26:59 -04:00
Cheese
62cf373322 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-07 16:52:16 +10:00
Cheese
b0bbbf506a utilfile 2015-07-07 16:51:57 +10:00
Aaron Brock
b65d75ab0d Moo 2015-07-07 00:38:00 -04:00
Aaron Brock
af8d1bdc83 Moo
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-07 00:36:17 -04:00
Cheese
bcc7e1fb65 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-07 12:36:47 +10:00
Cheese
02c5dd0dfa world deletion 2015-07-07 12:36:32 +10:00
Aaron Brock
d125bf8e8e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-06 22:27:13 -04:00
Cheese
769d50f1c7 removed test code 2015-07-07 12:22:37 +10:00
Aaron Brock
547d496853 Moo
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-06 22:22:14 -04:00
Cheese
a1ff9c75b2 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-07 10:44:37 +10:00
Cheese
804d669513 return types 2015-07-07 10:44:24 +10:00
libraryaddict
2bec753a34 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-07 12:30:37 +12:00
libraryaddict
bff3897fab Perks and kits: Change priority for unregistering to high, add new method to Perk firing when perk listener is registered. 2015-07-07 12:30:20 +12:00
Aaron Brock
b89cc7818c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-06 19:45:52 -04:00
Aaron Brock
0c406ea760 Added STUFF AND THINGS!!
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-06 19:45:28 -04:00
Shaun Bennett
6c8c3946a3 Revert "Add IntelliJ IDE library files"
This reverts commit 71d696278d.
2015-07-06 17:06:29 -05:00
Ben Sihota
71d696278d Add IntelliJ IDE library files 2015-07-06 13:48:47 -07:00
Aaron Brock
844aa44dc4 Added Spectate stuff!
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-06 02:03:05 -04:00
Aaron Brock
ac20f55391 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-05 22:45:47 -04:00
Aaron Brock
3f202d39ae LobbyCountdown stuff
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-05 22:45:14 -04:00
Cheese
cca26165cd swapped sale back to 50% 2015-07-06 11:42:54 +10:00
Aaron Brock
b4349a164b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-05 19:48:56 -04:00
Aaron Brock
45146aa75b Stuff
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-05 19:48:35 -04:00
Cheese
79cb4ee114 fixed ready 2015-07-06 09:48:00 +10:00
Cheese
b618c7b255 IS THE WORLD READY PLEASE 2015-07-06 09:46:49 +10:00
Cheese
5339b792ac moved files 2015-07-06 09:18:35 +10:00
Aaron Brock
2e328520a0 Renamed from dir from bench to gameengine
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-05 19:09:34 -04:00
Aaron Brock
bac505f2cd Edited some things 2015-07-05 18:49:42 -04:00
libraryaddict
2c249e37b5 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-06 07:07:56 +12:00
libraryaddict
e16cb4cef7 Disguise: Initite armorstand vector 2015-07-06 07:07:41 +12:00
libraryaddict
3d0dda382b Stacker: Fixed an infinite loop 2015-07-06 07:07:19 +12:00
Shaun Bennett
abaa0ddee8 Level for Bobby 2015-07-05 13:30:16 -05:00
Aaron Brock
7b73f73561 Switched updateTypes to use the key instead of the value.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-05 03:58:46 -04:00
Aaron Brock
085f9f16ca Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-05 03:52:45 -04:00
Aaron Brock
b8b12d7f17 LobbyComponent.php added
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-05 03:52:35 -04:00
Cheese
c7d758c8d8 fixed UpdateEvent
added WorldComponent
2015-07-05 17:50:18 +10:00
Cheese
e24890d292 fixed some buggies 2015-07-05 15:26:56 +10:00
Cheese
bde58fcad9 debug file 2015-07-05 15:14:24 +10:00
Cheese
7182205fde Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-05 15:13:33 +10:00
Cheese
8d2b1650af world component for MCPE 2015-07-05 15:13:18 +10:00
libraryaddict
4a71823d55 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-05 13:37:22 +12:00
libraryaddict
e002e4af18 Disguises: Added ArmorStandDisguise, removed unused DisguiseType and added ability to add fake armor to disguises 2015-07-05 13:37:07 +12:00
Aaron Brock
514fe4a18a Added some stuff.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-04 20:59:15 -04:00
Aaron Brock
00b5c6f3d4 Fixing/adding some things.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-04 03:01:56 -04:00
Aaron Brock
73ffc97cc9 A more complete BenchSchedule.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-03 14:14:24 -04:00
Aaron Brock
f2f038f1cc Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-03 01:03:06 -04:00
Aaron Brock
060a928dd5 Added bench time stuff.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-03 01:02:16 -04:00