JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,372 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

4372 Commits

Author SHA1 Message Date
Shaun Bennett 993c9783ec Add Votifier Jar, display team stats for SG, SW, SSM 2015-10-02 13:15:02 -04:00
Shaun Bennett 855bb89200 Update .gitignore with IntellIJ tasks file 2015-10-01 14:50:15 -04:00
Shaun Bennett 8911617a0c Remove BungeeSigns again? 2015-10-01 14:01:36 -04:00
Mysticate 3f6490f14a Gave health on safe pad <<<<<3 2015-10-01 10:47:37 -04:00
Jonathan Williams bc84dc6817 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-01 07:39:17 -07:00
Jonathan Williams 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
Cheese cc1f282e0d Merge branch 'monster-maze' of ssh://184.154.0.242:7999/min/Mineplex into monster-maze 2015-10-01 13:02:38 +10:00
Mysticate a6d7cccbe5 Fixes 2015-09-30 22:31:03 -04:00
Mysticate 4a023c4644 Tweaks - I THINK I'M DONE HOORAY 2015-09-30 21:21:29 -04:00
Mysticate 05b735ba40 Fixed jump system 2015-09-30 20:28:35 -04:00
Mysticate c39806a4e3 Kewl stuff. Yay 2015-09-30 20:01:51 -04:00
Mysticate 09ef2d73ae Grammar <3 2015-09-30 19:45:29 -04:00
Mysticate 68c6ba595e Visual enhancements. 2015-09-30 19:31:36 -04:00
Mysticate d089ffeb30 Added a firework when a mob gets rekt 2015-09-30 18:48:45 -04:00
Mysticate 250e9cff13 Fixed a possible NPE 2015-09-30 18:43:52 -04:00
Mysticate a25e2c575d Peace of mind stuff. 2015-09-30 18:35:56 -04:00
fooify c3b2c10934 FINALLY FIXED THIS MONSTER MAZE BUG :D 2015-09-29 19:14:18 -07:00
Mysticate 2d173a5be4 Fixed a jumper perk. 2015-09-28 21:03:58 -04:00
fooify bcfd8fcec7 bug fixes: 
- fixed bugs
- fixed more bugs
- after that, more bugs were fixed
 2015-09-28 17:54:56 -07:00
Shaun Bennett 437e62c7db Fix priority for dupe fix 2015-09-28 20:44:57 -04:00
Shaun Bennett 8a9cc9ff14 Food Dupe Fix 2015-09-28 20:42:14 -04:00
Mysticate 00eecc0325 Fixes 2015-09-28 20:33:38 -04:00
fooify 3a10677b10 AI bug should be fixed, I need Mysticate to test though 2015-09-28 15:15:51 -07:00
Shaun Bennett 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
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
Jonathan Williams 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
Jonathan Williams 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
Jonathan Williams 1ad61a09e4 Should include the file with the change commit. 2015-09-26 18:30:45 -04:00
Jonathan Williams 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
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
xGamingDudex 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
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
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
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