AlexTheCoder
87ac55de44
Unremove server/lobby switcher
2017-08-09 15:19:48 -04:00
AlexTheCoder
9c5e5457f5
Remove hashcode dependence
2017-08-09 15:19:48 -04:00
AlexTheCoder
d390a9a492
Fixes from testing
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
137a7565f1
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/leveling
2017-08-09 01:44:28 +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
bb59a03040
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege
2017-08-08 19:30:37 +01:00
Kenny Goodin
2d9da9bc3a
Merge branch 'bugfix/anticheat' into develop
2017-08-07 15:35:02 -04:00
Kenny Goodin
7995707300
Revert "Update glide and speed violation thresholds to requested values"
...
This reverts commit 7b6badf87a
2017-08-07 15:29:58 -04:00
Sam
a71c0ecf87
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege
2017-08-07 18:10:05 +01:00
Sam
5e0b007180
Prvent Undead Minions from attacking their owner
2017-08-07 18:10:04 +01:00
Kenny Goodin
682b5a8624
Merge branch 'bugfix/anticheat' into develop
2017-08-07 01:54:40 -04:00
Kenny Goodin
7b6badf87a
Update glide and speed violation thresholds to requested values
2017-08-07 01:51:57 -04:00
Kenny Goodin
ead8377c4f
Temporarily disable killaura type D banwave
2017-08-07 01:50:40 -04:00
Sam
18e7143d5a
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/leveling
2017-08-05 22:32:34 +01:00
Sam
2b89cc2fb9
Fix heroes unlocking 1 level after they are meant to
2017-08-05 22:15:54 +01:00
Sam
43260c88f5
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics
2017-08-05 22:13:30 +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
d5fc1f32c3
Add the tester's UUIDs
2017-08-05 00:06:57 +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
eadfc55ae3
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege
2017-08-04 15:52:59 +01:00
Sam
193d3092df
Remove unused categories
2017-08-03 11:18:53 +01:00
Graphica
0840153394
Add legacy sales package to flags
2017-08-02 22:38:59 -04:00
Sam
e8b0a1f968
Add HOG Chests to the support server
2017-08-03 01:51:09 +01:00
Sam
b692bf1e75
Make morphs display the current cost
2017-08-03 01:41:52 +01:00
Sam
eb9d13bf15
Fix a bunch of bugs
2017-08-03 01:41:30 +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
b1bab85934
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege
2017-08-01 17:31:36 +01:00
Sam
dea3297da7
Apply the skin to players in game.
2017-08-01 17:25:36 +01:00
Sam
c78eb933b3
Add skins into the UI
2017-08-01 17:00:40 +01:00
Sam
bf940177f9
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics
2017-08-01 13:07:01 +01:00
Graphica
8310849f04
Hide new flags for now
2017-07-31 22:37:49 -04:00
Graphica
2fd67836ad
Add missing bold code
2017-07-31 22:37:49 -04:00
Graphica
8c911586dc
Clean and document code
2017-07-31 22:37:49 -04:00
Graphica
04f182c745
Add old holiday items into omega chests
2017-07-31 22:37:49 -04:00
Graphica
7c77a89b48
Add ppc and flags to treasure
2017-07-31 22:37:49 -04:00
Graphica
540e450f66
Create melon head morph
2017-07-31 22:37:49 -04:00
Graphica
ab91e3cfd6
Add fruit skin data
2017-07-31 22:37:49 -04:00
Graphica
4b052e111a
Add constructor that allows gadget pages to not be built immediately
2017-07-31 22:37:49 -04:00
Graphica
4a7971b843
Add new flag types
2017-07-31 22:37:49 -04:00
Graphica
fbcec02adc
Add scrolling to flag cosmetics page
2017-07-31 22:37:49 -04:00
Graphica
488e8af998
Improve flag name formatting
2017-07-31 22:37:49 -04:00
Graphica
c2ab6f9dd4
Allow flags to handle article formatting
2017-07-31 22:37:49 -04:00
Graphica
d24b8a229c
Alphabetize CountryFlag data
2017-07-31 22:37:49 -04:00
Graphica
200578df88
Add new flags to CountryFlag enum
2017-07-31 22:37:48 -04:00
Graphica
dadbd87f45
Correctly enable/disable chests
2017-07-31 22:37:48 -04: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
7a9c5843fc
Get skin data from Google Sheets
2017-07-31 19:11:00 +01:00
Sam
3f47ae6e2e
Remove a rouge class
2017-07-31 16:49:08 +01:00
Sam
89e820e442
Remove all GameModifiers and replace them with GameCosmetics
2017-07-31 16:48:56 +01:00
Sam
16daa3f7d8
Add methods to check if a player owns a game cosmetic
2017-07-31 11:52:19 +01:00
Sam
67291804bf
Remove old GameModifierPages
2017-07-30 17:08:46 +01:00
Sam
4f6d24dea8
Implement a mini-application inside the Google Sheets module that provides an easy way to get skin data
2017-07-30 16:11:18 +01:00
Sam
c7e4d5b00b
Fix NPE
2017-07-29 22:36:25 +01:00
Sam
f198a2f66b
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics
2017-07-29 22:25:34 +01:00
Sam
3f739a5f22
Finish off morphs
2017-07-29 22:25:33 +01:00
Dan Mulloy
bfee68007c
Fix disguise nametags on 1.10+
2017-07-28 21:57:07 -04:00
Dan Mulloy
c69f67b3e8
Fix skeleton disguises appearing invisible
2017-07-28 17:20:04 -04:00
Sam
a9b4519843
Fix imports and item related bugs
2017-07-28 21:06:03 +01:00
Sam
dd675b407a
Add Game Cosmetics and the 4 basic hero morphs
2017-07-28 20:10:10 +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
94ea5c4134
Cosmetic base
2017-07-27 12:33:04 +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
8dcea688ed
Add alchemist kit kills achievement
2017-07-26 23:34:00 -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
AlexTheCoder
9f45d3672d
Add Castle Assault to Build Server
2017-07-26 23:34:00 -04:00
AlexTheCoder
66e5339eab
Make UtilEnt#GetMetadata infer needed type
2017-07-26 23:34:00 -04:00
cnr
eb566d3363
Remove debug broadcasts
2017-07-26 23:29:07 -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
Alexander Meech
52341c1550
Update BonusGui.java
2017-07-26 21:29:13 -04:00
Alexander Meech
04491493c2
Update SpecificChannelButton.java
2017-07-26 21:29:13 -04:00
Alexander Meech
2180be2055
Remove Specific creators from BonusManager
2017-07-26 21:29:13 -04: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
099d2cb132
Cleanup HubVisibilityManager while slowing down the rate at which players are shown other players
2017-07-26 20:26:46 -04:00
Sam
86c733259f
Allow double jumping when having hub velocity disabled
2017-07-26 20:26:46 -04:00
Sam
d951089239
Fix the Egg Blaster, Explode disguise bug
2017-07-26 20:25:32 -04:00
cnr
cfc1a29444
Merge branch 'bugfix/disguises' into develop
2017-07-26 20:25:17 -04:00
Sam
a70be6ffd8
Fix level display for real this time
2017-07-26 23:03:48 +01:00
cnr
1fb69edc13
Add Timer ban action @ 15000 VL
2017-07-26 12:40:38 -04: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
Dan Mulloy
49c50b027b
Attempt to get version strings with /versions
...
Makes it easier for those who don't know the protocol ;)
2017-07-23 16:26:46 -04:00
Dan Mulloy
99ca371204
Treat magma cubes as slimes and slimes as creatures for disguises
...
Fixes crashes in 1.12
2017-07-23 16:14:29 -04:00
AlexTheCoder
06a90abc6a
Properly store clans tag for sales announcement deletion
2017-07-22 22:21:12 -04:00
AlexTheCoder
8054296d0a
Fix incorrect local removal of sales announcements
2017-07-22 20:31:51 -04: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
AlexTheCoder
5ccc599ef1
Clean up anticheat clans blacklist reason
2017-07-21 22:34:35 -04:00
AlexTheCoder
d8d1ee7832
Fix anticheat banning in clans
2017-07-21 22:31:23 -04:00
AlexTheCoder
a29cff2db1
Properly block Scythe healing when hitting teammates
2017-07-20 16:52:49 -04: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
cnr
2c0d460357
Add Timer check (no bans enabled)
2017-07-20 00:55:14 -04:00
Sam
8b6f79a5ee
Delay persistence data get
2017-07-20 00:32:50 -04:00
Sam
8516a98087
Lots of bug fixes
2017-07-20 00:32:42 -04:00
Dan Mulloy
fb28a953e6
Hide players from staff if the staff are also at the spawn point
2017-07-20 00:32:33 -04:00
Dan Mulloy
2c997935c9
Rewrite spawn meta for all living entities on 1.10 and up
2017-07-20 00:32:14 -04:00
Dan Mulloy
7836e0aaaa
Fix guardian disguises
...
This commit fixes guardian disguises (esp. elder guardians) and also provides for disguises to modify packets before they're sent if necessary
2017-07-20 00:32:14 -04:00
Dan Mulloy
8b39fa4e24
Perform disguise validation before doing any of the disguise work
...
If a disguise is invalid, we won't notify redis or prevent players from joining
2017-07-20 00:32:14 -04:00
AlexTheCoder
ac2df004f0
Fix players being combat tagged after respawn
2017-07-17 19:00:03 -04:00
AlexTheCoder
4f04d879ab
I'm a dumbo, and remove the ability to add runes to the Scythe of the Fallen Lord
2017-07-17 18:36:59 -04:00
AlexTheCoder
9daa46bb4a
Unify combat tag checking
2017-07-17 13:57:38 -04:00
AlexTheCoder
d5355ab757
Despawn mounts on chunk unload and clean up some formatting
2017-07-17 13:57:38 -04:00
AlexTheCoder
5e70ff8471
Block sleeping in beds
2017-07-17 13:57:38 -04:00
AlexTheCoder
8379c6235b
Lower freeze walk buffer
2017-07-17 13:57:38 -04:00
AlexTheCoder
46768c60ec
Disable all other magmus abilities while heat room is active, and make the heat room safezone despawn after damage stops occurring
2017-07-17 13:57:38 -04:00
AlexTheCoder
99c2522e92
Clean up the Clans blacklist GUI
2017-07-17 13:57:38 -04:00
AlexTheCoder
f00d9fbb54
Fix sales announcement remote updates being handled async
2017-07-17 13:57:38 -04:00
AlexTheCoder
7354c4dc1c
Allow access to clans blacklisting from core, make GWEN issue 90-day clans blacklists for instabans and banwaves
2017-07-17 13:57:38 -04:00
AlexTheCoder
c2a46c14ed
Allow weapon runes to be added to the Scythe of the Fallen Lord
2017-07-17 13:57:38 -04:00
AlexTheCoder
0b902e3f6f
Fix the Scythe of the Fallen Lord healing the user when hitting allies and clan-mates
2017-07-17 13:57:38 -04:00
AlexTheCoder
5e540ea995
Increase legendary drop rate from raids and world bosses
2017-07-17 13:57:38 -04:00
AlexTheCoder
fdaa267f3e
Remove the bow from clans custom item durabilities
2017-07-17 13:57:38 -04:00
AlexTheCoder
7054706b0f
Begin work on clans capture point event
2017-07-17 13:57:38 -04:00
AlexTheCoder
82679aae8a
Kill players who log out during raids and force respawn players who die in raids
2017-07-17 13:57:38 -04:00
AlexTheCoder
460cc29c04
Fix clan-mates and allies being able to force despawn mounts
2017-07-17 13:57:38 -04:00
AlexTheCoder
953ad66aca
Update SalesAnnouncement system to allow clans-only announcements and make cross-server updating work properly
2017-07-17 13:57:38 -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
968bcc0223
Add MOBA to the game menu
2017-07-14 18:03:09 +01: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
6418a6006f
Manually construct WatchableObjects for custom item frames
2017-07-14 03:00:59 -07:00
cnr
bdaea49d56
Fix Heroes of GWEN select menu
2017-07-13 23:47:56 -07:00
cnr
22676ab9e3
Add selection page for Heroes of GWEN training / normal game
2017-07-13 22:31:22 -07:00
cnr
1c75ec3f89
Merge branch 'feature/moba' into develop
2017-07-13 21:18:25 -07:00
cnr
690854d067
Add tps and ping to each GWEN metadata frame
2017-07-13 21:17:26 -07:00
cnr
7535200c35
Fix out of bounds exception in legendary particle
2017-07-13 18:17:30 -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
Dan Mulloy
5cac083941
Add command to get versions, spawn wither skeletons with /mob
2017-07-12 22:54:38 -07:00
Sam
035c5e9011
Fix a typo
2017-07-12 22:50:17 -07:00
Sam
d15063a065
Fix "serverName" is restarting
2017-07-12 22:50:17 -07:00
Sam
8a18be0c5c
Shorten and fix a typo in the senior moderator title
2017-07-12 22:50:17 -07:00
AlexTheCoder
c695bb570e
Fix several thread-related issues in the leaderboard system
2017-07-12 22:49:44 -07: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
bfba119f3f
Really hackily fix item maps
2017-07-13 00:16:50 +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
f437ada4b9
Progress on game statistics
2017-07-12 16:49:50 +01:00
cnr
cecc3614b8
Set the correct key in QuitNPCRepository
2017-07-11 23:17:58 -07: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
cnr
c0cc3789b1
Fix server tps metadata key
2017-07-09 16:31:17 -07: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
AlexTheCoder
dd12824402
Fix NPE in LootModule
2017-07-07 07:13:31 -04:00
AlexTheCoder
f73c78809a
Whoops, forgot to change a line
2017-07-07 06:47:15 -04:00
AlexTheCoder
ce6ee670ed
Use a try-with-resources for gem hunters redis calls
2017-07-07 06:44:19 -04: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
b314744b6d
Fix incorrect event argument in UpdateRank
2017-07-05 21:41:00 -07:00
AlexTheCoder
f92eae067f
Add player ping and server tps to ban metadata
2017-07-05 21:41:00 -07:00
AlexTheCoder
a8c41f8904
Lowercase messages with >30 capital letters
2017-07-05 21:41:00 -07:00
md_5
4ccf9e39ad
Remove pling sound from /msg for version compat
2017-07-05 21:39:39 -07:00
cnr
e1a5e1d111
Merge branch 'feature/staff-titles' into develop
2017-07-05 21:39:14 -07:00
AlexTheCoder
79644e706c
Update CUST-1 menu for support staff request
2017-07-05 21:38:53 -07: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
cnr
c341671ffc
Move GH quit NPCs to redis; use region when saving GH data
2017-07-05 21:33:55 -07:00
Sam
ed3455db68
No need to update primary key
2017-07-06 00:59:43 +01: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
dca43b6c57
Separate Gem Hunters inventories by region
2017-07-03 00:36:54 +01:00
Sam
85c90ff791
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/staff-titles
2017-07-03 00:17:16 +01: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
5a4fab5fc0
Separate out Haunted Chest purchase condition
2017-07-01 04:11:03 -07:00
cnr
cd110ddef9
Add purchase condition for freedom chests
2017-07-01 03:48:49 -07:00
cnr
832c766290
Merge branch 'update/july-cosmetics' into develop
2017-07-01 02:57:48 -07:00
Graphica
b36c5da721
Fix bug which stopped more than 1 use of ability
2017-07-01 05:56:53 -04: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
Graphica
acaf3b2dd9
Change freedom treasure from 35k to 30k shards
2017-07-01 01:09:05 -04:00
Graphica
5957b96a4f
Add freedom fighter morph
2017-07-01 01:07:32 -04:00
Graphica
5a86141e8f
Fix costume count displaying incorrectly
2017-07-01 01:05:58 -04:00
Graphica
55a1afbb71
Expose banner data in CountryFlag
2017-07-01 01:05:44 -04:00
Graphica
b01cb0c2e9
Add Revolutionary SkinData
2017-07-01 01:05:05 -04:00
Sam
81ae3e0049
Give players rewards and remove debug messages
2017-06-30 19:32:08 +01:00
Sam
6dcdc57707
Adjust exp required
2017-06-30 15:13:21 +01:00
Sam
85342801a4
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/leveling
2017-06-30 14:23:28 +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
041d0020bd
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/staff-titles
2017-06-30 14:22:52 +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
13f4211739
Stop outfits from taking off flags
2017-06-28 20:38:59 -07:00
Graphica
6639d6eaed
Update disabled games for eternal taunt
2017-06-28 20:38:59 -07:00
Graphica
eeb8fabafe
Change niceness aura to use red and white tulips
2017-06-28 20:38:59 -07:00
Graphica
c97506fe0e
Align flowers correctly in spring leap
2017-06-28 20:38:59 -07:00
Graphica
732c996e94
Spawn trail particles behind player model
2017-06-28 20:38:59 -07:00
Graphica
c33c8998f8
Change Legend Aura to green
2017-06-28 20:38:59 -07:00
Graphica
2021a7e321
Correctly handle taunt cooldowns
2017-06-28 20:38:59 -07:00
Graphica
c2b025e883
Distribute heart particles using a gaussian curve
2017-06-28 20:38:59 -07:00
Graphica
a9311e7457
Reduce coal fume particles
2017-06-28 20:38:59 -07:00
Graphica
816f1467aa
Remove green from candy cane cosmetics
2017-06-28 20:38:59 -07:00
Graphica
5a3e79a63f
Add white to maple leaf death effect
2017-06-28 20:38:59 -07:00
Graphica
0495b2d1ec
Add cosmetics unlock command for all players
2017-06-28 20:38:59 -07:00
Graphica
36ec3014bf
Swap cosmetic menu positions of items
2017-06-28 20:38:58 -07:00
Graphica
1e289271c6
Clean up and add comments
2017-06-28 20:38:58 -07:00
Graphica
aba684ad95
Remove unnecessary packages
2017-06-28 20:38:58 -07:00
Graphica
7d17fa0f29
Update hubs with new CosmeticManager constructor
2017-06-28 20:38:58 -07:00
Graphica
f7ac799476
Overhaul legend particle
2017-06-28 20:38:58 -07:00
Graphica
ea8c7be5f0
Disallow eternal taunt disguising an already disguised player
2017-06-28 20:38:58 -07:00
Graphica
5387d3b580
Add cosmetics to chests
2017-06-28 20:38:58 -07:00
Graphica
4cc1068055
Allow Flags to interact with costumes and hats correctly
2017-06-28 20:38:58 -07:00
Graphica
e04d467830
Add new cosmetic items
2017-06-28 20:38:58 -07:00
Graphica
b214d43eec
Update hat and flag type enums
2017-06-28 20:38:58 -07:00
Graphica
2eff6ae34b
Reorganize packages
2017-06-28 20:38:58 -07:00
Graphica
4ef477159c
Fix gadget pages
2017-06-28 20:38:58 -07:00
Graphica
53d29fc9c9
Reduce lag on Molten Snake
2017-06-28 20:38:58 -07:00
Graphica
c15e8f8f90
Allow UtilParticle to accept java awt colors
2017-06-28 20:38:58 -07:00
Graphica
39f11da634
Create flag gadget type
2017-06-28 20:38:58 -07:00
Graphica
93015151db
Add Hat skin data
2017-06-28 20:38:58 -07:00
Graphica
7459a458cd
Add gaussian methods to UtilMath
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
Graphica
f291d37896
Stop outfits from taking off flags
2017-06-28 18:40:24 -04:00
Sam
85007820d2
Add a go-back button to kit selection
2017-06-28 23:38:50 +01:00
Graphica
2ef463c859
Update disabled games for eternal taunt
2017-06-28 18:36:59 -04:00
Graphica
2e23aae024
Change niceness aura to use red and white tulips
2017-06-28 18:33:49 -04:00
Graphica
6abeadf0ea
Align flowers correctly in spring leap
2017-06-28 18:33:28 -04:00
Graphica
61b8ed971d
Spawn trail particles behind player model
2017-06-28 18:33:18 -04:00
Graphica
ca8041e5b7
Change Legend Aura to green
2017-06-28 18:33:00 -04:00
Graphica
cfc223f52a
Correctly handle taunt cooldowns
2017-06-28 18:32:52 -04:00
Graphica
901d62c8e0
Distribute heart particles using a gaussian curve
2017-06-28 18:32:39 -04:00
Graphica
1899272a10
Reduce coal fume particles
2017-06-28 18:32:19 -04:00
Graphica
37996e6901
Remove green from candy cane cosmetics
2017-06-28 18:32:12 -04:00
Graphica
ea7475b950
Add white to maple leaf death effect
2017-06-28 18:32:00 -04:00
Graphica
7f729ca586
Add cosmetics unlock command for all players
2017-06-28 18:31:48 -04:00
Graphica
60f4511a79
Swap cosmetic menu positions of items
2017-06-28 18:31:39 -04: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
c7e4f4bd4d
Clean up and add comments
2017-06-28 02:02:57 -04:00
Graphica
fbd347ff41
Remove unnecessary packages
2017-06-28 01:40:46 -04:00
Graphica
9d1c3930b3
Update hubs with new CosmeticManager constructor
2017-06-28 01:37:33 -04:00
Graphica
082a197e8b
Overhaul legend particle
2017-06-28 01:37:20 -04:00
Graphica
bfca6603c1
Disallow eternal taunt disguising an already disguised player
2017-06-28 01:37:06 -04:00
Graphica
3d4fc5fa9c
Add cosmetics to chests
2017-06-28 01:36:49 -04:00
Graphica
e599f1653c
Allow Flags to interact with costumes and hats correctly
2017-06-28 01:36:21 -04:00
Graphica
3d430dedf6
Add new cosmetic items
2017-06-28 01:35:57 -04:00
Graphica
3c929a4b00
Update hat and flag type enums
2017-06-28 01:35:22 -04:00
Graphica
19ddfb5c09
Reorganize packages
2017-06-28 01:34:51 -04:00
Graphica
1b39a54043
Fix gadget pages
2017-06-28 01:33:03 -04:00
Graphica
78445551a1
Reduce lag on Molten Snake
2017-06-28 01:31:54 -04:00
Graphica
c1765aaf20
Allow UtilParticle to accept java awt colors
2017-06-28 01:30:56 -04:00
Graphica
b7a094f472
Create flag gadget type
2017-06-28 01:30:29 -04:00
Graphica
845e96109b
Add Hat skin data
2017-06-28 01:29:02 -04:00
Graphica
e9fea23382
Add gaussian methods to UtilMath
2017-06-28 01:28:39 -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
dddeb69391
Change beta requirement to ULTRA
2017-06-22 23:35:10 -05: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
cnr
6b24c55fef
Merge branch 'feature/moba' into develop
2017-06-22 23:15:16 -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
8fb2c81c7f
Shorten SR.MOD title
2017-06-22 21:45:09 +01:00
Sam
b064542c4e
Staff and Clans Title
2017-06-22 21:39:37 +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
AlexTheCoder
61c57deaaa
Disable these damn guardians lagging my clans servers
2017-06-19 19:01:09 -05:00
cnr
31605b02b0
Use polygon geometry for MOBA Boss AI boundaries
2017-06-19 18:38:31 -05:00
AlexTheCoder
7868287ace
Temporarily disable clans maps
2017-06-19 18:32:57 -05:00
Sam
db98aa01c8
Training game base
2017-06-19 17:10:06 +01:00
cnr
185ac9fc05
Allow youtubers into full clans servers
2017-06-18 11:23:16 -05:00
Sam
17bfe9ee0a
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-06-18 10:55:46 +01:00
cnr
afdf1a1ad6
Fix missed string -> ClaimLocation migration
2017-06-17 15:45:39 -05:00
cnr
739cb83deb
Revert "Re-implement the main clans tutorial"
...
This reverts commit 1574d93d1b
2017-06-17 14:50:58 -05:00
cnr
1658afefca
Don't key Maps by strings; use simple data type instead
2017-06-17 14:36:38 -05: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
599f391001
Fix build (typo)
2017-06-16 22:36:33 -05:00
Sam
b8d160388f
Removed dropped exp from entity kills and fishing
2017-06-16 22:27:11 -05:00
cnr
c4d5ed4cbd
Merge branch 'feature/clans-season-3' into develop
2017-06-16 22:26:36 -05:00
cnr
04d9e7326d
Fix NPE in OP Skywars startup
2017-06-16 19:22:53 -05:00
Alexander Meech
10df654e42
Track enjin/support-given clans boxes in CUST-1
2017-06-16 18:36:38 -04:00
Alexander Meech
4e8838d99e
Add Clans Dye Box and Clans Builder Box to CUST-1
2017-06-16 18:23:11 -04:00
Alexander Meech
93a316e5e3
Add clans box sales package
2017-06-16 18:20:21 -04:00
Alexander Meech
7a2864a701
Merge branch 'develop' into feature/clans-season-3
2017-06-16 16:25:57 -04:00
AlexTheCoder
d8bdda2c52
Update clans world border size for new map
2017-06-16 16:21:21 -04:00
Sam
b758254f4c
Don't reset the player when an item is purchased
2017-06-16 18:54:23 +01:00
AlexTheCoder
2b4aecd882
Fix bosses
2017-06-16 00:01:43 -04:00
AlexTheCoder
f6c7eaf28b
Formatting fix
2017-06-15 23:47:12 -04:00
AlexTheCoder
fcce06fea9
Update item system for new legendary
2017-06-15 23:11:07 -04:00
AlexTheCoder
c64c0866fb
Update Spawn locations for new map
2017-06-15 23:10:55 -04:00
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
Sarah
84cb803c66
Async db calls...
2017-06-02 13:22:12 +02: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
Sarah
4b54232514
make slime not go small
2017-06-02 02:21:13 +02:00
Sarah
0c6fcba21f
Improve NPC visuals
2017-06-02 02:00:20 +02:00
cnr
b6a1a3a054
Only request quests once on startup
2017-06-01 17:29:42 -05:00
Kenny Goodin
cea9b00b68
Subscribe to quest request channel before requesting from daemon
2017-06-01 18:27:02 -04:00
cnr
60a696a82e
Subscribe to response channel before requesting quests
2017-06-01 17:25:30 -05:00
Sarah
b823fc62c9
Fix quests not disappearing after completing
2017-06-02 00:03:34 +02:00
Sarah
aaf4be1dc2
Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests
2017-06-01 20:59:53 +02:00
Sarah
9b64f5da66
change quest name to "Mineplex Mission"
2017-06-01 20:59:35 +02:00
Kenny Goodin
2f1f7a1e7d
Debug quest supplier
2017-06-01 14:59:22 -04:00
Sarah
9bfa586f61
Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests
2017-06-01 20:16:08 +02:00
Sarah
3c5f8bf72d
add names to quests in the stats gui, add different reward colors, properly remove "next Page" and "Previous Page" buttons from stats page
2017-06-01 20:15:39 +02:00
Sam
66b89d6e64
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-06-01 13:01:48 +01:00
AlexTheCoder
e94201409b
Finalize raid system and implement Charles Witherton Raid
2017-06-01 02:16:12 -04:00
AlexTheCoder
fdd48b51d4
Start work on raids
2017-06-01 02:16:12 -04:00
AlexTheCoder
9fcf718e65
Tweak dye boxes
2017-06-01 02:16:12 -04:00
AlexTheCoder
b1b12babf0
Slight fixes to boxes
2017-06-01 02:16:12 -04:00
AlexTheCoder
21759c35c9
Added boxes to clans and used lambda for mount gui
2017-06-01 02:16:12 -04:00
AlexTheCoder
03149fc49b
Implement the iron wizard boss with tidied up code and the new world event api
2017-06-01 02:16:12 -04:00
AlexTheCoder
4e58fa1e6c
Implement an arena manager for the specific bosses on the map
2017-06-01 02:16:12 -04:00
AlexTheCoder
77f13f9b4c
Slightly improve boss worldevent api
2017-06-01 02:16:12 -04:00
AlexTheCoder
a17b0c95bf
Update existing command and api classes to support new worldevent changes
2017-06-01 02:16:12 -04:00
AlexTheCoder
b0297e404c
Deactivate events lacking implementation
2017-06-01 02:16:12 -04:00
AlexTheCoder
3ea378110c
Convert nether listener to spawn boss portals with the new boss event system
2017-06-01 02:16:12 -04:00
AlexTheCoder
150f1d1de9
Add implementation for managing world events
2017-06-01 02:16:12 -04:00
AlexTheCoder
cff2ca5414
Implement a new worldevent api to better handle events in clans, and begin implementing the api in place of the old
2017-06-01 02:16:12 -04:00
AlexTheCoder
b14ecdbe4f
Fix outposts to not break if the clan has blank banner pattern layers
2017-06-01 02:16:12 -04:00
AlexTheCoder
8ea90eb914
Prevent breaking banners in zones the player does not have build access in
2017-06-01 02:16:12 -04:00
AlexTheCoder
9829527688
Remove armor stands causing memory leaks
2017-06-01 02:16:12 -04:00
AlexTheCoder
c78ee51307
Add method for testing 2d squared distance
2017-06-01 02:16:12 -04:00
AlexTheCoder
2f0acc4a00
Block outposts being spawned in water causing them to break
2017-06-01 02:16:12 -04:00
AlexTheCoder
8c911426fd
Slight UI improvements and made fall damage no longer count towards mount despawn hits
2017-06-01 02:16:12 -04:00
AlexTheCoder
3c4eee910f
Finish implementation of Mounts, tidy up mount saving, implement mount GUIs
2017-06-01 02:16:12 -04:00
AlexTheCoder
264b7f86cf
Implement mounts and remove legacy horse dismount code
2017-06-01 02:16:12 -04:00
AlexTheCoder
8c27c4349d
Allow horses to be forcibly spawned but prevent them from naturally occurring
2017-06-01 02:16:12 -04:00
AlexTheCoder
c6bd00a811
Make UtilEnt#GetMetadata actually return the field assigned to that metadata key and add a method to remove metadata from an entity
2017-06-01 02:16:12 -04:00
AlexTheCoder
76d5d3e896
More appropriately name fields in the CustomDamageEvent getDamagerPlayer method in order to be more understandable
2017-06-01 02:16:12 -04:00
AlexTheCoder
570355e41b
Fix error runnables not being passed through even when intended to
2017-06-01 02:16:12 -04:00
AlexTheCoder
6d67a4f9f8
Fix null pointer causing console spam (SENTRY ISSUE 223503319)
2017-06-01 02:16:12 -04:00
AlexTheCoder
03d9032f82
Add backend system for saving/loading clans mounts with varied stats and skins
2017-06-01 02:16:12 -04:00
AlexTheCoder
b7a566744c
Formatting fix
2017-06-01 02:16:12 -04:00
AlexTheCoder
cc1bb3cfe9
Make outposts utilize the Clan Banner of their owner
2017-06-01 02:16:12 -04:00
AlexTheCoder
2e04490001
Change nether miniboss rewards to drop crafting materials beyond diamonds and add the ability to drop set pieces
2017-06-01 02:16:12 -04:00
AlexTheCoder
48967b4a74
Block exploit allowing clans to make a lot of allies and then add members to disrupt the equation. Additionally, lower the maximum amount of allies per member
2017-06-01 02:16:12 -04:00
AlexTheCoder
35f2d42d08
Remove height limitations on planting crops
2017-06-01 02:16:12 -04:00
AlexTheCoder
1574d93d1b
Re-implement the main clans tutorial
2017-06-01 02:16:12 -04:00
AlexTheCoder
08b89fbb4b
Change farming shop prices
2017-06-01 02:16:12 -04:00
Alexander Meech
01e7dc85dd
Merge branch 'develop' into feature/quests
2017-05-31 22:21:24 -04:00
cnr
921aaea5bd
Disable Toggle check from the plugin side until tomorrow
2017-05-31 21:16:58 -05:00
Sam
c34bf77dc9
More testing feedback
2017-06-01 00:55:33 +01:00
Sarah
738090bb30
Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests
2017-06-01 00:34:38 +02:00
Sarah
d7731d330c
Do some visual adjustments, add back button to quest stats menu, remove quest from buy bar after completion
2017-06-01 00:34:21 +02:00
Kenny Goodin
1cf04592da
Whoops, actually add the 'fail-safe'
2017-05-31 16:00:00 -04:00
Kenny Goodin
13ad590487
Reduce QuestDaemon log spam, add failsafe for when no active quests are loaded
2017-05-31 15:58:28 -04:00
Sarah
c355015041
Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests
2017-05-31 21:51:25 +02:00
Sarah
5c8e6d84b0
Add increment command, Questtrackers, change some visuals, allow Quests to have multiple required items
2017-05-31 21:51:04 +02:00
Sam
8a9e113389
Improvements to the targetting system
2017-05-31 17:09:08 +01:00
Sam
70eec9e38c
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-05-31 13:17:41 +01:00
Sam
edfadde239
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-05-31 13:05:13 +01:00
Sam
0edd2c8947
Feedback from testing
2017-05-31 13:05:06 +01:00
Kenny Goodin
ff12121926
Fix QuestDaemon command that didn't actually do anything
2017-05-31 02:35:16 -04:00
Kenny Goodin
028a4ecce3
Remove author tag
2017-05-31 02:15:23 -04:00
Kenny Goodin
ffdd82c34e
Ignore quests in QuestDaemon process that have a cost of -1
2017-05-31 02:02:30 -04:00
cnr
6e2d39035d
Add Bob Ross morph to PPC for June
2017-05-30 22:50:41 -05:00
Graphica
a87685eae0
Change color selector and put colors in order
2017-05-30 22:49:30 -05:00
Graphica
cf8109b3bd
Add method for detecting bottom slabs to UtilBlock
2017-05-30 22:49:30 -05:00
Graphica
9c48919e42
Reduce paint time down to 30 seconds
2017-05-30 22:49:30 -05:00
Graphica
6b2a99a881
Make quotes be activated with a shift click
2017-05-30 22:49:30 -05:00
Graphica
a61c4cd816
Fix holograms not following players in 1.9+
2017-05-30 22:49:30 -05:00
Graphica
98929f043f
Make brush types varied and colored in player hotbars
2017-05-30 22:49:30 -05:00
Graphica
7baf3bad30
Clean up Hologram class code
2017-05-30 22:49:30 -05:00
Graphica
2c6112347a
Add Bob Ross Morph
2017-05-30 22:49:30 -05:00
Kenny Goodin
b139d0550b
Periodically purge expired elements from recently seelected quests repo
2017-05-30 20:36:39 -04:00
AlexTheCoder
2fc423306b
Add appropriate starter level for multi-tiered achievements with level names to fix incorrect array length
2017-05-29 22:49:23 -05:00
cnr
b9af3a8dfb
Sort CMA in the tab list next to Mod
2017-05-29 22:49:01 -05:00
Alexander Meech
e501982712
Update cma scoreboard id
2017-05-29 22:48:25 -05:00
Alexander Meech
f793539cc4
Allow cma to see freeze/unfreeze information
2017-05-29 22:48:25 -05:00
Alexander Meech
57f2f7b686
Give cma access to clans punishments
2017-05-29 22:48:25 -05:00
Alexander Meech
1adb4b8239
Give cma access to freeze
2017-05-29 22:48:25 -05:00
Alexander Meech
cd8e805435
Give CMA access to unfreeze
2017-05-29 22:48:25 -05:00
Alexander Meech
2895397aec
Implement CMA rank
2017-05-29 22:48:25 -05:00
cnr
1a59c050d3
Disable Alien Invasion event
2017-05-29 22:45:54 -05:00
cnr
f1bad41e89
Revert "Enable double XP + gems + shards for the weekend"
...
This reverts commit aa271a1bd3
2017-05-29 22:44:54 -05:00
Sam
c3a80ed0cb
Fix pumpkin king's death not being logged properly
2017-05-29 12:40:18 +01:00
Sam
72ba5e0686
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/leveling
2017-05-28 16:27:59 +01:00
Sam
9e9bfe79de
Pumpkin king boss
2017-05-28 16:27:54 +01:00
Sam
911fd030f3
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-05-28 13:20:24 +01:00
Sam
efdffa6272
Level reward system
2017-05-28 12:57:44 +01:00
cnr
e51818c15d
Reduce alien shard reward to 5 per hit and make lobbies nighttime
2017-05-28 02:08:17 -05:00
Sam
18197de7be
Correct operator...
2017-05-27 18:24:51 +01:00
Sam
5bdcd3474f
Only give the chest once
2017-05-27 18:23:53 +01:00
Sam
b9ad85dd1e
Pumpkin King boss
2017-05-27 18:19:14 +01:00
Sam
ffa2a736ec
Give players an omega chest for completing the event
2017-05-27 17:03:52 +01:00
Sam
8f2c84b842
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-05-27 16:46:20 +01:00
Sam
8e87b1d3e9
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-05-27 13:55:36 +01:00
Sam
7705bd34a3
Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/aliens
2017-05-27 01:05:04 +01:00
Sam
27d9233566
While we're at it, change the easter egg achievement requirement
2017-05-27 01:05:02 +01:00
Sam
4d4988577e
Use a more sensible method of awarding shards
2017-05-27 01:01:16 +01:00
Sam
e3f678d71d
Bugs
2017-05-27 00:56:38 +01:00
cnr
aa271a1bd3
Enable double XP + gems + shards for the weekend
2017-05-26 18:20:27 -05:00
cnr
4a7ca75b24
Open UFO event for the weekend
2017-05-26 18:08:24 -05:00
Sam
36733e9918
Fix gametype imports
2017-05-26 18:37:35 +01:00
Sam
d70cd38049
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-05-26 18:34:23 +01:00
Sam
5c8a36b024
Sigils bug fixes
2017-05-26 18:33:06 +01:00
cnr
b46464babe
Reduce UFO beam radius from 5 -> 3 blocks
2017-05-25 22:42:14 -05:00
cnr
fbd39092f8
Add delay for should-start-invasion check
2017-05-25 04:47:35 -05:00
Sam
5ae32de83c
Reduce the cooldown from 6 to 3 seconds
2017-05-24 21:05:58 -05:00
cnr
fd1cd148cb
Implement Alien Event service calls on Hub/Arcade
2017-05-24 20:52:24 -05:00
Sarah
b7ba532568
Add quest stats page, make rewards be able to be items as well, fix some quest trackers, fix spelling mistakes
2017-05-25 00:40:41 +02:00
Sam
a134c1da5c
Sign off changes
2017-05-24 19:19:52 +01:00
Sam
94e97daede
Add a nice message to the alien speak
2017-05-24 18:39:16 +01:00
Sam
3701d2d950
Remove pointless messages
2017-05-24 18:30:41 +01:00
Sam
a6c1e6c892
Make minions target each other
2017-05-24 18:27:10 +01:00
Sam
6f48d0ee43
Improve the path finding ai
2017-05-23 22:57:13 +01:00
Sam
78b10e3cb8
Fix the majority of bugs for the 1 lane game
2017-05-23 20:37:31 +01:00
Sam
40543a5034
Fix gametype import
2017-05-22 23:00:22 +01:00
Sam
9df9fb80da
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion
2017-05-22 22:59:46 +01:00
Sam
4ed3135cdf
Implement improved targetting system
2017-05-22 20:53:22 +01:00
Sam
49045e3f68
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-05-22 20:53:05 +01:00
Sam
176253faec
Remove minion command
2017-05-21 17:33:33 +01:00
Sam
cbb63ba943
Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/gem-hunters-dupe
2017-05-20 17:46:07 +01:00
Sam
92604bf6ad
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-05-20 17:45:36 +01:00
Sam
1db7454e81
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-05-20 17:45:19 +01:00
Sam
670e9db9d2
Add Region to the slack logging
2017-05-20 17:33:00 +01:00
Sam
474c2e78f2
Check to make user the player has the itemstack when cashing out
2017-05-20 17:32:44 +01:00
cnr
85993053aa
Fix circular Anticheat dependency
2017-05-19 23:40:56 -05:00
Sam
f1ac67f049
Fix skeletons dropping items
2017-05-19 21:55:51 +01:00
cnr
c60d357cfe
Fix AntiHack quick-logout NPE
2017-05-19 14:53:40 -05:00
cnr
f565b0a9db
Add Super Smash Mobs Training to compass and NPC menus
2017-05-18 21:46:18 -05:00
Sam
3794686f58
Velocity and armour fix
2017-05-17 20:15:14 -06:00
Sam
500367b473
Premtive hotfix
2017-05-17 20:15:11 -06:00
cnr
06a6d1914d
Add new words to DMT and MB
2017-05-17 20:03:54 -06:00
cnr
2a7fea5936
Fix Anticheat ban message
2017-05-17 19:38:39 -06:00
AlexTheCoder
f69203884c
Only allow kills to damage king/crystals if tnt has spawned at least once
2017-05-17 19:25:37 -06:00
AlexTheCoder
eb0e9c0504
Make speed potions level 1 and drinkable
2017-05-17 19:25:37 -06:00
AlexTheCoder
672ada3f31
Add Castle Assault TDM to compass
2017-05-17 19:25:37 -06:00
AlexTheCoder
c3bd123ea1
Live op numero uno
2017-05-17 19:25:37 -06:00
cnr
eec20cc620
Merge branch 'update/ssm' into develop
2017-05-17 19:22:59 -06:00
cnr
a50587a8de
Merge commit 'b446a76' into develop
...
This contains changes originally planned for May 11th from the
update/gem-hunters-11-5 branch. The other changes in that branch will be
pushed at a later date.
2017-05-17 19:19:00 -06:00
Sam
c042af4a5a
Buying -> Buy
2017-05-18 01:52:26 +01:00
Sam
d51cc4f56e
Swap buying and selling
2017-05-18 01:23:41 +01:00
Sam
95b124e2f5
Fix Millionair and Middle Class causing players to be disconnected
2017-05-18 00:30:07 +01:00
Sam
81a869c264
Implement progression titles
2017-05-18 00:28:08 +01:00
Sam
9acfa361ad
Add mosted valued player to the map
2017-05-17 19:21:19 +01:00
Sam
fb50acc4cc
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters-11-5
2017-05-17 17:31:06 +01:00
Sam
5d63a19506
Minion AI Base
2017-05-16 22:33:08 +01:00
Sam
604804ff96
Fix tower explosions not working as intended
2017-05-16 18:02:50 +01:00
Sam
833ebd310e
Reorganise of code
2017-05-16 18:02:34 +01:00
Sam
4148af9214
Teleport players "correctly" to their lanes
2017-05-16 12:16:50 +01:00
Sam
73ac34ec3d
Enable teleporting to lanes
2017-05-16 11:58:11 +01:00
Sam
0874458754
Make the wither display its health
2017-05-16 11:58:00 +01:00
Sam
119b041ec1
Fix second towers being invincible
2017-05-16 11:57:04 +01:00
Sam
977907de61
Fix NPCs not spawning for some players
2017-05-16 11:56:50 +01:00
AlexTheCoder
3abcb441bf
Properly take into account server regions
2017-05-15 18:10:06 -07:00
AlexTheCoder
b73958ec96
Fix several issues on Gem Hunters, including a duping attack vector resulting from combat logger inventory desync
2017-05-15 18:10:06 -07:00
cnr
cc98f4fdd5
Disable banner service calls
2017-05-15 17:59:56 -07:00
cnr
9bc118dc41
Fix Anticheat ban lengths
2017-05-15 16:38:42 -07:00
Sam
f9cdddf1ad
Towers
2017-05-15 23:16:30 +01:00
Sam
4b6b04d4eb
Fix incorrect custom location
2017-05-15 19:55:58 +01:00
Sam
989c9a028c
End the game when a wither is killed
2017-05-15 19:55:39 +01:00
Sam
a450b23d22
Wither and AI base
2017-05-15 19:32:25 +01:00
Sam
d510dd9f58
Increase Fountain damage range
2017-05-14 11:46:24 +01:00
Sam
f2130515f3
Add suffixes to the scoreboard
2017-05-14 11:41:26 +01:00
Sam
c3b5b9a8bd
Implement shops for all roles
2017-05-14 11:41:09 +01:00
Sam
f23e778d92
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-05-13 17:31:00 +01:00
Sam
5edbddb3d2
Make MobaItemEffect abstract
2017-05-13 17:30:59 +01:00
Sam
d493a61d3d
Polish the hub event
2017-05-13 17:13:47 +01:00
Sam
9a96ce5018
Reward title ingame
2017-05-13 17:13:34 +01:00
Sam
bc5a9a1d5e
Healing particle standard
2017-05-13 15:34:49 +01:00
Sam
85a384bad7
Unneeded if statement
2017-05-13 15:34:39 +01:00
Sam
321acce3c3
Make Bob Ross an invisible kit
2017-05-13 15:34:13 +01:00
Sam
b52bc80985
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2017-05-13 15:18:10 +01:00
Sam
c8f20f3df5
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion
2017-05-13 15:15:52 +01:00
Sam
5454c00163
Hub integration
2017-05-13 15:15:51 +01:00
AlexTheCoder
9cf5fda540
Update leaderboards system to use more malleable seasons system
2017-05-13 01:05:18 -04:00
AlexTheCoder
37d3b47995
Rebalance tank kit and set final values for kill streak crown rewards
2017-05-13 01:05:18 -04:00
AlexTheCoder
a42e6ed9e4
Change crown calculations again
2017-05-13 01:05:18 -04:00
AlexTheCoder
ea4f9aee62
Tweak crown kill streak multipliers
2017-05-13 01:05:18 -04:00
AlexTheCoder
130d1dc05e
Fix TNT being stuck on head
2017-05-13 01:05:18 -04:00
Sam
a6ec243a02
Sneak cancels CreeperExplode
2017-05-12 23:19:12 +01:00
Sam
dc2d317652
Fix merging with develop
2017-05-12 23:07:20 +01:00
Sam
ff07d38d00
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2017-05-12 23:04:47 +01:00
Sam
b18aa7e840
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion
2017-05-12 22:59:03 +01:00
Sam
42ef7d0590
Lobby class
2017-05-12 22:58:58 +01:00
Sam
6ecbf85dc8
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion
2017-05-12 22:22:01 +01:00
Sam
ab35e96ca1
Add more polish
2017-05-12 22:21:59 +01:00
Dan Mulloy
35ed1099f9
Avoid instantiating HologramManager twice
2017-05-12 12:32:19 -07:00
Sam
abb983ac04
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion
2017-05-12 17:34:55 +01:00
AlexTheCoder
7b7b91ed3f
Fix small gameplay issues and update kit selection data points for TDM
2017-05-11 21:48:21 -07:00
cnr
b18d36b361
Merge branch 'feature/castlesiege2.0' into develop
2017-05-11 20:29:46 -07:00
Sam
5c968890d3
Just implement logging
2017-05-11 19:58:57 -07:00
samczsun
7658046d62
Change messages
2017-05-11 19:29:32 -07:00
samczsun
1390ea1579
Implement triggers
2017-05-11 19:29:32 -07:00
samczsun
ecef2fe9db
New messages/durations
2017-05-11 19:29:31 -07:00
samczsun
c8a1035591
Comped accounts
2017-05-11 19:29:31 -07:00
AlexTheCoder
7ad86c435c
More nitpicks
2017-05-11 21:40:06 -04:00
AlexTheCoder
3023c64c35
Jon is actually OCD
2017-05-11 21:34:41 -04:00
AlexTheCoder
1e93ad0b1e
Proper resource management for leaderboard statements
2017-05-11 21:18:05 -04:00
AlexTheCoder
a76572f6d7
Change table names and add date indexes based on Jon's request
2017-05-11 20:49:38 -04:00
AlexTheCoder
4a05149743
Use correct data loc pool for kit locations
2017-05-11 18:29:42 -04:00
AlexTheCoder
0091cbe2a8
Change kit data loc formatting
2017-05-11 18:15:33 -04:00
Sam
b446a7640e
Hours not seconds
2017-05-11 22:56:48 +01:00
Sam
d7e3c25027
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters-11-5
2017-05-11 22:55:31 +01:00
Sam
7df87a7d7e
Lots of fixes
2017-05-11 22:55:30 +01:00
AlexTheCoder
86c66d3a44
Add specific kit spawn data locs
2017-05-11 16:05:19 -04:00
AlexTheCoder
7f240bb5a4
Fix some leaderboards not cleaning up after themselves
2017-05-11 15:53:58 -04:00
AlexTheCoder
aa898d74da
Fix incorrectly named tables in fetch query
2017-05-11 15:25:22 -04:00
Sarah
a07aa7abdc
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests
2017-05-11 20:57:04 +02:00
AlexTheCoder
5d1199634d
Rewrite leaderboard backend (again)
2017-05-11 14:48:35 -04:00
Sarah
8d8e064125
Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests
2017-05-11 18:09:11 +02:00
Sarah
16e0f38dcf
Menu Improvements and more Quest Trackers
2017-05-11 18:08:55 +02:00
cnr
85c06c11cd
Merge branch 'update/mayitems' into develop
2017-05-10 19:55:11 -07:00
cnr
0f98637024
Disallow players from switching between Gem Hunters via party
2017-05-10 19:54:28 -07:00
LCastr0
ac0339fc59
Fixed sync with dragon and fixed guardian not showing
2017-05-10 21:20:23 -03:00
LCastr0
5fe5c613e5
Fixed win rooms again
2017-05-10 19:25:14 -03:00
LCastr0
3dbed769c9
Fix for win rooms
2017-05-10 17:27:17 -03:00
Sam
1d4d56e792
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters-11-5
2017-05-10 19:27:14 +01:00
Sam
f7b80cc194
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-05-10 19:25:58 +01:00
Sam
dcb676c57b
Item upgrade effects
2017-05-10 19:25:56 +01:00
AlexTheCoder
b4c27307ba
Further leaderboard repository tweaks
2017-05-10 04:40:14 -04:00
AlexTheCoder
f34a2946c4
Final leaderboard repository changes for Jon
2017-05-10 03:28:55 -04:00
AlexTheCoder
fa1cd00c22
Tidy up leaderboard repository class a bit
2017-05-10 02:56:00 -04:00
AlexTheCoder
adf6e35a1f
Update leaderboard backend based on discussion with Jon
2017-05-10 02:49:21 -04:00
AlexTheCoder
3b3436d1af
Remove TNT from TDM chest loot
2017-05-10 02:06:25 -04:00
Sam
0fce5a9490
Emergency infinite shard fix
2017-05-09 19:49:25 -07:00
LCastr0
92eaf4f8d8
Merge branch 'develop' into update/mayitems
2017-05-09 23:31:43 -03:00
LCastr0
8bb638c969
Removed unused code
2017-05-09 23:30:52 -03:00
LCastr0
9018a3cc50
Fixed kit selectors
2017-05-09 23:30:24 -03:00
LCastr0
bcd60d325b
Fixed win rooms
2017-05-09 23:06:49 -03:00
AlexTheCoder
f2ff546d47
Clean up game classes a bit
2017-05-09 20:35:48 -04:00
Sam
eec8e5143d
Per player scoreboards
2017-05-09 23:16:34 +01:00
Sam
10b0f1e1ed
Add an armour decay for offline players
2017-05-09 16:27:56 +01:00
Sam
26df99a4cf
Don't spawn combat NPCs in the lobby
2017-05-09 16:27:43 +01:00
Sam
1fbeaa6ecd
Add a random teleport npc in the safezones
2017-05-09 16:27:21 +01:00
Sam
9d3957cd54
Increase time after switching servers to kick player
2017-05-09 16:27:06 +01:00
AlexTheCoder
834c537bc8
Block spectators obtaining TNT
2017-05-08 23:22:48 -04:00
AlexTheCoder
79560fd415
Implement Castle Assault into the selection compass and re-add old Castle Siege
2017-05-08 17:24:12 -04:00
Sam
5f7574a0af
Increase particles displayed when selecting a kit
2017-05-08 22:07:14 +01:00
AlexTheCoder
d13610251f
Rename Castle Siege 2.0 to Castle Assault and re-implement the old game
2017-05-08 17:05:30 -04:00
Sam
50da713947
Remove the previous upgrade when switching upgrades
2017-05-08 22:01:27 +01:00
Sam
d107c8d6f4
Bob Ross
2017-05-08 21:09:09 +01:00
Kenny
9b38558268
Have servers request active quests from quest service on startup
2017-05-08 15:24:12 -04:00
LCastr0
00981cf846
Fixed all ranks having all win effects
2017-05-08 14:56:33 -03:00
LCastr0
5c265cfd66
Lock to other ranks, unlock on join
2017-05-08 10:35:21 -03:00
AlexTheCoder
452eaeeba9
Fix incorrect GameType association with TDM
2017-05-08 02:08:45 -04:00
AlexTheCoder
49aaaa5301
Leaderboard changes
2017-05-08 02:08:03 -04:00
AlexTheCoder
6ef7608f20
Fix incorrect repository method name
2017-05-08 01:24:52 -04:00
AlexTheCoder
b9fd597370
Replace old castle siege with new castle siege
2017-05-08 01:14:17 -04:00
AlexTheCoder
49575e794f
Clean up castle siege leaderboards upon game end
2017-05-08 00:11:19 -04:00
AlexTheCoder
d7341de2f5
Final tweaks to Castle Siege and implementation of leaderboards in arcade
2017-05-08 00:09:04 -04:00
AlexTheCoder
68205a71a1
Implement proper stat leaderboard system
2017-05-08 00:08:36 -04:00
AlexTheCoder
941310b5aa
Change kit prices
2017-05-08 00:07:42 -04:00
Sam
24c81101a1
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2017-05-07 22:36:44 +01:00
Sam
5398bf5e81
More progress
2017-05-07 22:35:15 +01:00
LCastr0
8604eb2e09
Teleport the creeper so it's visible
2017-05-06 22:54:24 -03:00
LCastr0
dc77dde98b
Use correct slot
2017-05-06 21:29:41 -03:00
LCastr0
8befa61b8a
Set force on creature module before spawning entities
2017-05-06 21:29:15 -03:00
LCastr0
8e58b974f3
Add line
2017-05-06 21:18:36 -03:00
LCastr0
c5b62e0ec4
Add all the win-effects to the page
2017-05-06 20:42:53 -03:00
AlexTheCoder
0b7789328a
Add game tips and remove medals from initial release
2017-05-06 17:01:31 -04:00
Sam
23d924f137
Kit system
2017-05-06 20:51:49 +01:00
AlexTheCoder
a47c4291c5
Update tiered achievement UI
2017-05-05 22:06:18 -04:00
AlexTheCoder
4d6824c27c
Update Castle Siege mechanics
2017-05-05 22:05:58 -04:00
Sam
24dd8a7d2d
Merge branch 'feature/moba' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/moba
2017-05-05 22:31:52 +01:00
Sam
a32ae91996
Gotta go fast!
2017-05-05 22:30:37 +01:00
Sarah
f2c5268df1
Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests
2017-05-05 23:02:30 +02:00
Sarah
20281648c2
Add Quest triggers, add a Repository, add Spreadsheet parsing, and add menus.
2017-05-05 23:02:15 +02:00
Kenny
ad79245252
Merge branch 'feature/quest-manager-service' into feature/quests
2017-05-05 15:25:33 -04:00
Kenny
54858e14ee
Convert questmanager to read quests from google sheets
2017-05-05 15:22:37 -04:00
AlexTheCoder
a635793ede
Add new Castle Siege modes
2017-05-04 23:20:50 -04:00
AlexTheCoder
00d31ffad3
Fix item builder to properly use null item titles
2017-05-04 23:20:50 -04:00
AlexTheCoder
455e09a9da
More implementation of xp toggles for kit progression, and display achievement rewards properly for tiered leveling
2017-05-04 23:20:50 -04:00
AlexTheCoder
97a4b8e94d
Add implementation for crown and xp toggles in ProgressingKit
2017-05-04 23:20:50 -04:00
AlexTheCoder
ac98213d28
Update several perks to support vanilla damage system and kit progression
2017-05-04 23:20:50 -04:00
AlexTheCoder
7b70695e12
Update arcade games with new crown/gem toggle and flint and steel permission flag
2017-05-04 23:20:50 -04:00
AlexTheCoder
901fecb49a
Support multi named tiers of achievements, allow rewarding of xp/gems/crowns upon increasing achievement tiers, and replace old castle siege achievements with new ones
2017-05-04 23:20:50 -04:00
AlexTheCoder
43739743bf
Add new castle siege game types to Core
2017-05-04 23:20:50 -04:00
AlexTheCoder
6684e812d1
Implement xp-less and crown kit upgrading and slightly modify kit progression gui
2017-05-04 23:20:50 -04:00
AlexTheCoder
39f997faf1
Give ProgressiveKits the ability to not use xp or use crowns instead of gems for leveling
2017-05-04 23:20:50 -04:00
AlexTheCoder
6ffd10133e
Implement a new crown currency
2017-05-04 23:20:50 -04:00
AlexTheCoder
f9f2e362c4
Make ItemBuilder properly clone all options and implement a builder to create enchanted books
2017-05-04 23:20:50 -04:00
Sam
2e3d19bd3a
Bug fixes
2017-05-04 21:49:44 +01:00
cnr
b0407cfc51
Send players to normal hubs from Gem Hunters
...
This changes the behavior of both /hub and update restarts
2017-05-04 12:43:20 -07:00
Sam
f6cb654e12
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2017-05-04 20:20:59 +01:00
Sam
3210843395
Capture point fix
2017-05-04 20:20:48 +01:00
Sam
8f01015df9
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-05-04 17:35:41 +01:00
Sam
ee0971443e
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion
2017-05-04 17:32:16 +01:00
Sam
8032133f4d
Sort the scores
2017-05-04 17:16:16 +01:00
Sam
808885ea04
Add leaper kit
2017-05-04 17:15:55 +01:00
Sam
47c816087e
MOBA base
2017-05-04 15:45:04 +01:00
cnr
53eb499236
Use correct region when searching for Gem Hunters
2017-05-04 01:48:05 -07:00
cnr
e6c7aa469b
Merge branch 'feature/gem-hunters-persistence' into develop
2017-05-03 22:03:29 -07:00
cnr
840b50d56a
Disable beta whitelist for open beta
2017-05-03 22:02:02 -07:00
cnr
6fdf926d51
Add temporary(!!) gem hunters server sender
...
In the near future, with more time, we'll abstract out the MOTD parsing
hackiness from ServerInfo and add the same mechanism to Gem Hunters, so
it gets a ServerNpcPage for free.
2017-05-03 22:02:02 -07:00
LCastr0
f23016df28
Change to blaze powder
2017-05-03 23:59:16 -03:00
LCastr0
58078ae4bd
Added kit selectors to chests
2017-05-03 23:42:18 -03:00
LCastr0
b3f46ad4fc
Added names, icons and lores
2017-05-03 23:30:16 -03:00
cnr
779256e1ca
Enable the Skyfall booster kit
2017-05-03 18:45:39 -07:00
Sarah
4da069b244
Fix Booster Kit making you fly
2017-05-03 18:44:53 -07:00
cnr
3d37fab71f
Disable movement checks in Dragons
2017-05-03 18:44:05 -07:00
cnr
404733cd34
Disable Speed UHC
2017-05-03 18:42:31 -07:00
cnr
66136a035b
Change scoreboard tag for Event Moderator
...
This ensures that they're sorted next to Sr Mods in the tab list
2017-05-03 18:30:36 -07:00
LCastr0
196e0b9688
Reduce the amount of lines in the Shimmering Ring
2017-05-03 22:29:06 -03:00
