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

143 Commits

Author SHA1 Message Date
Chiss 347e2b1bf5 Changed FIRE items to Blaze Powder 2014-09-08 10:14:55 +10:00
Shaun Bennett e7f79aa5bf Update IntelliJ files for latest changes 2014-09-03 11:42:50 -05:00
Jonathan Williams 92191dc19a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R4/PlayerConnection.java
 2014-09-03 03:47:15 -07:00
Jonathan Williams a4871b5509 Updated to latest spigot with 1.8 support. 
Tweaked disguise manager for 1.8 support.
Work on CUstomer support server + admin stuff.
 2014-09-03 03:46:24 -07:00
Shaun Bennett 8d06cddfb2 Remove Chiss' debug message for shop 2014-09-02 20:36:25 -05:00
Jonathan Williams 1bd0209b39 Added multi-server tags for npcs 
Fixed Customer support packages.
Fixed Account rank expire for Hero
Added SNR mod to update Rank
Changed SNR mod color to gray.
 2014-08-30 02:04:04 -07:00
CoderTim fb90336d4e Finished stats/achievements 2014-08-23 16:00:15 -04:00
Chiss 231ef2bbe1 Cosmetic Update 2014-08-23 04:30:41 +10:00
Jonathan Williams 1398543490 Fixed bug with Projectile 
Changed tp out of game to 1 per tick.
 2014-08-21 02:07:54 -05:00
Shaun Bennett f60a818e6a Update craftbukkit to remove the extra _INVALID mappings 2014-08-19 21:22:04 -05:00
CoderTim 09c01d90ad Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-19 19:07:37 -04:00
Shaun Bennett e1a57a673e Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors 2014-08-19 16:58:55 -05:00
CoderTim 05686cb584 Work on achievements 2014-08-18 16:41:16 -04:00
Chiss 85522cddca Debug (will clean once fixed) 
Game stats
 2014-08-15 09:49:00 +10:00
Jonathan Williams 6039168601 Updated code base to build #1604 spigot 2014-08-13 18:57:37 -05:00
Mini-Chiss 62f6ea815d Champs Balance Update 
Map Parser Update
 2014-07-07 16:23:55 -07:00
Mini-Chiss 46849745c4 Champions TDM Update 2014-06-23 16:20:50 -07:00
Jonathan Williams 57c3845df9 Finished up preferences. 
Each preference saves, loads on login.
GUI working great.
 2014-05-30 01:42:43 -07:00
Jonathan Williams 449fa13cc3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 
Conflicts:
	.gitignore
 2014-05-27 02:23:22 -07:00
CoderTim 49de140f41 Configured eclipse to use UTF-8 2014-05-25 21:04:14 -04:00
CoderTim c45e7d2a80 Converted file encoding from ISO-8859-1 to UTF-8 2014-05-25 19:42:39 -04:00
CoderTim 3859a42f1d Removed broken and obsolete shifter code 
Set up more intellij stuff
 2014-05-25 19:11:58 -04:00
CoderTim aa6b5324eb Set up IntelliJ IDEA 2014-05-20 00:39:50 -04:00
Jonathan Williams eae2d41fad Fixed party out of bounds exception. 
Fixed tnt in wrong place in dom shop.
 2014-05-08 20:01:21 -07:00
Jonathan Williams ebf40afe75 Fix dom bow shoot in lobby bug. 
Work on preventing illegal builds.
 2014-05-06 22:38:27 -07:00
Chiss f79b3b147c Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-05-06 15:59:20 +10:00
Chiss 223da7bf4d ResetAll for class skills 2014-05-06 15:55:14 +10:00
Jonathan Williams a9f4a900f0 Working on fixing dead chunks. 
Fixed Blizzard memory issue.
 2014-05-04 09:31:04 -07:00
Chiss 1d4d98b910 Twitch Prep 
MAC changes
 2014-05-02 14:35:41 +10:00
Chiss 8240101d60 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
 2014-05-01 09:33:59 +10:00
Chiss 423a355057 Helpers+ wont be kicked yb MAC 2014-05-01 09:31:47 +10:00
Jonathan Williams fd372b8418 Changed skills to 2k gems each. 
Changed power/booster to 2k gems each.

Added AntiHack perm storage of kicks.
Commented out SafeChat stuff for now.
 2014-04-28 01:05:08 -07:00
Chiss 40ef432211 Cannot use skills/items in HubManager 
Dom CP score rate lowered
Dom items dont use energy
 2014-04-28 09:41:00 +10:00
Chiss 07ca3a83ca Arrows shouldnt bounce 2014-04-26 13:37:01 +10:00
Chiss b86b014058 Fixed a whole bunch of bugs 2014-04-26 11:59:11 +10:00
Jonathan Williams a37ace7576 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-25 00:44:27 -07:00
Jonathan Williams 9136fa0b15 Upgraded to latest spigot. 
Fixed npcs being so loud.
Npcs are now ghosted automatically.

Added UUID on login.
 2014-04-25 00:44:14 -07:00
Chiss 9495630bf2 CP rate increase 2014-04-25 11:10:37 +10:00
Jonathan Williams 7fef4adbee Fixed resupply resetting skills. 2014-04-22 22:19:03 -07:00
Chiss 0325892e2a Champs water fixes 
First push for Twitch games
 2014-04-23 10:21:01 +10:00
Jonathan Williams e62dfb0dd2 Fix skill/item packs not deducting gems. 
Fix players not getting spectating flag when dying.
 2014-04-22 16:50:44 -07:00
Jonathan Williams 7680eaaedc Fixed non-Ultra being able to unlock spells/skills. 
Fixed Items that weren't free.
 2014-04-22 11:20:00 -07:00
Jonathan Williams 2378df6191 Fixed builds losing tokens. 2014-04-22 10:35:56 -07:00
Chiss 923d2455d0 Stampede ends immediately on taking damage 2014-04-21 17:21:52 +10:00
Chiss 62c245d728 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-21 17:06:08 +10:00
Chiss 0f0b66a8cf Stampede cancel on damage taken 2014-04-21 17:04:51 +10:00
Jonathan Williams 9ce6d4866d Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-20 23:37:01 -07:00
Jonathan Williams e012129427 Fixed edit custom build bugs. 
Fixed vehicle exit event not firing.
Fixed item info not showing once you have the item.
 2014-04-20 23:36:45 -07:00
Chiss b1e082b73a fixed riposte bug 
tweaked capture effects
 2014-04-21 11:56:14 +10:00
Chiss 0eaa3110f5 Risposte nerf 2014-04-21 11:18:14 +10:00