Commit Graph

10834 Commits

Author SHA1 Message Date
AlexTheCoder
add639070a Fix cannons not firing 2017-06-15 23:10:28 -04:00
AlexTheCoder
1cdf9d2bba Final season 3 world event tweaks (adds skeleton king) 2017-06-15 23:10:16 -04:00
cnr
87e1ebb2af Merge branch 'feature/moba' into develop 2017-06-15 22:10:15 -05:00
AlexTheCoder
5829b720a8 Update spawn and shop locations for new map 2017-06-15 23:09:34 -04:00
AlexTheCoder
21d05b383b Fix skull and string place exploits 2017-06-15 23:09:16 -04:00
AlexTheCoder
394ebf9ad0 Tweak nether minibosses 2017-06-15 23:09:01 -04:00
AlexTheCoder
f4397d0b0b Tweak boss nether portals 2017-06-15 23:08:50 -04:00
AlexTheCoder
70212f9596 Tweak jump star values to final levels 2017-06-15 23:08:15 -04:00
AlexTheCoder
4485b4bc67 Add mount tokens to the rare loot pool 2017-06-15 23:07:53 -04:00
AlexTheCoder
01df9b7e44 Prevent claiming via gui in nether or raid worlds 2017-06-15 23:07:21 -04:00
AlexTheCoder
802cde9280 Update clans gui icons to reflect resource pack changes 2017-06-15 23:07:03 -04:00
AlexTheCoder
1ea0b4d33a Final polish on builder box 2017-06-15 23:06:38 -04:00
AlexTheCoder
e8a4e23f05 Fix mute bypasses via clans chat commands 2017-06-15 23:05:41 -04:00
AlexTheCoder
fc3a4bdbfe Fix purchase item goal in tutorial 2017-06-15 23:05:16 -04:00
AlexTheCoder
724604c76a Fix bug preventing TNT generators from working if purchaser leaves the clan 2017-06-15 23:03:30 -04:00
cnr
336777f89a Add builders to the beta whitelist 2017-06-15 18:15:04 -05:00
Sam
5b985c33ac Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-15 23:26:57 +01:00
Sam
07779cdf55 Reduce the damage from TNT Infusion 2017-06-15 23:26:56 +01:00
Sam
a12564c8a9 Fix consumables 2017-06-15 23:26:29 +01:00
cnr
d2c9173943 Add missing instanceof check 2017-06-15 17:19:19 -05:00
Sam
fe17a42724 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-15 21:22:39 +01:00
Sam
c2cbcfc62f Fix spamming bombardment 2017-06-15 21:22:26 +01:00
Alexander Meech
d4f27ef768 Update xenforo forum id for mapper rank 2017-06-14 22:28:28 -05:00
cnr
ba506f9c7b Fix beta whitelist duplicate-enable 2017-06-14 22:26:29 -05:00
cnr
27f5da06f4 Merge branch 'feature/moba' into develop 2017-06-14 20:02:25 -05:00
Sam
a5fd9bef79 Turns out Achievements are case sensitive 2017-06-15 02:01:26 +01:00
Sam
cfe8840d7a Fix some really silly things 2017-06-15 01:59:00 +01:00
cnr
8e9c5c43e4 Remove unused agentCacheMap in CUST 2017-06-14 19:57:58 -05:00
cnr
05eabdbfd8 Merge branch 'feature/moba' into develop 2017-06-14 19:55:53 -05:00
cnr
2a0796472b Add beta whitelist to MOBA 2017-06-14 19:54:23 -05:00
Sam
29d5a80a67 Final changes 2017-06-15 01:33:20 +01:00
cnr
6c093cc458 Reduce beta participation rank constraint to TITAN 2017-06-14 17:23:20 -05:00
cnr
8d1aa176d3 Remove unused agentCacheMap in CUST 2017-06-13 23:49:14 -05:00
cnr
c533b170fe Add /checkppc to CUST for detailed subscription data 2017-06-13 23:47:30 -05:00
AlexTheCoder
bc61bdff5e Update territory display to show raid world and prevent autoclaiming in nether or raid worlds 2017-06-13 23:17:28 -04:00
AlexTheCoder
6ef6abcd72 Initial implementation of raid legendary 2017-06-13 23:16:51 -04:00
AlexTheCoder
3b4bad7bba Further change builder box UI 2017-06-13 23:16:24 -04:00
AlexTheCoder
64c084ecb3 Handle Hardcore and Casual modes in clans mechanics 2017-06-13 23:16:00 -04:00
AlexTheCoder
d168e03f80 Check for Hardcore mode in Clans Server Selector 2017-06-13 23:13:18 -04:00
Sam
4978f924a7 Lots of bug fixes 2017-06-13 21:49:34 +01:00
Sam
3efeb38a01 Working through JIRA 2017-06-13 00:29:05 +01:00
Sam
6df8330b3f Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-12 23:03:20 +01:00
cnr
3d8998ee13 Change missed BETA_HUB -> HUB in GH server-sending 2017-06-12 15:43:29 -05:00
AlexTheCoder
9da5b367fd Further improve raids 2017-06-12 01:06:33 -04:00
AlexTheCoder
97efeca225 Increase outpost costs and add mounts to pvp shop 2017-06-12 01:05:02 -04:00
AlexTheCoder
97c8dc7cf4 Make safelog holograms follow their loggers 2017-06-12 01:04:26 -04:00
AlexTheCoder
a952ee31cd Remove Repair functionality from Gameplay class 2017-06-12 01:04:05 -04:00
AlexTheCoder
5045bad684 Unify item durabilities in clans 2017-06-12 01:03:39 -04:00
AlexTheCoder
d2d3b88651 Improve siege weapons 2017-06-12 01:03:15 -04:00
AlexTheCoder
3d88c2c9a5 Block territory claiming and setting clan homes in the nether 2017-06-12 01:02:38 -04:00
AlexTheCoder
c265b235be Tidy up ClansAdmin Commands 2017-06-12 01:02:04 -04:00
AlexTheCoder
f1b9a99576 Make mounts disable when server does 2017-06-12 01:01:48 -04:00
AlexTheCoder
ece1461384 Tidy up mounts and implement the mount skins 2017-06-12 01:01:24 -04:00
AlexTheCoder
8ee5faf4d9 Change boxes more 2017-06-12 01:00:09 -04:00
AlexTheCoder
a268b0dfff Fix freeze broadcasting to entire server unintentionally 2017-06-12 00:59:31 -04:00
Sam
c8340730ad Improve Bardolfs wolves 2017-06-11 00:00:28 +01:00
Sam
b6c5052db8 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-09 13:10:14 +01:00
Sam
ac52903b7d QOL changes 2017-06-09 13:10:11 +01:00
cnr
68084c5cf0 Insert linebreaks in mapper + mapdev descriptions 2017-06-09 02:43:34 -05:00
cnr
d226a4e710 Remove Gem Fountain and open brawl on weekends 2017-06-09 00:14:49 -05:00
AlexTheCoder
87966ddedd Season 3 2017-06-08 20:20:10 -04:00
AlexTheCoder
e7174a0e4e Add an item unbreakable checker to UtilItem 2017-06-08 20:19:12 -04:00
AlexTheCoder
986d4f3dcc Properly restrict moderation staff testrank access 2017-06-08 20:15:41 -04:00
AlexTheCoder
ecd9812f0c Properly return empty value in ItemStackFactory 2017-06-08 20:12:44 -04:00
cnr
3c3cffb001 Add MAPPER rank and modify BUILDER description 2017-06-08 18:53:37 -05:00
Sam
79b983536d While Withered, prevent regeneration 2017-06-08 22:55:17 +01:00
Sam
e94ab9598a New Heroes 2017-06-08 22:43:50 +01:00
Sam
4fb4c2c865 Fix merge imports 2017-06-08 16:11:25 +01:00
Sam
206dd56d14 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-08 16:10:49 +01:00
Sam
9844ca338a Complete Biff 2017-06-08 16:09:32 +01:00
Sam
a767135ce0 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-08 13:08:54 +01:00
Graphica
8138b5d241 Fix Bob Ross morph carpets not disappearing 2017-06-08 00:49:40 -05:00
Graphica
4628af6e81 Call treasure start event after teleporting the player 2017-06-08 00:49:33 -05:00
Sam
1d64bb63c4 Add a check to prevent a possible duplication bug 2017-06-08 02:18:57 +01:00
Sam
b59e57dfb6 Fixed Players not being given their Gem Hunters rewards for the final time! 2017-06-08 02:10:24 +01:00
Sam
8c821af9de Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters 2017-06-08 02:09:24 +01:00
Sam
044927252c More changes! 2017-06-08 01:55:07 +01:00
cnr
7cc7769378 Send gem hunters players to normal hub upon cashout 2017-06-07 18:26:56 -05:00
Kenny Goodin
83f6b4fa1d Fill in actual quest rarity weights 2017-06-07 02:18:37 -05:00
Sam
697d4a11ed Fix the Quest achievement looking for the wrong stat 2017-06-06 23:00:17 +01:00
Sam
a800fee08c Testing session changes 2017-06-06 22:59:40 +01:00
Sam
16f9364772 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-06 19:31:20 +01:00
Sam
8f87578a57 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters 2017-06-06 19:28:54 +01:00
Sam
a63399943d Leaderboards and UFO world event 2017-06-06 19:28:41 +01:00
Sam
4a91d2821b Achievements 2017-06-05 20:57:30 +01:00
cnr
629ced569c Fix treasure location comparison between worlds 2017-06-05 11:52:44 -05:00
Sam
a3fd81f763 Fix Biff's skills not cleaning up 2017-06-04 10:52:43 +01:00
cnr
347cddccc0 Use UUID in enjin commands instead of name 2017-06-03 14:22:04 -05:00
Sam
e094446be4 Add biff to the hero list 2017-06-03 15:33:26 +01:00
Sam
dbde734e76 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-03 14:54:43 +01:00
Sam
c3f3d71610 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters 2017-06-03 14:53:34 +01:00
Sam
674253c89a Gen Hunters Title 2017-06-03 14:53:33 +01:00
Sam
092c5db6b2 Merge remote-tracking branch 'refs/remotes/origin/update/gem-hunters-11-5' into update/gem-hunters 2017-06-02 20:10:51 +01:00
Sam
7e05cbfa87 Biff 2017-06-02 18:43:07 +01:00
Sarah
844052c0c6 Async db calls... 2017-06-02 07:05:23 -05:00
Alexander Meech
62d15eeee1 Make podium generation setting based on map rather than hardcoded server group 2017-06-02 02:42:21 -05:00
Dan Mulloy
abaaaebd43 Use "Coming soon!" instead of empty string 2017-06-02 00:04:47 -05:00
Dan Mulloy
414573c18d Make Carl more robust, print better warnings when he breaks 2017-06-02 00:02:00 -05:00
cnr
2701476ea8 Merge branch 'feature/quests' into develop 2017-06-01 21:47:38 -05:00
Sarah
73897e407b Add fix for new game lobbies 2017-06-02 03:41:06 +02:00