AlexTheCoder
0a5dae5857
Fixed merge conflicts
2017-09-23 03:58:40 -04:00
AlexTheCoder
567b501dfb
Fixed merge conflicts
2017-09-23 03:41:43 -04:00
AlexTheCoder
eecf960613
Fixed Merge Conflicts
2017-09-23 03:40:21 -04:00
Sam
76ae23b56f
Start on profiles
2017-09-20 22:21:42 +01:00
Sam
5ec2307cc9
Cleanup CustomDataManager
2017-09-19 14:51:37 +01:00
Sam
efc1ffe9db
Finish off Old Chests
2017-09-18 12:19:02 +01:00
Sam
fd75b53bcc
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover
2017-09-16 23:33:43 +01:00
Sam
2b4e9e62e1
The mess that is now this
2017-09-16 23:33:42 +01:00
Sam
52adaf45a2
Only disable costumes
2017-09-13 22:59:19 -05:00
Sam
134039bf79
Revert "Revert "Disable gadgets if the game is in progress""
...
This reverts commit d3ae579317cc8db79e65468c0a5f85979d82ba37.
2017-09-13 22:59:19 -05:00
Sam
fba7997549
Revert "Disable gadgets if the game is in progress"
...
This reverts commit c03a0c859bbeaedb2640c2d6d927d40e42374f85.
2017-09-13 22:59:19 -05:00
Sam
f72c2d4ec0
Disable gadgets if the game is in progress
2017-09-13 22:59:19 -05:00
Sam
e51487a949
Actually never mind
2017-09-13 22:59:19 -05:00
Sam
88f842d8b7
Remove the fakeLeashDamage check, causes too many problems
2017-09-13 22:59:19 -05:00
Sam
3362793324
Removed the Bomb Lobbers Jumper cooldown
2017-09-13 22:59:19 -05:00
Sam
b8210f5eac
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover
2017-09-12 21:33:20 +01:00
Sam
fc258d95b9
Fix infinite slowness
2017-09-11 21:45:00 -05:00
Sam
5ed7be68d9
Fix invincibility
2017-09-11 21:44:53 -05:00
Sam
bf82b7c0f4
Disable gadgets when the timer gets below 5
2017-09-10 23:54:10 +01:00
Sam
c729857a00
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover
2017-09-09 09:19:46 +01:00
cnr
aac173c105
Merge branch 'update/moba-cosmetics' into develop
2017-09-08 20:31:39 -05:00
Sam
c0cda476e4
Complete chest
2017-09-09 02:29:19 +01:00
Sam
9214c809dc
Add support for bardolf's werewolf skin
2017-09-08 17:43:39 +01:00
Sam
554aeb6af5
Bug fixes
2017-09-08 16:51:13 +01:00
Sam
7b1245077f
Finish everything
2017-09-08 11:10:24 +01:00
cnr
4c3de65734
Enable Anticheat strict mode
2017-09-07 21:21:28 -05:00
Sam
330ed28992
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics
2017-09-06 11:31:53 +01:00
Sam
8724a35269
Tron Hub Game
2017-09-06 11:22:49 +01:00
AlexTheCoder
64c2c65bd0
Fix debug permissions
2017-09-02 20:03:28 -04:00
cnr
b860a69d46
Allow event hosts to use /game
2017-09-01 23:14:26 -05:00
Sam
f41e94a3f4
Fix compilation errors
2017-09-01 16:57:15 +01:00
Sam
cd99700eda
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics
2017-09-01 16:12:51 +01:00
cnr
cad44497bd
Fix missed compile errors
2017-09-01 00:25:39 -05:00
cnr
919141f2a7
Merge branch 'develop' into feature/rank-rewrite
2017-08-30 17:42:16 -05:00
cnr
994f957bc3
Eliminate GroupPermission
2017-08-28 13:06:59 -05:00
Sam
8e327e86b4
Huge improvement on the Cosmetic System
2017-08-26 16:14:22 +01:00
Sam
19c65560c5
Remove rotaton on emblems
2017-08-24 11:52:04 +01:00
Sam
e412c2cc05
Gem Hunter Mount Skins
2017-08-21 21:11:13 +01:00
Sam
fd090a5644
Fix a lot of bugs
2017-08-20 23:04:28 +01:00
Sam
1c86cff6d7
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics
2017-08-18 16:51:51 +01:00
Sam
c0ed39d9f9
Get emblems to spawn
2017-08-18 16:51:50 +01:00
Sam
01fb5a312f
More balance changes
2017-08-18 15:33:31 +01:00
Sam
d9a2306f9b
Always setMaxHealth from a base of 20
2017-08-17 23:59:38 -04:00
Sarah
7f6796cff9
Fix Dragon Escape mission
2017-08-17 23:59:04 -04:00
cnr
4a08c3f1d7
Implement requested Anticheat changes
...
- Reduce speed + glide ban VL to 7500
- Re-enable bans for Killaura type D and Killaura type F
- Re-enable auto-sneak detection and bans
- Disable Killaura type D in MOBA and CS
2017-08-17 00:58:39 -04:00
Sam
849fa93c7c
Mount base
2017-08-16 15:00:08 +01:00
Sam
7667bf47c4
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics
2017-08-14 16:58:16 +01:00
Sam
9300af8370
Added the Hero Ivy
2017-08-14 16:57:44 +01:00
Sam
456f959a8d
Implement Emblems
2017-08-13 15:25:41 +01:00
cnr
36bd6af902
Disable movement checks in MOBA and lower Timer threshold
2017-08-12 23:31:09 -04:00
Sam
4c3a8e267f
Titles base
2017-08-12 19:23:07 +01:00
Sam
2000d8ee12
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics
2017-08-11 14:10:29 +01:00
Sam
bad25cabd9
Thanks git...
2017-08-10 20:23:09 +01:00
Sam
c23c34c346
Only check if they can mount a horses if the games is live
2017-08-10 20:22:56 +01:00
Sam
8135ca022c
Actually check that the player is allowed to have the default kit
2017-08-10 20:14:57 +01:00
cnr
987de21b3e
Bake permissions ahead of time and prepare GroupPermission refactor
2017-08-10 14:40:26 -04:00
Sam
b9640a763c
Fix a negative number of defenders shown on the scoreboard.
2017-08-10 19:38:22 +01:00
Sam
0e5fa827fa
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics
2017-08-10 13:51:13 +01:00
Alexander Meech
d4071e6de5
Provide access to specific tournament controllers to stop active games
2017-08-09 22:37:38 -04:00
cnr
ba8f4e0d5a
De-stringify permission groups
2017-08-09 22:26:55 -04:00
AlexTheCoder
99938b4462
Make code compile
2017-08-09 16:32:37 -04:00
AlexTheCoder
482a02fee1
Small fixes
2017-08-09 16:26:55 -04:00
AlexTheCoder
aa79e9338d
Implement permission requests from admin team
2017-08-09 15:19:48 -04:00
AlexTheCoder
ef4aeaaf64
Initial rank rewrite and quest database fixes
2017-08-09 15:19:48 -04:00
Sam
b219645722
Set the SplitKitXP in the appropriate games
2017-08-09 02:40:09 +01:00
Sam
190293656e
Remove old Castle Siege
2017-08-08 21:59:41 +01:00
Sam
0b38b1b6b6
Testing fixes
2017-08-08 21:50:19 +01:00
Sam
5e0b007180
Prvent Undead Minions from attacking their owner
2017-08-07 18:10:04 +01:00
Sam
2b89cc2fb9
Fix heroes unlocking 1 level after they are meant to
2017-08-05 22:15:54 +01:00
Sam
ebc198f88a
More bug fixes
2017-08-05 22:10:25 +01:00
Sam
1591c1592a
Typos
2017-08-05 18:01:35 +01:00
Sam
1a671e8356
Add a castle seige title for the testers
2017-08-04 23:41:52 +01:00
Sam
722c858491
Make Kit Progression award XP on all kits used in a game
2017-08-04 21:55:55 +01:00
Sam
e57ab4bf3d
Make achievement kits have requirements
2017-08-04 16:19:06 +01:00
Sam
c88d609780
New Chest
2017-08-03 00:34:22 +01:00
Sam
3b637ca600
Implement client side shop morphs
2017-08-02 19:56:48 +01:00
Sam
dea3297da7
Apply the skin to players in game.
2017-08-01 17:25:36 +01:00
Sam
0777855d9f
Community testing feedback
2017-07-31 20:48:36 +01:00
Sam
5aefca3c6c
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege
2017-07-31 19:11:34 +01:00
Sam
89e820e442
Remove all GameModifiers and replace them with GameCosmetics
2017-07-31 16:48:56 +01:00
Sam
ebd9986542
Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/moba-training
2017-07-27 12:33:09 +01:00
Sam
5edfcfa40e
Stop training mode from using map specific code
2017-07-27 10:47:14 +01:00
AlexTheCoder
53f28ac26b
Add a sound when your king is being damaged
2017-07-26 23:34:01 -04:00
AlexTheCoder
f2e5dfffd9
Change kit description color because joe has OCD
2017-07-26 23:34:00 -04:00
AlexTheCoder
4f8a71cefc
Remove bolded text from kill streak reward information
2017-07-26 23:34:00 -04:00
AlexTheCoder
5873075836
Clear potion effects on kit equip
2017-07-26 23:34:00 -04:00
AlexTheCoder
d737b41281
Make the starting Alchemist potions marked Kit Items
2017-07-26 23:34:00 -04:00
AlexTheCoder
d5f56cdb32
Remove Bow from game chests and document bow presence in Archer kit
2017-07-26 23:34:00 -04:00
AlexTheCoder
f8f87a23bc
Fix bug causing tnt to not function, increase tnt damage, remove fire resistance from loot pool, and implement Alchemist kit
2017-07-26 23:34:00 -04:00
AlexTheCoder
b672988d31
Nerf Fighter kit
2017-07-26 23:34:00 -04:00
AlexTheCoder
05de024606
Buff Demolitionist kit
2017-07-26 23:34:00 -04:00
AlexTheCoder
bf86c08126
Buff Archer kit
2017-07-26 23:34:00 -04:00
AlexTheCoder
e9c3aebf90
Complete Alchemist kit
2017-07-26 23:34:00 -04:00
AlexTheCoder
3ffd2966b6
Nerf Tank kit
2017-07-26 23:34:00 -04:00
AlexTheCoder
3952fa2e1d
Increase amplifier and duration of Castle Assault spawn regeneration and add spawn resistance
2017-07-26 23:34:00 -04:00
cnr
3fbad35a30
Merge branch 'update/moba-2' into develop
2017-07-26 21:48:15 -04:00
Sam
16744de296
Fix some bugs
2017-07-27 02:35:19 +01:00
cnr
e599f28d34
Modify HotJoiningManager join message
2017-07-26 21:22:16 -04:00
Sam
cd3a90da08
Fix level display for real this time
2017-07-26 20:57:45 -04:00
cnr
5b7f6a94ee
Merge branch 'update/moba-2' into develop
2017-07-26 20:27:37 -04:00
Sam
d951089239
Fix the Egg Blaster, Explode disguise bug
2017-07-26 20:25:32 -04:00
Sam
a70be6ffd8
Fix level display for real this time
2017-07-26 23:03:48 +01:00
cnr
f86664c510
Revert MOBA exp per level to 1000
2017-07-26 12:38:02 -04:00
Sam
ddf0666ba6
Fix level displays
2017-07-25 20:13:50 +01:00
Sam
4f221cabba
Fix the NPE that caused MPS crashes
2017-07-25 19:22:11 +01:00
Sam
789658b2d9
Second MOBA map
2017-07-25 17:57:25 +01:00
Sam
84bf321fe5
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-2
2017-07-24 23:14:51 +01:00
Sam
ce95ac481f
Bug fixes
2017-07-24 23:03:31 +01:00
Sam
abf51064b3
Implementation of achievements
2017-07-24 20:50:45 +01:00
Sam
e8eb364d99
Fix incorrect descriptions
2017-07-24 15:40:15 +01:00
Sam
23373834a2
Achievement Kits
2017-07-24 15:36:45 +01:00
Sam
115b4487ea
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege
2017-07-22 21:27:24 +01:00
Sam
66fdd9be9f
Skeleton mode
2017-07-22 14:24:29 +01:00
cnr
e5e0fd8eda
Halve exp requirements for leveling in MOBA
2017-07-20 01:03:03 -04:00
cnr
d5d21a3fab
Disable anticheat checks in event servers
2017-07-20 01:00:37 -04:00
Sam
8516a98087
Lots of bug fixes
2017-07-20 00:32:42 -04:00
Sam
0fa8a80f2e
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege
2017-07-17 12:56:41 +01:00
cnr
f202085eeb
Remove Heroes of GWEN from MPS
2017-07-15 13:21:29 -07:00
Sam
4a5913bb3a
Don't have the second towers be Elder Guardians
2017-07-14 17:40:22 +01:00
Sam
d9e1d211ac
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege
2017-07-14 13:33:06 +01:00
cnr
2fd3c9cc2f
Send players into the training arena only if the game has started
2017-07-14 03:39:41 -07:00
cnr
1c75ec3f89
Merge branch 'feature/moba' into develop
2017-07-13 21:18:25 -07:00
Sam
aa69b75be0
Final push
2017-07-14 02:04:29 +01:00
cnr
da08868206
Fix ClassCastException in HitQuestTracker
2017-07-13 18:02:39 -07:00
Sam
17ba7ffe8a
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-07-13 15:50:05 +01:00
Sam
e777293866
Add achievements
2017-07-13 15:38:56 +01:00
cnr
f77cc39f0c
Merge branch 'feature/quests' into develop
2017-07-12 22:49:15 -07:00
Sam
59af31c6f8
Fix spectators being able to interact with hero selection
2017-07-13 00:18:45 +01:00
Sam
c4508b653a
Remove rank requirement for HOG
2017-07-13 00:16:40 +01:00
Sam
25d3c09329
Complete implementation of game stats
2017-07-12 23:33:45 +01:00
Sam
c7c8a848b1
More fixes
2017-07-12 19:18:14 +01:00
Sam
0d7079eae7
Fix silver fish just not doing anything
2017-07-12 18:05:47 +01:00
Sam
06a8c191ac
Complete the implementation for map boards
2017-07-12 00:38:54 +01:00
Sam
b7c629c4c8
Make item map billboards not really work
2017-07-11 02:10:43 +01:00
Sam
c18c6cfc6a
More changes
2017-07-10 21:59:34 +01:00
Sam
7544ff98ae
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege
2017-07-09 00:22:30 +01:00
Sam
84752f0b17
Item maps
2017-07-08 01:34:19 +01:00
Sam
994517b3a4
Finish up training mode
2017-07-07 02:22:05 +01:00
Sarah
8e0bb18076
Fixes of current and new missions
2017-07-06 22:55:34 +02:00
Sam
590c3d804b
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-07-06 17:15:51 +01:00
AlexTheCoder
d61e067b86
Allow customer support to track freedom chests and improve error information to prevent forging/confusion
2017-07-05 21:38:53 -07:00
Sam
fd660f95a0
Fix players getting stuck in pregame lobbies
2017-07-05 21:38:53 -07:00
Sam
c5818b1bb5
Update time!
2017-07-06 00:35:05 +01:00
Sarah
1d046ff119
Add "all" to the GetMineplexMission Command, dont let specs get chest quest progress
2017-07-05 23:38:24 +02:00
Sam
558eeb528f
Kit progression complete
2017-07-03 00:17:09 +01:00
Sam
e2ff415e4d
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege
2017-07-01 15:36:10 +01:00
cnr
0ac3e227fd
Merge branch 'feature/battle-royale' into develop
2017-06-30 22:15:53 -07:00
cnr
5ba1630fae
Merge branch 'update/july-cosmetics' into develop
2017-06-30 22:15:31 -07:00
AlexTheCoder
43b1a118d3
Final tweaks and bugfixes for Sigils
2017-07-01 01:11:17 -04:00
Sam
81ae3e0049
Give players rewards and remove debug messages
2017-06-30 19:32:08 +01:00
Sam
29488a4ab8
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege
2017-06-30 14:23:10 +01:00
Sam
f719e0db8d
Clean up player data
2017-06-30 14:22:43 +01:00
Sam
811463e586
Attempt to somewhat fix the lag whenever the game starts
2017-06-30 13:56:20 +01:00
Sam
67d792e9d7
More progress
2017-06-30 12:57:20 +01:00
Sam
a8e1799617
Fix Deathbomber achievement tracker
2017-06-30 00:27:12 +01:00
Sam
5a7c7b8fa3
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/battle-royale
2017-06-29 11:27:45 +01:00
cnr
dfe2a61b8f
Revert freedom chest cosmetics
2017-06-28 23:43:30 -07:00
cnr
ed67a44fef
Merge branch 'feature/moba' into develop
2017-06-28 20:39:27 -07:00
Graphica
7d17fa0f29
Update hubs with new CosmeticManager constructor
2017-06-28 20:38:58 -07:00
Sam
7bd5d65823
Reduce the amount of gems given for gold earned
2017-06-29 00:37:42 +01:00
Sam
b8bb25b04d
Only reset player health upon actual respawn
2017-06-29 00:35:18 +01:00
Sam
67d8e0863d
Fix overtime being at 1 minute
2017-06-29 00:13:06 +01:00
Sam
85007820d2
Add a go-back button to kit selection
2017-06-28 23:38:50 +01:00
Sam
968fec5d77
Fix the cages not being removed correctly
2017-06-28 16:41:46 +01:00
Sam
82182c5d50
Balance changes
2017-06-28 15:34:56 +01:00
Graphica
9d1c3930b3
Update hubs with new CosmeticManager constructor
2017-06-28 01:37:33 -04:00
Sam
b9a72312a8
Add a go back button on kit selection
2017-06-28 00:21:47 +01:00
Sarah
333f1eda76
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests
2017-06-27 23:15:43 +02:00
Sarah
8541b984c6
Implement new Quests and fix older Quests
2017-06-27 23:15:25 +02:00
Sam
61dd8e088e
More CS Progress
2017-06-27 17:52:20 +01:00
Sam
a79c79bc99
Add wither overtime
2017-06-27 12:38:43 +01:00
cnr
ed541b7a4f
Disable automatic timings reports
2017-06-26 20:17:50 -07:00
Sam
9cdc698999
Make it compile
2017-06-26 22:17:36 +01:00
Sam
76e13df32b
More castle siege
2017-06-26 20:42:10 +01:00
Sam
9f182d123f
Castle Siege partial re-code
2017-06-25 18:29:34 +01:00
Sam
31533f29b7
Add Guns into Battle Royale
2017-06-24 18:19:56 +01:00
Sam
3c031c70a1
Fix training lobby bugs
2017-06-24 10:09:52 +01:00
Sam
c6a3001bae
Basic battle royale game
2017-06-23 22:31:08 +01:00
Sam
4c6dfe6657
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-06-23 14:16:32 +01:00
Sam
98f9a58849
Fix light arrows being able to damage yourself
2017-06-23 14:12:36 +01:00
cnr
b43203f831
Revert "Disable beta whitelist for MOBA"
...
This reverts commit 0374506879
.
2017-06-22 23:32:55 -05:00
md_5
a6493ed18a
Update MapParser to 1.12, refactor out some common base utilities.
2017-06-22 23:25:20 -05:00
cnr
0374506879
Disable beta whitelist for MOBA
2017-06-22 23:20:07 -05:00
Sam
b1c3b2c937
Balance changes and QOL changes
2017-06-23 02:11:17 +01:00
Sam
2912968295
Fix movable NPCs
2017-06-23 01:51:16 +01:00
Sam
21c7b082b0
Add a method to clear purchases
2017-06-23 01:43:38 +01:00
Sam
65ebf41d4f
Finish the training game for now
2017-06-23 01:43:11 +01:00
Sam
f22a091fa0
More training game stuff
2017-06-22 20:21:19 +01:00
Sam
e99be53bb5
Add a middle class to deal with multiple modes
2017-06-22 12:07:11 +01:00
Sam
0fe2c52500
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-06-21 13:57:12 +01:00
cnr
31605b02b0
Use polygon geometry for MOBA Boss AI boundaries
2017-06-19 18:38:31 -05:00
Sam
db98aa01c8
Training game base
2017-06-19 17:10:06 +01:00
Sam
51460475de
Change the Shop Item description
2017-06-17 12:47:28 +01:00
Sam
dda27cb7fe
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-06-17 12:45:16 +01:00
Sam
9c5565ac3b
Remove recalling as it is unused
2017-06-17 12:45:15 +01:00
Sam
04fafea3ed
Fixed a number of error causes
2017-06-17 12:40:08 +01:00
cnr
04d9e7326d
Fix NPE in OP Skywars startup
2017-06-16 19:22:53 -05:00
Sam
b758254f4c
Don't reset the player when an item is purchased
2017-06-16 18:54:23 +01: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