Commit Graph

4161 Commits

Author SHA1 Message Date
fooify 3a10677b10 AI bug should be fixed, I need Mysticate to test though 2015-09-28 15:15:51 -07:00
Mysticate 00a8cf769b Swag 2015-09-27 14:55:37 -04:00
Mysticate 7e40d0d4bb Lots of cool stuff 2015-09-27 12:10:52 -04:00
Mysticate eea7ef8350 Swag 2015-09-27 02:11:28 -04:00
Mysticate 54eca7fa9e Lots of work. 2015-09-26 23:18:05 -04:00
Mysticate 9350386361 Lots of things. :D 2015-09-26 15:08:43 -04:00
Mysticate 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
Mysticate 30d2281785 Lots of things 2015-09-25 23:59:31 -04:00
fooify 1e018cf74a Improved Smasher 2015-09-25 20:21:06 -07:00
Mysticate 2de409c2f2 Made the mazes do things. 2015-09-25 20:14:46 -04:00
Mysticate a0ec656bc1 Fixed another tracker. 2015-09-25 12:49:21 -04:00
Mysticate b2f1f7d2ae Fixed the tracker for pilot. 2015-09-25 11:38:32 -04:00
Mysticate 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
Mysticate 60c4e5812a Fixed trackers 2015-09-24 23:02:19 -04:00
fooify 69ed764483 Added another maze. 2015-09-24 19:55:43 -07: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
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
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
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
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
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
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
fooify c648d7c186 stuff, things...things, stuff (Monster Maze) 2015-09-05 09:30:51 -07:00
fooify 9e3f87b71e more edits to MM
- displaying more information
- permanent safezones around the map
- spawn now does not deteriorate, is permanent
2015-09-05 06:41:10 -07:00
Jonathan Williams 4bb100b6be Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-09-05 01:53:45 -07:00
Jonathan Williams 4ad95b54cf Updated ServerMonitor status reporting for network. 2015-09-05 01:53:37 -07:00
Jonathan Williams 2536d8a437 Fixed out of range stats causing no stats to load.
Issue fix to db for out of range stat on login.
2015-09-05 01:40:56 -07:00
Cheese 0ac808ba43 stacker pref is now only for pvp stacking. 2015-09-05 10:30:11 +10:00