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

2200 Commits

Author SHA1 Message Date
AlexTheCoder
dceba51060 - Fix random blockhunt bug with mounts and infestor 2015-10-12 03:09:40 -04:00
Cheese
2b9a66e7b2 more ssm update 2015-10-12 16:32:23 +11:00
Cheese
6a173073a4 added flag to projectiles 
work on cow kit
 2015-10-12 14:39:14 +11:00
Mysticate
3eb36a6581 Prevented farming 2015-10-11 22:43:21 -04:00
Mysticate
b6d573a4d5 Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 2015-10-11 22:25:25 -04:00
Mysticate
7a4ccdf680 Bug fixes 2015-10-11 22:17:34 -04:00
Mysticate
dda65b4c77 Fixed tnt exploding lobbies 2015-10-11 19:56:36 -04:00
Mysticate
20dd9c683b Merge remote-tracking branch 'origin/master' into monster-maze 
Conflicts:
	Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java

Changed the scoreboard a bit, added it to MPS.
 2015-10-11 10:52:45 -04:00
Mysticate
606937d227 Fixed flashbang glitch 2015-10-11 09:42:36 -04:00
Cheese
cb9e8f8e0b pumpkin smasher achievement 2015-10-11 14:48:02 +11:00
Mysticate
435e74225a Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 2015-10-10 23:35:33 -04:00
Mysticate
83d1e011fc Changes. 2015-10-10 23:33:54 -04:00
Cheese
8b75664627 queued holiday transactions 2015-10-11 12:54:35 +11:00
Cheese
6860fa608a titan placeholder perks 
art
fixed pumpkin gem count
 2015-10-11 11:26:09 +11:00
Mysticate
5a8e500ec0 Fixed another thing 2015-10-10 16:15:10 -04:00
Mysticate
5e7ddb968e Changes and bug fixes. 2015-10-10 15:54:18 -04:00
Cheese
da6b1316d3 removed pumpkins from MPS 2015-10-10 22:47:19 +11:00
Cheese
6f14c75f70 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-10 19:28:26 +11:00
Cheese
6cf786eb8c Merge branch 'Myst_HALLOWEEN' 2015-10-10 19:28:08 +11:00
Cheese
1026a2ae22 fixed explosions 2015-10-10 19:27:54 +11:00
Shaun Bennett
a242c6b592 Halloween Update finishes 2015-10-10 03:23:37 -04:00
Cheese
7bc3b4970b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java
 2015-10-10 17:34:17 +11:00
Mysticate
7851cb451a Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
 2015-10-09 22:34:05 -04:00
Shaun Bennett
aa9fd1abf3 Titan giveaway work 2015-10-09 22:14:10 -04:00
Cheese
02c6eccfda Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
 2015-10-10 10:36:42 +11:00
Cheese
7dbd9da582 dragon sale Bar 2015-10-10 10:35:48 +11:00
Shaun Bennett
97ef4a4252 Pushing titan giveaway stuff for laptop 2015-10-09 18:23:47 -04:00
Mysticate
ff1431b652 Fixed players glitching to chests before game starts. 2015-10-09 10:21:35 -04:00
Cheese
c03c8163c5 fixed exploision stuff 2015-10-09 14:01:58 +11:00
Mysticate
90d0fcb36d Merge branch 'Myst_HALLOWEEN' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into Myst_HALLOWEEN 2015-10-08 22:53:45 -04:00
Mysticate
598ea84e7a Fixed explosions and cleaned up. 2015-10-08 22:52:57 -04:00
Cheese
d18353e592 Merge branch 'Myst_HALLOWEEN' of ssh://184.154.0.242:7999/min/Mineplex into Myst_HALLOWEEN 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
 2015-10-09 13:44:41 +11:00
Cheese
41678eaf35 fixed scoreboard bug 2015-10-09 13:42:37 +11:00
Mysticate
1011c36c43 Fixed lobby being destroyed. 2015-10-08 22:41:45 -04:00
Mysticate
96f14f4fda Fixed kit item names. 2015-10-08 22:31:20 -04:00
Mysticate
3802d47a37 Made the thing bold. 2015-10-08 22:29:22 -04:00
Mysticate
082b16fe0d Stuff and things to help make mounts be cool. 2015-10-08 22:28:07 -04:00
Cheese
a234fbce1e Merge branch 'Myst_HALLOWEEN' 2015-10-09 12:17:57 +11:00
Mysticate
ed31bf9886 Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 2015-10-08 21:16:24 -04:00
Mysticate
9254ca9162 K reverted + fixed bug 2015-10-08 21:12:38 -04:00
Cheese
483ab13c2b workaround for error where accountid is never set 2015-10-09 12:04:35 +11:00
Mysticate
2cace7419f Made Destructor sexi 2015-10-08 20:42:29 -04:00
Mysticate
92bab25a3f Fixed Gust void stealing. 2015-10-08 20:38:33 -04:00
Mysticate
b8597d7161 Paintball stats. 2015-10-08 20:37:26 -04:00
Mysticate
97d6f8fb42 Fixed placing walls in water. 2015-10-08 19:10:19 -04:00
Mysticate
8f826f6e83 Fixed blocks falling into floor in Build. 2015-10-08 19:04:51 -04:00
Mysticate
30e3c56635 Fixed ground issues in BUILD. 2015-10-08 18:58:30 -04:00
Mysticate
46bf963d44 Fixes not being able to reload dropped guns w/ 0 ammo. 2015-10-08 18:56:23 -04:00
Mysticate
979e68dcc7 Fixed the Minestrike multiple grenades bug. 2015-10-08 18:41:40 -04:00
Mysticate
ef62fb5adf Made it so that when played on an MPS, HH won't give items. Yay! 2015-10-07 22:57:30 -04:00
Mysticate
8a8591ae7f Merge branch 'master' of 
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
Myst_HALLOWEEN

Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/mount/MountManager.java
 2015-10-07 22:19:10 -04:00
Mysticate
e864e0867a Adds mount spider and fixes a BH bug. 2015-10-07 21:47:10 -04:00
Cheese
3c437925f1 halloween prep 2015-10-08 12:36:00 +11:00
Cheese
191392825f Merge branch 'Myst_EVO' 2015-10-08 12:07:21 +11:00
Cheese
c94184c5ae reduced number of falling blocks in skywars by 80% 
added halloween horror mount
 2015-10-08 12:04:28 +11:00
Mysticate
5378ece214 Fixed chicken being able to fly.. 2015-10-06 21:09:53 -04:00
Mysticate
a0d0590777 Merge remote-tracking branch 'origin/master' into Myst_EVO 2015-10-06 21:04:49 -04:00
Mysticate
643f47763e Improved consistency with the F5 message 2015-10-04 20:28:21 -04:00
Mysticate
0de34c15ab NO more endercrystal go boom boom yay 2015-10-04 20:23:41 -04:00
Thanos paravantis
9c1ba5f3d1 Changes on bomb error messages after QA recommendations. 2015-10-04 21:23:50 +03:00
Thanos paravantis
c2518bc6c4 Some additional bug fixes were applied on the previous commit. 
Water damage by TNT on game lobbies is now patched.
 2015-10-04 16:32:34 +03:00
Thanos paravantis
026c596de2 Minestrike bug fixes and minor changes 
- Added a right-click message tip when the player with a bomb tries to place by left clicking.
- Changes in one of the tip messages while in game lobby.
- Moltovs and Incendiaries were not triggered once thrown to the ground.
- Players were able to extinguish grenade fire with a knife.
- The bomb was able to be planted after a round was over.
- On sniper rifles, scope was not removed if the match was ended.
 2015-10-04 13:22:12 +03:00
Thanos paravantis
2504493ebc Fixed four super paintball bugs. 
- Projectiles could paint wool in the waiting lobby.
- When players fell in the void, they didn't got killed.
- Players that were painted could take off their armor.
- Players that were painted could logout and the skeleton would still stay there.
 2015-10-04 00:34:00 +03:00
Mysticate
a7ab0cd723 ADDED MORE KITS I'M DONE HOORAY LOVE ME @CHISS 2015-10-02 22:43:29 -04:00
Mysticate
c9ff420a79 Now chooses a different maze every game. 2015-10-02 20:43:57 -04:00
Mysticate
3f6490f14a Gave health on safe pad <<<<<3 2015-10-01 10:47:37 -04: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
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
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
Morten
1c995b14e8 Ignore this 2015-09-25 18:03:10 +02:00
Mysticate
b2f1f7d2ae Fixed the tracker for pilot. 2015-09-25 11:38:32 -04:00
Morten
59d1a949c4 Created an "END" event for challenges 2015-09-25 17:04:47 +02: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
Morten
7838ad2bce For Bisko to pull 2015-09-22 16:12:51 +02: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
Morten
a5398cb773 Added new challenges and fixed a lot of bugs. 2015-09-19 19:01:13 +02:00
fooify
0581474a16 lots of work on Monster Maze 2015-09-18 08:25:11 -07: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
Sarah
362d99a819 Fixing up Gem signs, Effects etc. 2015-09-15 07:10:39 +02: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
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
Sarah
b56813deef Improving /e commands (/e kick, /e area, etc) 2015-09-12 04:33:10 +02:00
fooify
5824ec6df0 lots of changes to monster maze, check trello for list 2015-09-07 07:08:00 -07:00
Morten
6ea9a15e6d Added a bunch of games 2015-09-07 11:46:08 +02: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
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
Mysticate
271b86dabd Fixed spectators slowing evolution times. 2015-09-04 11:45:42 -04:00
Mysticate
0c58de3c19 Glitches. Fixed the things. 2015-09-01 02:35:06 -04:00
Mysticate
b4ce33a916 Fixed things. 
• Added a cancelled check to No Ability 
• Removed tokens on quit.
• Checked if players are alive before giving them places.
 2015-09-01 01:59:36 -04:00
AlexTheCoder
32a257fa55 Fix bug https://trello.com/c/Jf7bht6V/138-general-tp-before-game-starts 2015-08-31 15:11:57 -04:00
Sarah
58ae09ebd4 saving Project for pulling. 2015-08-31 11:32:18 +02:00
Mysticate
becfbe1f13 Fixed possible game breaking bug :S 2015-08-30 20:09:47 -04:00
Mysticate
33d78a5efd Fixed eating spider eye. Yay! 2015-08-30 18:39:07 -04:00
Jonathan Williams
47331658ac Merge remote-tracking branch 'remotes/origin/Myst_EVO' 2015-08-30 00:14:53 -07:00
Mini-Chiss
d944d2e5c4 Merge branch 'Myst_EVO' 2015-08-29 23:54:28 -07:00
Mysticate
046fa4f8b6 Fixed possible NPE 2015-08-29 14:30:22 -06:00
Mysticate
736d88c82f All achievements fixed. ^_^ 2015-08-29 14:13:15 -06:00