Spencer
|
8683e8bdc4
|
add comments, use a more generic map
|
2017-12-08 05:59:24 -05:00 |
|
Spencer
|
a3a76bc1f9
|
Fix/add MVP system for Win Effects
|
2017-12-08 05:59:24 -05:00 |
|
Spencer
|
8a669ccebe
|
More brace newlines
|
2017-12-08 05:59:24 -05:00 |
|
Spencer
|
9477345823
|
Fix electrocution stat tracker ONLY giving for teammate hits
|
2017-12-08 05:59:24 -05:00 |
|
Spencer
|
f13547d9da
|
Newline braces in GamePlayerManager
|
2017-12-08 05:59:24 -05:00 |
|
Spencer
|
82c1dbe28d
|
Remove debug in StatsCommand
|
2017-12-08 05:59:24 -05:00 |
|
Spencer
|
2f44c62ba2
|
I changed my mind, gray text is better here than dgreen
|
2017-12-08 05:59:24 -05:00 |
|
Spencer
|
14e3518b13
|
minor improvements to teleportation
|
2017-12-08 05:59:24 -05:00 |
|
Spencer
|
333cea3f47
|
Fix players being teleported into blocks in BLD in the most overcomplicated way possible
|
2017-12-08 05:59:24 -05:00 |
|
Spencer
|
46c8445f38
|
Color the hover message gray
|
2017-12-08 05:59:24 -05:00 |
|
Spencer
|
7d006bb85a
|
Remove debug for /stats
|
2017-12-08 05:59:24 -05:00 |
|
Spencer
|
adf7f4736f
|
Dark green, not light!
|
2017-12-08 05:59:24 -05:00 |
|
Spencer
|
37657058ae
|
Add a space and hover text to end of game message
|
2017-12-08 05:59:24 -05:00 |
|
Spencer
|
d70f7a8ec0
|
Use IncognitoStatusChangeEvent for vanish fixes in BLD
|
2017-12-08 05:59:24 -05:00 |
|
Spencer
|
449c6511e2
|
de-trigger mopple
|
2017-12-08 05:59:24 -05:00 |
|
Spencer
|
875c0a015b
|
add debug command to end build time to BLD
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
c114823905
|
Remove the BLD debug
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
a18e0fb579
|
Let vanished staff chat in test servers
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
08329a8667
|
Don't add vanished players to WinEffectGadget's _other list
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
c00c58dd0e
|
Add more debug to Build
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
bacc1e0945
|
Don't listen for /spec in GamePlayerManager unless the game is in progress
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
9d4b964e08
|
Don't let vanished staff use /spec (the one in pregame lobbies)
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
4ac9fd1b5d
|
Add debug to stats and spec commands to fix usage on vanished staff
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
3047c528dd
|
Remove the item drop, don't just cancel the event
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
af443dafdf
|
Don't allow players to drop special items in safezones (GH)
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
ba07d373ba
|
Disable particles in CTF for real this time
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
b6a4cbc289
|
Don't set _viewData to that of a vanished player (BLD)
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
0b02f6d1df
|
Don't put vanished players in WinEffectManager's teamList either
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
2b3563e86e
|
Disable particles in DOM, CTF, TDM, MS, BH, SA, UHC, WIZ, SSM
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
efcf3db854
|
Remove cloud particles from smoke grenade to reduce lag
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
53bbd75692
|
Don't cache messages for muted players in chatsnap
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
5c745f00e4
|
Use messageSearchOnlineResult in StatsCommand
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
3ce8cf040c
|
Let staff use /stats on other vanished staff
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
8000c79f5d
|
Add check in GamePlayerManager so /spec can't be used on vanished staff
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
0ad46efe12
|
Change to messageSearchOnlineResult in UtilPlayer & StringBuilder optimization
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
6fdc04367e
|
Add UtilPlayerBase.messageSearchOnlineResult
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
88635135cc
|
Don't show vanished staff in ClansInvitePage
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
acd826c91a
|
Fix issue allowing /stats to be used on vanished staff
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
817ffcd6c8
|
Don't award negative gems to players in GH (PC-1688)
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
20fdae0a09
|
add comment
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
12e3b2b84a
|
Add team color to vanish quit messages (PC-1161)
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
924e0b6fda
|
Don't include teammates in Mass Electrocution counter (PC-1647)
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
7e4d6c4320
|
Tell players to use /a when they message staff w/ DMs disabled
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
1d6f36d53e
|
Clarify message sent to players in AdminCommand
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
051223ddf0
|
Attempt to fix PC-1184 with Stream.distinct
|
2017-12-08 05:59:24 -05:00 |
|
ArcticZeroo
|
9d343a8556
|
Don't show vanished staff in Win Effects (PC-1108)
|
2017-12-08 05:59:24 -05:00 |
|
AlexTheCoder
|
6cf76a200e
|
Fixed merge conflicts
|
2017-12-08 05:59:24 -05:00 |
|
Sam
|
f3196e39fa
|
Remove the back button in the MPS voting page for non-hosts
|
2017-12-08 05:52:47 -05:00 |
|
Sam
|
3274cc434e
|
Changes from QA testing
|
2017-12-01 00:02:15 -05:00 |
|
Sam
|
98ef9764d7
|
Reduce snowball damage and disable snow during win effects
|
2017-12-01 00:02:15 -05:00 |
|
Sam
|
21c95b92a2
|
Remove Regeneration when the Blizzard starts
|
2017-12-01 00:02:15 -05:00 |
|
Sam
|
e0d8f7aed5
|
Cleanup SnowFight
|
2017-12-01 00:02:15 -05:00 |
|
AlexTheCoder
|
ff05953c1d
|
Tweak calendar used by hub to ensure region equality, and fix some spelling/grammar
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
3bc9476fd8
|
Disable LCastro0's Castle in the hub
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
8ac5cef9fd
|
Whoops
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
504418ca6e
|
Sort of adjust the antlers for 1.8 clients
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
87f35fecca
|
Fix HatGadgets only displaying glass
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
bf1d2e4b71
|
Add missing christmas flags to the chest
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
be8e8d4783
|
Missed two of the cosmetics
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
f629cce155
|
Add descriptions to all Christmas Cosmetics
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
0f8c00bb1f
|
Fix the Baby Reindeer Mount not being ridable
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
996b7c6f66
|
Fix the Sledge Mount going through walls like a 👻
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
48ed0eb8ce
|
Change the format of the CC NPC
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
d099b68b04
|
Add hours and minutes
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
add1be1763
|
Add a countdown to the release of CC
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
593952fa10
|
Fix the sledge mount's offset
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
3b1ce13856
|
Implement basic sledge mount
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
1d1fdf718c
|
Add "Present" Arrow trails and double jumps
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
f6199cbb40
|
Fix several issues with the Holiday Cheer title
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
de33f43e25
|
Move location back
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
fc913d94a4
|
More Cosmetics!!
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
17af56f8c2
|
Improve effects
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
e9a4fedc21
|
Fix InitalizerError
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
8919ffb1d6
|
New Blizzard Particle and make Gingerbread Chests "Featrued"
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
a9fbbc2e27
|
Cleanup CostumePage and implement some new Christmas particles
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
131cb12620
|
Fix antlers when sneaking
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
883ca4876a
|
Fix Snow flake flag
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
3a4bee2bcd
|
Add a group of Chrismtas/Winter Flags
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
f91c1d245f
|
Reindeer Costume set
|
2017-11-30 23:58:49 -05:00 |
|
Sam
|
727e9d07cc
|
Fix Halloween Kit Selector particles not displaying how they should have
|
2017-11-30 23:58:49 -05:00 |
|
Dan Mulloy
|
1acbea498a
|
Set hub world saving and chunk unloading programmatically
|
2017-11-30 18:17:13 -05:00 |
|
AlexTheCoder
|
c61f819969
|
Fix an NPE in the Map List command
|
2017-11-30 05:50:57 -05:00 |
|
Sam
|
ef1d05dd03
|
Rename game type names for the build server
|
2017-11-30 05:35:07 -05:00 |
|
Kenny Goodin
|
a68abf0bb3
|
Fix some more possibly leaky perks in SSM
|
2017-11-30 04:55:42 -05:00 |
|
Kenny Goodin
|
e79ca4e4db
|
Fix possible leak in SSM PerkBlockToss
|
2017-11-30 04:55:42 -05:00 |
|
Kenny Goodin
|
16a461db76
|
Nitpick, use final where possible rather than mutable volatile state
|
2017-11-30 04:54:53 -05:00 |
|
Kenny Goodin
|
4b552f0317
|
Add command for printing live servers through monitor
|
2017-11-30 04:54:53 -05:00 |
|
Dan Mulloy
|
b5ea6f1240
|
Use void generator for lobbies, include loaded chunks in /lag
|
2017-11-30 04:53:17 -05:00 |
|
Dan Mulloy
|
1944b2ecc9
|
JK I found some more
|
2017-11-30 04:53:17 -05:00 |
|
Dan Mulloy
|
f1e48ff90c
|
Address all the useful sentry errors
|
2017-11-30 04:53:17 -05:00 |
|
Sam
|
1b4f9227a7
|
Fix startup error
|
2017-11-30 04:45:58 -05:00 |
|
Sam
|
05de6143ec
|
Prevent deploy platform abuse
|
2017-11-30 04:45:58 -05:00 |
|
Sam
|
3aee4dc1f7
|
Spawn Cake islands based off the mid capture point
|
2017-11-30 04:45:58 -05:00 |
|
Sam
|
f572007dad
|
Make the FloorIsLava tracker even more forgiving
|
2017-11-30 04:45:58 -05:00 |
|
Sam
|
21319764a5
|
Add pages and Cake Wars to MPS
|
2017-11-30 04:45:58 -05:00 |
|
Sam
|
6e56f97e25
|
Add the ability for Damage Manager to support constant values of knockback
|
2017-11-30 04:45:58 -05:00 |
|
Sam
|
d15e76d5a6
|
Shop balances
|
2017-11-30 04:45:58 -05:00 |
|
ArcticZeroo
|
d87c132818
|
Move _openedChests up so the location is added regardless of further errors
|
2017-11-30 04:41:16 -05:00 |
|
AlexTheCoder
|
c281603898
|
Remove/update deprecated commands, fix an unchecked setting in AchievementManager and fix issues preventing plugin from building
|
2017-11-29 02:53:44 -05:00 |
|
AlexTheCoder
|
fedbf2397b
|
Implement checks to handle doubled statistics issue, and complete final tweaks of stat conversion system
|
2017-11-28 04:11:26 -05:00 |
|
AlexTheCoder
|
02dc0458d9
|
Fix outdated stats being loaded when players transfer servers
|
2017-11-28 04:11:26 -05:00 |
|
AlexTheCoder
|
1380ef8e33
|
Log spam of logins to determine if that is the attack vector
|
2017-11-25 00:41:18 -05:00 |
|
AlexTheCoder
|
d1f81d8154
|
Increase spam threshold to limit false flags
|
2017-11-22 21:36:22 -05:00 |
|
AlexTheCoder
|
e7f6e8c708
|
Error handling
|
2017-11-22 21:36:22 -05:00 |
|
AlexTheCoder
|
28fe0f6728
|
Lets not forget to initialize it
|
2017-11-22 21:36:22 -05:00 |
|
AlexTheCoder
|
e971032b40
|
Add spambot handling
|
2017-11-22 21:36:22 -05:00 |
|
Sam
|
523f9b47b9
|
Check that the game is null before trying to get the kit name
|
2017-11-22 18:14:20 -05:00 |
|
Sam
|
c290f59752
|
Disable Hero viewers in MOBA lobbies
|
2017-11-22 18:14:20 -05:00 |
|
AlexTheCoder
|
5be51ff575
|
Remove kick aspect of master builders bans
|
2017-11-12 20:32:05 -05:00 |
|
AlexTheCoder
|
5d70b5f272
|
Change UnlockCosmeticCommand permissions
|
2017-11-12 13:58:41 -05:00 |
|
AlexTheCoder
|
dacc2ae463
|
Remove vote-determined banning from master builders
|
2017-11-12 12:14:51 -05:00 |
|
AlexTheCoder
|
15ac5fd2b9
|
Disable Scaffold anticheat checks
|
2017-11-12 12:02:31 -05:00 |
|
Sam
|
671f36e8ec
|
Add Flags to Omega Chests
|
2017-11-12 09:00:53 -08:00 |
|
Sam
|
40f1499ce1
|
Fix Winter Chests not giving common rewards
|
2017-11-12 09:00:53 -08:00 |
|
Sam
|
b3ff894acf
|
Don't give rank rewards
|
2017-11-12 09:00:53 -08:00 |
|
Sam
|
6102b59779
|
Prevent item pickup when respawning
|
2017-11-12 09:00:08 -08:00 |
|
Sam
|
1a9d46a904
|
Fix GameChat throwing an exception
|
2017-11-12 09:00:08 -08:00 |
|
Sam
|
6ce701bf03
|
Add an isGrounded check to FloorIsLava tracker
|
2017-11-12 09:00:08 -08:00 |
|
Sam
|
08a06a2835
|
Stop spectators being able to interact with the game while respawning
|
2017-11-12 09:00:08 -08:00 |
|
Sam
|
5cb87f18d4
|
Ensure that bestStreak cannot fall behind currentStreak
|
2017-11-12 09:00:08 -08:00 |
|
Sam
|
ba1882f4c2
|
Change winstreaks back to how they were previously handled
|
2017-11-12 09:00:08 -08:00 |
|
Sam
|
546543c93f
|
Add HOG to MPS
|
2017-11-12 08:56:35 -08:00 |
|
Sam
|
4c2eb68567
|
Add MPS check to HOG
|
2017-11-12 08:56:35 -08:00 |
|
AlexTheCoder
|
9c6f299145
|
Re-disable phase checks
|
2017-11-10 04:32:16 -05:00 |
|
Sam
|
33ee39fe01
|
Don't allow people to place blocks when respawning
|
2017-11-10 01:26:17 -08:00 |
|
Sam
|
ceb82b4d89
|
Typo in the KitSummary text
|
2017-11-10 01:26:17 -08:00 |
|
Sam
|
e4c65195b7
|
Fix Tic Tac Toe not being registered for some reason 👻
|
2017-11-10 01:26:17 -08:00 |
|
Sam
|
b03325c365
|
Remove win streaks on game end, not when the player is out
|
2017-11-10 01:26:17 -08:00 |
|
Sam
|
682684a424
|
Fix cake interaction
|
2017-11-10 01:26:17 -08:00 |
|
Sam
|
f119e24fcb
|
Really really really fixed Rune of Holding this time
|
2017-11-10 01:26:17 -08:00 |
|
Sam
|
6229a17373
|
Fix regeneration not being applied
|
2017-11-10 01:26:17 -08:00 |
|
Sam
|
cafbf1dccd
|
Prevent players from double loading the menu, thus being able to take out items
|
2017-11-10 01:26:17 -08:00 |
|
Sam
|
4bb5c25622
|
Add spawn protection
|
2017-11-10 01:26:17 -08:00 |
|
Sam
|
76b43bcb3c
|
Reduce the gems for kills and assists a bit more
|
2017-11-10 01:26:17 -08:00 |
|
Sam
|
156c5e11b8
|
Reduce overall gems earned in Cake Wars slightly
|
2017-11-10 01:26:17 -08:00 |
|
Sam
|
5f156f771e
|
Prevent players placing barrier blocks (caused by a bug in ShopPage)
|
2017-11-10 01:26:17 -08:00 |
|
Sam
|
9a3765ee2f
|
Replaced Warrior's Passive with Lifesteal, prevents issues with Golden apples
|
2017-11-10 01:26:17 -08:00 |
|
Sam
|
59d90e59fb
|
Fix the amount in gem data not being displayed
|
2017-11-10 01:26:17 -08:00 |
|
Sam
|
70d362ccfd
|
Possible fix for Rune's not always giving back the correct items
|
2017-11-10 01:26:17 -08:00 |
|
AlexTheCoder
|
88beb83999
|
Update Cake Wars booster group
|
2017-11-09 02:35:43 -05:00 |
|
AlexTheCoder
|
3788b09ab3
|
Implement new anticheat api method
|
2017-11-09 02:07:21 -05:00 |
|
AlexTheCoder
|
327efddaa8
|
Update anticheat dependency version
|
2017-11-09 01:55:08 -05:00 |
|
AlexTheCoder
|
b82c92d9ff
|
Implement anticheat changes (phase+scaffold, and skywars strict mode)
|
2017-11-09 01:29:07 -05:00 |
|
Sam
|
f7e31d87d1
|
Fix QuestManager throwing an NPE on quit
|
2017-11-08 21:54:59 -08:00 |
|
Sam
|
1c5bbda8cd
|
Fix an NPE with quest tracking when using /game stop
|
2017-11-08 21:54:59 -08:00 |
|
ArcticZeroo
|
098afc2bf4
|
Add "ulcs" alias for "unlockcosmetics"
|
2017-11-08 21:53:52 -08:00 |
|
AlexTheCoder
|
6a41563610
|
Fix merge conflicts
|
2017-11-08 21:53:52 -08:00 |
|
Sam
|
33b98270a2
|
Remove Current Win Streak cache when lost
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
c4a883f5d1
|
Don't check spectators
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
96bfb729bf
|
Thanks git
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
6383f6d074
|
Ensure that players inventories are saved often
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
cfe5f38ed4
|
Remove Cake hologram when the cake doesn't exist
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
b0438554a5
|
Add Cake Wars to the Game Menu
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
b3e712a5d8
|
Fix compilation errors
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
ef0ce8914d
|
Address the typos in game tips
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
0b7e5d15e0
|
Delete row when a player loses their win streak
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
43867a7018
|
Refresh all player's pages when an item is purchased
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
ed7472f0c4
|
Fix a couple of NPEs caused by /game stop
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
933d6864e5
|
Move CurrentStreak into its own table
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
13501229a5
|
Remove some useless classes from common
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
125122fb17
|
Added the resource information hologram
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
e3f9ec6d22
|
Turn off Damage manager!!!
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
e92ffcc5b3
|
Fix capture points displaying incorrectly when multple people are standing on them
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
59ca9c479f
|
Address Dan's PR comments
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
9f35672a27
|
Reduce the shop no place radius
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
b1a648d245
|
Fix Warrior's health increase being off by a factor of 2
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
ea53d6a227
|
Fix block breaking
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
9c7e83d5af
|
Changes from testing
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
7f05ec0ecc
|
Show Teammate Message in Cake Wars Duos
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
097f3a68fc
|
Update the Cake Wars lobby to match all other games
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
442907341b
|
Allow /team to be used in Cake Wars Duos and improve TeamModule
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
1350cf63c8
|
Shop changes
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
e21894ea75
|
Allow placing blocks above the cake if shifting
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
84afbc242d
|
Add descriptions to traps
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
b761ae30ce
|
Missing space
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
47024680ff
|
Fixes and QOL changes
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
1408e60d7a
|
QA testing changes
|
2017-11-08 21:48:17 -08:00 |
|
AlexTheCoder
|
58b48f2a5d
|
Fix merge conflicts
|
2017-11-08 21:48:17 -08:00 |
|
AlexTheCoder
|
b80c010e67
|
Fix merge conflicts
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
9312ce10d3
|
Make Team Sheep face the right direction
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
42fc0c7829
|
Rewrite large portions of the Shop and general system
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
ef31ae126c
|
Fix compilation error
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
965d94f386
|
Make sure Cake Wars doesn't try and load any progression related classes
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
18acbd20b7
|
Award currency in Cake Wars
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
8f51ce3e16
|
Implement Win Streaks
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
9f971d09bb
|
Fix -1 achievement progress
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
468b4c40ee
|
Cleanup ShardSummaryComponent
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
6bf284d0c9
|
Cleanup FloorIsLava Achievement
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
95de01611a
|
Achievement bug fixes and QOL
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
566e362b7e
|
Finish off Achievements
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
ff393c2b4e
|
More Cake Wars achievements
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
8632212297
|
Achievement Base
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
ab882fac18
|
Make sure CA and CATDM use Crowns instead of Gems
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
78866d341d
|
New Game Rewards message
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
3758946dbc
|
Start on Cake Wars Kit Progression
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
05b50d1c2b
|
Balances and bug fixes
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
3e1b96affe
|
Add support for any size team mdoe
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
f4de8bf351
|
New shop items and more bug fixes
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
b32b242e5a
|
Bug fixes and improvements
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
3fd18c1416
|
Finish adding all features to match PE Cake Wars
|
2017-11-08 21:48:17 -08:00 |
|
Sam
|
1721f7016c
|
Cake Wars port
|
2017-11-08 21:48:17 -08:00 |
|
AlexTheCoder
|
2ff8e79766
|
Fix placing value in the wrong map
|
2017-11-06 23:24:11 -08:00 |
|
AlexTheCoder
|
e835747469
|
Tweak system to only have game servers convert during normal saves
|
2017-11-06 22:20:10 -08:00 |
|
Alexander Meech
|
6325b522ed
|
Revert "Revert "Last update to CUST-1 whitelist""
This reverts commit ca1aa2e172 .
|
2017-11-06 21:18:18 -08:00 |
|
Alexander Meech
|
3cbfcca6d9
|
Revert "Revert "Disable leaderboards while stat conversion is in progress""
This reverts commit 31fdfd3dc5 .
|
2017-11-06 21:18:18 -08:00 |
|
Alexander Meech
|
e6e94eafa2
|
Revert "Revert "Move bucket generation to a table trigger""
This reverts commit c188cbea7e .
|
2017-11-06 21:18:18 -08:00 |
|
Alexander Meech
|
d313149fcd
|
Revert "Revert "Change some permissions and update CUST-1 whitelist""
This reverts commit 382c2a5e85 .
|
2017-11-06 21:18:18 -08:00 |
|
Alexander Meech
|
c0a877a058
|
Revert "Revert "Fix clans hub chest location""
This reverts commit 043af1e0a7 .
|
2017-11-06 21:18:18 -08:00 |
|
Alexander Meech
|
0c3470cd69
|
Revert "Revert "Fix merge conflicts""
This reverts commit 2fd334472e .
|
2017-11-06 21:18:18 -08:00 |
|
Alexander Meech
|
2fd334472e
|
Revert "Fix merge conflicts"
This reverts commit d64d1eed4e .
|
2017-11-05 22:20:55 -08:00 |
|
Alexander Meech
|
043af1e0a7
|
Revert "Fix clans hub chest location"
This reverts commit 88a6bdc687 .
|
2017-11-05 22:20:55 -08:00 |
|
Alexander Meech
|
382c2a5e85
|
Revert "Change some permissions and update CUST-1 whitelist"
This reverts commit 0c1f3087ff .
|
2017-11-05 22:20:55 -08:00 |
|
Alexander Meech
|
c188cbea7e
|
Revert "Move bucket generation to a table trigger"
This reverts commit dd64a332e5 .
|
2017-11-05 22:20:55 -08:00 |
|
Alexander Meech
|
31fdfd3dc5
|
Revert "Disable leaderboards while stat conversion is in progress"
This reverts commit 1109b2479e .
|
2017-11-05 22:20:55 -08:00 |
|
Alexander Meech
|
ca1aa2e172
|
Revert "Last update to CUST-1 whitelist"
This reverts commit 0200c9c9cb .
|
2017-11-05 22:20:55 -08:00 |
|
AlexTheCoder
|
0200c9c9cb
|
Last update to CUST-1 whitelist
|
2017-11-05 14:43:20 -08:00 |
|
AlexTheCoder
|
1109b2479e
|
Disable leaderboards while stat conversion is in progress
|
2017-11-05 14:43:20 -08:00 |
|
AlexTheCoder
|
dd64a332e5
|
Move bucket generation to a table trigger
|
2017-11-05 14:43:20 -08:00 |
|
AlexTheCoder
|
0c1f3087ff
|
Change some permissions and update CUST-1 whitelist
|
2017-11-05 14:43:20 -08:00 |
|
AlexTheCoder
|
88a6bdc687
|
Fix clans hub chest location
|
2017-11-05 14:43:20 -08:00 |
|
AlexTheCoder
|
d64d1eed4e
|
Fix merge conflicts
|
2017-11-05 14:43:20 -08:00 |
|
Sam
|
fddfcda105
|
Fix Tic Tac Toe not appearing in the Power Play section
|
2017-11-02 11:10:03 -07:00 |
|
Sam
|
44a1aad68b
|
Fix item gadgets appearing in places they shouldn't
|
2017-11-02 08:12:07 -07:00 |
|
AlexTheCoder
|
fea8822780
|
Bye bye halloween
|
2017-11-02 02:22:06 -04:00 |
|
AlexTheCoder
|
6331ad68e5
|
Patch a NPE in MountSpider
|
2017-11-02 02:05:54 -04:00 |
|
Alexander Meech
|
c0fe6430fa
|
Delete remaining incorrect file
|
2017-11-02 01:52:37 -04:00 |
|
Alexander Meech
|
d6ffaf7e04
|
Delete incorrect duplicate file
|
2017-11-02 01:52:00 -04:00 |
|
AlexTheCoder
|
ab45277b74
|
Fix supply drop files somehow being packaged incorrectly
|
2017-11-02 01:50:47 -04:00 |
|
AlexTheCoder
|
69430794f6
|
Temporarily disable Rainbow set until ready for release
|
2017-11-02 01:47:43 -04:00 |
|
Sam
|
27e9af8659
|
Ensure that Tic-Tac-Toe invites are cleared when the gadget is disabled
|
2017-11-01 22:41:27 -07:00 |
|
Sam
|
d2416d1122
|
Reduce the particles given off during Rainbow Death
|
2017-11-01 22:41:27 -07:00 |
|
Sam
|
0be3dd5c14
|
Fix a typo for the powerplay reward
|
2017-11-01 22:41:27 -07:00 |
|
Sam
|
c541ab87d6
|
Add tracking to the support server for the Rainbow Bundle
|
2017-11-01 22:41:27 -07:00 |
|
Sam
|
7d8bcdf944
|
Add a description oto Tic Tac Toe
|
2017-11-01 22:41:27 -07:00 |
|
Sam
|
41a649456a
|
Added Rainbow, Arrow Trail, Death effect and Double Jump Effect
|
2017-11-01 22:41:27 -07:00 |
|
Sam
|
b414a308fe
|
Add a description to the gryo particle
|
2017-11-01 22:41:27 -07:00 |
|
Sam
|
40186d3383
|
Reduce the play area restriction
|
2017-11-01 22:41:27 -07:00 |
|
Sam
|
c1860c03c8
|
Fix some bugs with Tic Tac Toe
|
2017-11-01 22:41:27 -07:00 |
|
Sam
|
8429d2f0d1
|
Gryo Particle
|
2017-11-01 22:41:27 -07:00 |
|
Sam
|
20885bac4e
|
Tic Tac Toe gadget
|
2017-11-01 22:41:27 -07:00 |
|
Sam
|
9684bf7a6d
|
Fix My Profile item name
|
2017-11-01 22:32:33 -07:00 |
|
Sam
|
cd4d638963
|
Fix Old Parkours not working and Player Profile
|
2017-11-01 22:32:33 -07:00 |
|
Sam
|
093e4404e4
|
Fix some weird chat manager code
|
2017-11-01 22:32:33 -07:00 |
|
Sam
|
5bbc85f821
|
Make ArcadeManager final
|
2017-11-01 22:32:33 -07:00 |
|
Sam
|
567773f035
|
PC-437
|
2017-11-01 22:32:33 -07:00 |
|
Sam
|
cd85f4434a
|
Remove "Titles are not avaiable in 1.8.x" message
|
2017-11-01 22:32:33 -07:00 |
|
Sam
|
912c95fa78
|
Fix missing text stats
|
2017-11-01 22:32:33 -07:00 |
|
Sam
|
606963180e
|
Remove system print out
|
2017-11-01 22:32:33 -07:00 |
|
Sam
|
807d977434
|
PC-1702
|
2017-11-01 22:32:33 -07:00 |
|
AlexTheCoder
|
eb936662f1
|
Modify item name check for Clans
|
2017-11-02 01:23:19 -04:00 |
|
AlexTheCoder
|
96a7a8b0c3
|
Disable toggle checks
|
2017-11-02 01:22:50 -04:00 |
|
AlexTheCoder
|
848bee47e3
|
Disable purchase of 2017 Trick or Treat Bags
|
2017-11-01 03:04:19 -04:00 |
|
AlexTheCoder
|
adc8c902ae
|
Fix merge conflict
|
2017-10-30 12:37:26 -07:00 |
|
ArcticZeroo
|
d045dbbf9b
|
Remove the debug in hope that it magically lets the build not fail
|
2017-10-30 12:37:26 -07:00 |
|
ArcticZeroo
|
530e7c116b
|
Add a bunch of debug to ItemUsable
|
2017-10-30 12:37:26 -07:00 |
|
ArcticZeroo
|
a216a82515
|
Attempt to fix issue where any TNT can be used as proximity mines
|
2017-10-30 12:37:26 -07:00 |
|
ArcticZeroo
|
b39b9da5be
|
Add alias for savemetadata (smeta)
|
2017-10-26 16:48:39 -07:00 |
|
ArcticZeroo
|
8e1f317f58
|
Remove additional test server check in AntihackLogger
|
2017-10-26 16:48:39 -07:00 |
|
AlexTheCoder
|
e73d812feb
|
Decrease delay of GWEN Ban Waves, re-enable GWEN FastBow check, allow GWEN to detect and ban for Reach hacks, and remove permanent banning from GWEN
|
2017-10-26 19:46:40 -04:00 |
|
AlexTheCoder
|
f7650afb88
|
Remove in-game facebook rewards
|
2017-10-22 22:29:16 -04:00 |
|
Sam
|
d29db7da0a
|
Add an Admin command to permanently unlock cosmetics for offline players
|
2017-10-22 17:53:55 -07:00 |
|
Sam
|
c0dd5f41b5
|
Add the Tourament MS Skin
|
2017-10-22 17:53:55 -07:00 |
|
ArcticZeroo
|
4550ffe56e
|
Reply w an error if the player doesn't exist
|
2017-10-22 17:52:06 -07:00 |
|
ArcticZeroo
|
ccfe7c41d7
|
Remove test server check in AntihackLogger
|
2017-10-22 17:52:06 -07:00 |
|
Alexander Meech
|
a251566160
|
Update CUST-1 Whitelist
|
2017-10-21 22:33:23 -04:00 |
|
Sam
|
4311d1804b
|
Add Cake Wars build types to the Map Parser
|
2017-10-19 19:29:25 -07:00 |
|
Sam
|
2fb19e692d
|
Adjust appler kit based on GI balance
|
2017-10-19 19:28:52 -07:00 |
|
Alexander Meech
|
10e84e677b
|
Enable Halloween words in DMT
|
2017-10-18 06:01:02 -04:00 |
|
Alexander Meech
|
37ef733d5d
|
Enable Halloween words in Master Builders
|
2017-10-18 06:00:01 -04:00 |
|
Sam
|
a8d820599a
|
PR comments
|
2017-10-16 16:36:16 -07:00 |
|
Sam
|
458bb6e1c6
|
Fix AnicientChests not enabled by default
|
2017-10-16 16:36:16 -07:00 |
|
Sam
|
9d59f35847
|
Fix double purchase button
|
2017-10-16 16:36:16 -07:00 |
|
Sam
|
bf956abcad
|
Paginate TreasurePage
|
2017-10-16 16:36:16 -07:00 |
|
Sam
|
f76e30d177
|
Added all old holiday treasure chests
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
7e4129a34a
|
Update HauntedTreasure.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
8a5ec5df1a
|
Create LoveTreasure.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
378ad50a57
|
Rename GingerbreadChestAnimation to GingerbreadChestAnimation.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
6381d32bb7
|
Update ChristmasChestAnimation.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
b6f01fdc76
|
Create GingerbreadChestAnimation
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
ce02bb124d
|
Create FreedomChestAnimation.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
23a0fce0d2
|
Create ChristmasChestAnimation.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
80febbc856
|
Create SpringChestAnimation.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
bda94281cf
|
Create LoveChestAnimation.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
630e1416c9
|
Update TreasureManager.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
791a6a0ebb
|
Update HauntedTreasure.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
e7830b3c08
|
Create HauntedTreasure.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
de3d8cf0b3
|
Update CustomerSupport.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
d9e3877ef4
|
Update TreasureManager.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
c4dc30c9d9
|
Update StPatricksTreasure.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
7610a0b2df
|
Update StPatricksChestAnimation.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
0c7cfc560e
|
Create StPatricksTreasure.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
83a3283e3f
|
Create StPatricksChestAnimation.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
b197b2a76a
|
Update HubManager.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
e36fe72e42
|
Implement thankful chest
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
4ce92de8b1
|
Create ThankfulTreasure.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
fa3cd284f2
|
Update ThankfulChestAnimation.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
68917a30f8
|
Create ThankfulChestAnimation.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
7128785199
|
Fix loot pool for 2016 trick or treat chest
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
e327d63f9a
|
Update UnknownPackageReward.java
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
9be986c2d3
|
Re-implement a reward for unknown sales packages
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
c56dfee78d
|
Add missing Treasure Types
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
fe6bbc1bdc
|
Implement a more useful error message for missing chest animations
|
2017-10-16 16:36:16 -07:00 |
|
Alexander Meech
|
f12ee91b79
|
Fix treasure chests in Clans Hubs
|
2017-10-16 16:36:16 -07:00 |
|
cnr
|
239bbbd96c
|
Split 2016 and 2017 Halloween Chests
|
2017-10-13 22:57:30 -07:00 |
|
Sam
|
4680862825
|
Track trick or treat chests under a unique name
|
2017-10-13 21:20:32 -07:00 |
|
Sam
|
6819771775
|
Fix Holiday related titles
|
2017-10-13 21:20:32 -07:00 |
|
Sam
|
6bc167fca7
|
Manually open clans ui
|
2017-10-13 21:20:32 -07:00 |
|
Sam
|
6f4d68087f
|
Fix Eternal get reason
|
2017-10-13 21:20:32 -07:00 |
|
cnr
|
8fb3bf82f4
|
Add Holiday Cheer track progress for Halloween games
|
2017-10-13 18:52:53 -07:00 |
|
cnr
|
bb36e784fa
|
Merge branch 'update/hub-makeover' into develop
|
2017-10-13 11:34:11 -07:00 |
|
cnr
|
2d173278b0
|
Allow 1.12.2 clients in Clans
|
2017-10-13 11:31:07 -07:00 |
|
Sam
|
45494b0d76
|
Prevent spammy messages when opening chests
|
2017-10-13 19:21:02 +01:00 |
|
Sam
|
051a0f8809
|
Fix players being able to open other's chests (check it's the right variable next time)
|
2017-10-13 19:16:28 +01:00 |
|
cnr
|
169feb1efb
|
Merge branch 'update/hub-makeover' into develop
|
2017-10-13 09:27:42 -07:00 |
|
cnr
|
be3e150056
|
Revert "Enable 2x XP for the weekend"
This reverts commit b6d6fbf358 .
|
2017-10-13 09:24:14 -07:00 |
|
Sam
|
cf07417b1f
|
Fix Pumpkin's Revenge crashing on startup
|
2017-10-13 17:11:43 +01:00 |
|
Sam
|
23118d64a1
|
Add a sound when spawning the pumpkin mount
|
2017-10-13 15:44:28 +01:00 |
|
Sam
|
cde4e9dac8
|
Make sure that the new system can support the old lobby
|
2017-10-13 15:42:17 +01:00 |
|
Sam
|
029b0606d0
|
Add all old chest types
|
2017-10-13 04:34:52 +01:00 |
|
Sam
|
b0b581bb0b
|
Do the same for the entity method
|
2017-10-12 13:55:04 +01:00 |
|
Sam
|
927078d9f5
|
Fixed some really bad kit bugs
|
2017-10-12 13:48:51 +01:00 |
|
Sam
|
c38b4c4490
|
Fixed serveral bugs
|
2017-10-08 13:36:42 +01:00 |
|
Dan Mulloy
|
c5e4f8bd38
|
Fix startup error with Halloween 2016, remove extra debug line
|
2017-10-07 16:11:12 -04:00 |
|
Dan Mulloy
|
278f17b34d
|
Properly send Halloween sounds in 1.12 and up
|
2017-10-07 15:39:14 -04:00 |
|
Sam
|
623cd77031
|
Hub progress
|
2017-10-04 16:45:02 +01:00 |
|
Sam
|
153d5bdc63
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover
|
2017-10-02 10:52:12 +01:00 |
|
AlexTheCoder
|
285ca1e707
|
Finish patching issues surrounding supply drops
|
2017-10-02 01:03:02 -05:00 |
|
AlexTheCoder
|
be3e893b55
|
Fix some remaining issues with supply drops
|
2017-10-02 01:02:52 -05:00 |
|
Sam
|
fd5a09e71b
|
Ghast Morph
|
2017-10-02 01:02:32 -05:00 |
|
Sam
|
017a10ec80
|
Implement Hub Portals and declutter the hub plugin
|
2017-10-01 22:11:27 +01:00 |
|
Sam
|
4a9689bd17
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover
|
2017-10-01 14:41:38 +01:00 |
|
cnr
|
2dd42805ef
|
Fix cashout item duplication in Gem Hunters
|
2017-09-30 22:08:00 -05:00 |
|
Sam
|
f97174528f
|
More halloween stuff
|
2017-09-30 21:39:53 +01:00 |
|
cnr
|
b6d6fbf358
|
Enable 2x XP for the weekend
|
2017-09-29 17:02:09 -05:00 |
|
Sam
|
1b0f2538e0
|
2017 Minestrike Title
|
2017-09-29 17:01:27 -05:00 |
|
AlexTheCoder
|
4c4a3c029e
|
More supply drop fixes, implement new clans items to CUST-1, and fix forum group id assigned to the cmod tag
|
2017-09-26 05:41:30 -04:00 |
|
Sam
|
35b6f594d4
|
Trick or Treat Treasure
|
2017-09-25 18:59:51 +01:00 |
|
Sam
|
c86c6547af
|
Halloween Cosmetics
|
2017-09-25 13:42:38 +01:00 |
|
AlexTheCoder
|
1cdd6c0316
|
Fix supply drops sometimes dropping beacons if players click too fast
|
2017-09-24 18:38:49 -04:00 |
|
Sam
|
6797a6506c
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover
|
2017-09-24 21:25:07 +01:00 |
|
Sam
|
ff54aab560
|
More hub changes
|
2017-09-24 21:25:04 +01:00 |
|
AlexTheCoder
|
99faf8bdd9
|
S4 post-release changes
|
2017-09-23 23:20:38 -04:00 |
|
AlexTheCoder
|
22620bf159
|
Fix spawn locations for new map
|
2017-09-23 06:54:43 -04:00 |
|
AlexTheCoder
|
e4da5e5592
|
Final tidying up
|
2017-09-23 06:11:03 -04:00 |
|
AlexTheCoder
|
1e2dce46ad
|
Tidy up issues from merge
|
2017-09-23 04:50:02 -04:00 |
|
AlexTheCoder
|
333c632030
|
Finishing touches
|
2017-09-23 04:15:07 -04:00 |
|
AlexTheCoder
|
128e16cbcd
|
Add missing safe log qualifications
|
2017-09-23 04:15:07 -04:00 |
|
AlexTheCoder
|
010b85d1c3
|
Fixed merge conflicts
|
2017-09-23 04:15:00 -04:00 |
|
AlexTheCoder
|
de015c0943
|
Fix Capture Point duration and prevent Undead City chests from respawning
|
2017-09-23 04:10:37 -04:00 |
|
AlexTheCoder
|
2efe422519
|
Fixed merge conflicts
|
2017-09-23 04:10:33 -04:00 |
|