Commit Graph

2053 Commits

Author SHA1 Message Date
Chiss f5efea1e9a Missing files 2014-10-17 18:34:23 +11:00
Jonathan Williams 6d38f4e238 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-17 00:42:01 -05:00
Jonathan Williams 8466b8e2dd Fixed building issues with EnjinTranslator
MAde mysql repo always record rank change even if windows return rank is different.
Added rough single player replay functionality.
2014-10-17 00:41:23 -05:00
Chiss fea3793fca Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-17 13:31:25 +11:00
CoderTim 248438535b Preserve pitch and yaw in NpcManager teleportations 2014-10-16 22:31:09 -04:00
CoderTim 930cdf6c07 Hide NpcManager blank custom names 2014-10-16 22:24:24 -04:00
Chiss 5fb4f3324d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-17 13:20:09 +11:00
CoderTim edb2c4f26a Merge remote-tracking branch 'origin/master' 2014-10-16 22:15:20 -04:00
CoderTim 1fb21d6143 Fixed some NpcManager bugs 2014-10-16 22:13:41 -04:00
Chiss 727e137cc4 Final HH Update 2014-10-17 12:12:22 +11:00
Shaun Bennett ec81e9f511 Merge remote-tracking branch 'origin/master'
Conflicts:
	Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
2014-10-16 17:51:32 -05:00
Shaun Bennett c855c46940 Add coin command for online players, better way to handle this soon 2014-10-16 17:46:00 -05:00
Chiss 5db2c072a0 Halloween update 2014-10-16 16:27:09 +11:00
Chiss c30171d24f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-16 12:03:09 +11:00
CoderTim 233e6d0b46 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-15 20:44:50 -04:00
CoderTim 535506393f Added ability to customize NPC zombie adulthood, slime size, and villager profession 2014-10-15 20:44:42 -04:00
Shaun Bennett 76dc735b6b Fix bug I was getting with ShopItem 2014-10-15 15:05:31 -05:00
Shaun Bennett 5cdd502d11 Auto backups for MapParser. (Only tested on mac) 2014-10-15 15:04:44 -05:00
Shaun Bennett 58f69b49d7 Add new chat features to JsonMessage 2014-10-15 11:11:32 -05:00
Shaun Bennett 62d4804aa6 Update Craftbukkit.jar for new chat features 2014-10-15 11:10:28 -05:00
Shaun Bennett e732523dcd Merge remote-tracking branch 'origin/master' 2014-10-15 10:31:45 -05:00
Chiss 82e95f714a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-15 16:57:38 +11:00
Chiss b83b0e61e6 fixed long lines in achievements
added night to halloween maps in parser
2014-10-15 16:57:25 +11: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
Chiss c3fdae135e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-15 16:11:08 +11: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
Chiss d8a8061746 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-15 15:44:41 +11:00
Chiss eb5af41323 Added halloween reward pet
minor bug fixes
2014-10-15 15:44:26 +11:00
CoderTim 2a18888922 Improved NpcManager to work with persistent maps 2014-10-14 22:22:17 -04:00
Shaun Bennett 130b932f40 Fix typo in Free Server Timer 2014-10-14 14:30:44 -05: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 bf1f28318b fix for UHC not ending 2014-10-14 13:02:04 +11:00
Chiss ed9dd6e894 Minor patches 2014-10-14 12:42:53 +11:00
CoderTim 127e12b7c7 Added missing dependency in intellij 2014-10-13 20:49:35 -04: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 9b1c4783ce lowered UHC win to 8k 2014-10-13 09:57:38 +11:00
Chiss 6e6e0e2ae0 added flags to disable gem multipliers per-game. UHC was giving too much :O 2014-10-13 09:44:30 +11:00
Chiss a8d1cef933 Minestrike, ensure bomb does not get overridden. 2014-10-12 18:31:05 +11:00
Chiss 623cdb0f2c Allowed players to rejoin if disconnect within first 10 minutes of UHC. 2014-10-12 18:27:49 +11:00