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

404 Commits

Author SHA1 Message Date
Chiss 55de25fded removed testing toggle for mount 
changed item gadget slot from 2 to 3
 2013-10-27 02:22:38 +11:00
Chiss f838452b5c uncommented waves 2013-10-27 01:46:46 +11:00
Chiss 19e2946ce4 mule rename 2013-10-27 01:44:18 +11:00
Chiss b4e2145ad7 giant speed decrease 
ghast teleports back if it flies too far away.
 2013-10-27 01:43:41 +11:00
Chiss cd2c9dcdda more tips 2013-10-27 01:20:10 +11:00
Jonathan Williams 9bc9cc2bb8 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_Helmet.java
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ArmorGadget.java
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/Gadget.java
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ItemGadget.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/creatures/MobGhast.java
 2013-10-26 08:53:38 -05:00
Jonathan Williams 39cf5c3ed1 Tweaking on ghast. 
Added gadget costs
Working on Gadget shop.
 2013-10-26 08:50:12 -05:00
Chiss c672e68713 some help during boss fight. 2013-10-27 00:14:38 +11:00
Chiss 7eb1cc6519 Halloween game additions 2013-10-27 00:06:44 +11:00
Chiss 01cb69d28b Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-26 19:01:41 +11:00
Chiss 723b57cd46 Added paintball gun Gadget 
Added bat blaster Gadget

Halloween Game near-completed

Added SSM Witch
 2013-10-26 19:01:26 +11:00
Jonathan Williams ca3979f4fa Added witch disguise hurt sound 2013-10-25 20:12:01 -05:00
Chiss 8958b8998f Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-26 11:35:02 +11:00
Chiss a52bd69558 Witch SSM 2013-10-26 11:34:05 +11:00
Jonathan Williams 5470f847a9 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-25 19:06:43 -05:00
Jonathan Williams 8883855297 Added witch disguise 
Added missing files.
 2013-10-25 19:05:26 -05:00
Chiss 49e8c15f44 important update 2013-10-25 22:56:28 +11:00
Chiss e8ddfc266e fsd6gty72 tjn6g wgh 2013-10-25 22:20:46 +11:00
Chiss 61b7a86b67 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-25 21:25:36 +11:00
Chiss b74b8e3915 Halloween event changes 2013-10-25 21:25:23 +11:00
Jonathan Williams e5f99331dd Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-25 05:16:15 -05:00
Jonathan Williams c3754d766b Added in vegetate check for EntityGhast. 2013-10-25 05:15:17 -05:00
Chiss 5563d94111 Halloween event update 
hub News
hub mounts
hub gadgets
 2013-10-25 19:20:14 +11:00
Jonathan Williams 21128eb153 Prepping filterChat and CoreClientManager for mysql 
Removed get all clients at server start.
 2013-10-23 16:36:13 -05:00
Chiss 1977572ced Added Halloween Minigame 
Updated gadgets and other minor things.
 2013-10-22 15:46:31 +11:00
Chiss 7cec55713c Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-19 16:52:27 +11:00
Chiss 1944c0003c Hub gadgets 2013-10-19 16:52:15 +11:00
Jonathan Williams 985ce795d2 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-18 00:50:49 -07:00
Jonathan Williams 90fbc397ff Converted gem rewards to boolean return from website. 
Implemented gem transactions and source.
 2013-10-18 00:46:06 -07:00
Chiss 02258b9fd3 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-18 09:12:19 +11:00
Chiss 882ede9a21 tp ah exception 2013-10-18 09:09:29 +11:00
Jonathan Williams 7e77f78d2f Removed all client list pull. 2013-10-17 00:54:14 -07:00
Jonathan Williams 43b42f771a Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
 2013-10-17 00:40:06 -07:00
Jonathan Williams f88c202e07 Added AntiHack to Arcade/Hub 
Added AntiHack Offense uploading.
Fixed memory leaks in PreparedStatments
Added Ultra tag in hub chat.
 2013-10-17 00:37:57 -07:00
Chiss 410e08b06a Clearer MAC reporting to staff 2013-10-17 09:05:03 +11:00
Chiss 4d6a0e2133 Ah no kick 2013-10-17 09:02:52 +11:00
Chiss d9ecbf4037 AH Update 2013-10-17 09:01:36 +11:00
Chiss d23f72567a fixed bug. 2013-10-16 17:22:28 +11:00
Chiss 9cdcbed086 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-16 12:24:02 +11:00
Chiss 2a836f3464 Added anti-hack 2013-10-16 12:23:23 +11:00
Jonathan Williams 483f8ffde3 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-15 14:20:45 -07:00
Jonathan Williams 9569c3906e Starting work on dynamic server. 2013-10-15 14:19:14 -07:00
Jonathan Williams 1a5f6a9b74 Coreclient fix. 2013-10-15 14:18:13 -07:00
Chiss 40e49dd3d4 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-16 08:11:04 +11:00
Chiss ec80d8a568 added AntiHack 
added dragonrider coolness
 2013-10-16 08:10:45 +11:00
Jonathan Williams c68bfce21a Fix for null pointer in core client cleanup 2013-10-14 12:20:49 -07:00
Jonathan Williams 922d269a52 Added core client cleanup in case of weird glitch from bungee 2013-10-13 22:40:06 -07:00
Jonathan Williams 1cdb89f4bf Derp, missing arcade. 2013-10-13 21:51:38 -07:00
Jonathan Williams 6c568cb7a9 Added MemoryFix to Arcade 
Added Dipose override and task cancellation to Confirmationpage
Cleaned up unused code in Updater
 2013-10-13 21:51:25 -07:00
Chiss 230ad4aa7b Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-14 10:29:48 +11:00