Commit Graph

668 Commits

Author SHA1 Message Date
Shaun Bennett 76dc735b6b Fix bug I was getting with ShopItem 2014-10-15 15:05:31 -05:00
Jonathan Williams a6a4808222 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-15 00:27:01 -05:00
Jonathan Williams a81bdb4e32 Fixed bug with armor stands showing up for customNameVisible = false; 2014-10-15 00:26:36 -05:00
CoderTim 25b10f0925 Added /npc refresh command to NpcManager 2014-10-15 01:04:52 -04:00
CoderTim ed64c1972d Update accountStats rows before inserting to prevent id column from skipping on failed inserts 2014-10-15 00:54:23 -04:00
CoderTim 2a18888922 Improved NpcManager to work with persistent maps 2014-10-14 22:22:17 -04:00
CoderTim 256df99b7b Added MineStrike to achievement gui 2014-10-13 23:48:38 -04:00
CoderTim 3ba748f2de Merge branch 'feature/currency-log' 2014-10-13 23:13:44 -04:00
Jonathan Williams 1dd51bcac5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-13 21:07:10 -05:00
Chiss 15b6a80613 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-14 13:02:17 +11:00
Chiss ed9dd6e894 Minor patches 2014-10-14 12:42:53 +11:00
CoderTim 8f90c96019 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-13 20:45:55 -04:00
CoderTim 2016ea09cb Added achievements to games and Achievement enum 2014-10-13 20:38:58 -04:00
Jonathan Williams 0194a041e2 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-12 20:57:32 -07:00
Jonathan Williams 3e7787a354 Fix for customer support GemHunterCommand
Fix for UUIDFethcer pulling while player is online.
2014-10-12 20:57:17 -07:00
Chiss a4b85053d9 fixed bug where blockmorph was crashing hubs. 2014-10-13 14:56:19 +11:00
Chiss 25fbe24d20 improved sound output of coin bomb 2014-10-13 14:13:57 +11:00
Chiss e41b10ccb8 minor UHC fix 2014-10-13 14:09:58 +11:00
Chiss 9cc28d1ad8 MAC Update 2014-10-12 14:19:35 +11:00
Jonathan Williams d3788e8ddc Fixed redis server time functions.
Added kill option for servers with motd Finished in servermonitor
2014-10-11 04:40:53 -07:00
Jonathan Williams 797dd002ad Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-11 02:43:56 -07:00
Jonathan Williams a54b78fefa Added Mine-Strike to Quick Game menu.
Fixed up CoreClientManager's rank update.
2014-10-11 02:32:02 -07:00
Jonathan Williams 19afebe53d Added in mysql hooks for coins/gems/ranks for database conversion preperation.
Added in failover database calls in CoreClient/DonationManager
2014-10-11 01:32:22 -07:00
CoderTim 3422f48325 New acheivements 2014-10-10 21:49:03 -04:00
Chiss ffc2ff5058 Modifided output of friends list
- buttons to left side for alignment
- sorted by sent>offline>pending>online
- improved 'no friends' message
2014-10-09 12:15:45 +11:00
Chiss 7a345dce95 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-05 13:40:15 +11:00
Chiss d3f87dff46 MineStrike update 2014-10-05 13:37:27 +11:00
Jonathan Williams bf11635616 Fixed GemHunter in StaffServer and added offline stat increment :) 2014-10-04 15:43:33 -07:00
Shaun Bennett 39b03b7533 Change time command to mod+ 2014-10-04 00:20:35 -05:00
Shaun Bennett 520ade8249 Merge remote-tracking branch 'origin/master' 2014-10-03 20:41:06 -05:00
Shaun Bennett ef82aa08b1 Time command for mod+ 2014-10-03 20:40:58 -05:00
Jonathan Williams 66457ded60 Fix initial friends date load for offline time. 2014-10-03 02:05:55 -07:00
Jonathan Williams 9033843a31 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-03 01:50:35 -07:00
Jonathan Williams c641eab3c7 Fixed up friends. 2014-10-03 01:50:23 -07:00
CoderTim b78132ebfc Renamed NpcManager methods 2014-10-02 22:18:25 -04:00
CoderTim addc423c2d Added /npc clear back 2014-10-02 22:15:12 -04:00
CoderTim f6f484c134 Refactored /npc commands 2014-10-02 22:08:00 -04:00
Shaun Bennett 4253c08682 Fix time 2014-10-02 20:25:50 -05:00
Shaun Bennett a6fea938b9 Fix some duplicate code 2014-10-02 20:01:33 -05:00
Shaun Bennett 07576a2b12 Add gamesplayed and timeingame to gui 2014-10-02 19:48:25 -05:00
Jonathan Williams 9b2a2cbbd6 Fixed mounting blocks on yourself in 1.8
Added temp fix so 1.8 players can ride dragons again.
Removed Block form in parkour and fly for block form.
2014-10-01 02:12:11 -07:00
Jonathan Williams c2b84cc60f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-30 12:20:14 -07:00
Jonathan Williams 0228ef5921 Staff server work to include treasure chests/keys and gem hunter level 8, 12. 2014-09-30 12:20:01 -07:00
CoderTim a5a2c1a837 Partially done refactoring NpcManager 2014-09-30 11:03:23 -04:00
Shaun Bennett c7d34e70ef Merge remote-tracking branch 'origin/master' 2014-09-29 17:42:13 -05:00
Shaun Bennett 92f8dc7f61 Add velocity toggle for mod+ 2014-09-29 17:17:02 -05:00
Shaun Bennett 7892c442d0 Add show mac reports user pref for mod+ 2014-09-29 11:14:20 -05:00
CoderTim 578b5702bc Added commons-dbcp2.jar dependency to Mineplex.Core in eclipse 2014-09-27 04:18:19 -04:00
Jonathan Williams eaee6c2733 AWork on FRiends. 2014-09-26 12:38:51 -07:00
Jonathan Williams 34baa8eafb Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-25 23:27:19 -07:00