Commit Graph

7685 Commits

Author SHA1 Message Date
Jonathan Williams
a6710280fb Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-02 00:45:10 -05:00
Jonathan Williams
01d9c1cd09 Finished the <?> for Objective and ObjectiveGoal. 2016-04-02 00:45:01 -05:00
Shaun Bennett
d161d83d12 Maps and other various fixes 2016-04-02 15:43:03 +11:00
Shaun Bennett
5739b1b87b Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-04-02 15:13:16 +11:00
Jonathan Williams
3bc1908b57 Fix player quit staying in _active list for Objectives. 2016-04-01 23:10:15 -05:00
Shaun Bennett
758004f207 Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-04-02 14:55:14 +11:00
Jonathan Williams
fa6d18b0fa Fix sync db call inside sendMessage 2016-04-01 22:43:09 -05:00
Cheese
8f959a73eb debug 2016-04-02 12:46:25 +11:00
Cheese
9969b7d783 support for resource packs for different MC versions 2016-04-02 11:39:40 +11:00
Shaun Bennett
0abcd0044b Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-04-02 10:53:28 +11:00
Joseph Prezioso Jr
6e23a17acb Removed unnecessary code. 2016-04-01 16:01:57 -04:00
phobia
90e336b18e Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-01 21:51:51 +11:00
phobia
42fd210b20 PC-56 2016-04-01 21:51:31 +11:00
Jonathan Williams
fe41e79e8a Fixes:
10 minute timer for creating clan after tutorial.
CCM with LeaveSpawnGoal
Synchronous database calls.
2016-04-01 01:55:08 -05:00
phobia
9a1e5099a4 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-01 14:04:12 +11:00
phobia
d0bc40b991 PC-56 and PC-65 2016-04-01 14:01:38 +11:00
Shaun Bennett
49441cfaf4 PC-63 and PC-64 2016-04-01 10:47:21 +11:00
Ben
3412082f37 PC-61 - Remove all diamonds from inventory after sell diamonds objective 2016-04-01 00:33:42 +01:00
Ben
da99a12b23 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-31 20:03:50 +01:00
Ben
d353c53524 remove hard-coded access to certain commands for my uuid/name 2016-03-31 20:03:25 +01:00
Joseph Prezioso Jr
5e1003cccb Missed a minus sign in my previous commit. 2016-03-31 14:06:45 -04:00
Joseph Prezioso Jr
6ccc6df6aa Elo calculations now account for player's Elo, relative to the average Elo among players 2016-03-31 13:57:21 -04:00
William Burns
4ec833727f PC-20 - Detailed Objective Text 2016-03-31 18:45:17 +01:00
Joseph Prezioso Jr
cbb9798c35 Added AdjustPlayertElo method to increment/decrement the Elo's of individual players at the end of a game. Currently calling the new method in AnnounceEnd. 2016-03-31 12:49:22 -04:00
phobia
19b2b00a13 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-31 20:35:40 +11:00
phobia
86bdbbb8bc PC-46 + adding in events for buttons 2016-03-31 20:35:21 +11:00
Shaun Bennett
682c365bc6 Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-03-31 20:09:16 +11:00
Shaun Bennett
b3392e78f5 PC-28 - Improve Flow of Tutorials 2016-03-31 20:08:45 +11:00
AlexTheCoder
4ae4f056ea - Map Polish 2016-03-31 03:46:43 -04:00
AlexTheCoder
40175db217 - Lots of polish 2016-03-31 03:41:07 -04:00
Shaun Bennett
30a098c645 PC-49 - Kick players out of their clan when they start the tutorial if they have one (from previously playing the tutorial). 2016-03-31 18:24:47 +11:00
Shaun Bennett
7c70092f3b PC-48 - Create a hologram saying "Jump Off" at the edge of spawn island 2016-03-31 18:19:06 +11:00
Shaun Bennett
e7b9d866ae PC-57 - Rename Identify Fields to Identify Fields on Map 2016-03-31 17:10:56 +11:00
Shaun Bennett
c51830145e PC-58 - Close gate to the fields after you sell diamonds 2016-03-31 17:09:51 +11:00
Shaun Bennett
f229da1327 PC-55 - Remove all potatoes from inventory when player completes "Sell Potatoes" 2016-03-31 17:08:26 +11:00
Shaun Bennett
25975e47b8 PC-54 - Rename Identify Shops to Identify Shops on Map 2016-03-31 17:07:08 +11:00
Shaun Bennett
7867da277d PC-52 - Rename Identify Enemy Clan to Identify Enemy on Map 2016-03-31 17:05:59 +11:00
Shaun Bennett
50518250de PC-51 - Rename randomClan to EnemyClan 2016-03-31 17:02:38 +11:00
Shaun Bennett
44abf8f1e2 Naming fixes 2016-03-31 16:47:16 +11:00
Ben
62280a8fa5 Fix diamond from flying far away when breaking diamond blocks in the fields 2016-03-31 01:11:30 +01:00
Ben
622843ca8e PC-47 - Remove item drops from tutorial cannon hit 2016-03-31 01:08:01 +01:00
Ben
0fd39e1300 missing event 2016-03-31 00:47:06 +01:00
Ben
36caf16c9a Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-31 00:03:12 +01:00
Ben
0f22c4359d PC-19 - Remove World Event messages for players in Tutorial 2016-03-31 00:02:51 +01:00
Joseph Prezioso Jr
b1c29a4fa6 Setup proper Elo brackets with the top 1% being placed in diamond. Also changed starting Elo to 1400 (middle of Iron 1), leaving Coal as a purely regressive division. 2016-03-30 16:06:30 -04:00
phobia
978f978023 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-30 23:01:55 +11:00
phobia
d6560fcf5c Fixes to Clan info goal 2016-03-30 23:01:39 +11:00
Shaun Bennett
5652eb75cf Fix NPE in MountCannonGoal 2016-03-30 22:33:23 +11:00
William Burns
5149043d14 PC-38 - Don't open gate until player is 12 blocks away 2016-03-30 01:09:29 +01:00
William Burns
ed65f19417 PC-42 - Fireworks and Effects at end of tutorial 2016-03-29 23:41:31 +01:00