1
mirror of https://github.com/thepeacockproject/Peacock synced 2024-11-22 22:12:45 +01:00
Commit Graph

33 Commits

Author SHA1 Message Date
Reece Dunham
e70442e7d7
Remove obsolete code
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-10-27 11:46:52 -04:00
AnthonyFuller
bf4ab0a36b Bump game version
(cherry picked from commit baae32eb86)
2023-10-26 15:50:06 +01:00
riisikumi
d966bd862f
TS6, 3.160 update (#316)
Added TS6, bumped server versions, updated store data and unlockables
2023-08-20 15:24:40 +01:00
AnthonyFuller
3418035419 Refine easter egg 2023-08-04 11:38:27 +01:00
Anthony Fuller
46052c7b0e
Multi-Version Mastery and Sniper Scoring (#270)
* Add multi-version mastery files

* Add pro1 unlocks to legacy allunlockables

* Add 47's suit to scpc all unlockables

* Add and remove various configs

* Remove some useless promises

* Fix scpc hub

* Fix issue with user profile saving

* Fix scpc issues for hub

* Add singleplayer/multiplayer sniper

* A great many things

- Add multi-version mastery
- Improve sniper mastery support
- Improve general H2016 support

* Fix some warnings

* Fix pro1 mastery on destination screens

* Remove entP from createInventory, lock/unlock pro1 accordingly

* Remove JSDoc entP parameter from createInventory

* Remove difficultyunlocks from safehouse pages

* Add versioned user profiles

* Prettier run

* Remove false point from user profiles docs

* Add comment about profile versioning to types

* Fix default profile links

* Remove remaining lowercase

* Fix sniper showing XP as XP

* Add game versions to the unlockable map

* Update getMasteryForUnlockable call in planning

* Fix missing locations when updating profiles

* Update versions to v7

* Fix ICA Facility destination mastery

* Fix sniper challenge unlockables showing in inventory

* Sniper Scoring (#273)

* Initial sniper scoring

* Fix linting errors

* Update require table

* Calculate and display final sniper score on end screen

* Bump SMP version to v5.7.0

* Update since version for scoring

* Fix create inventory call for sniper scoring

* Support sniper unlockables in the inventory

* Update versions to v7

* Reflect changes to createInventory in scoreHandler

* Get unlockable name in completion data

* It was not okay.

* Thanks webstorm

* Add support for /profiles/page/GetMasteryCompletionDataForUnlockable

* Support sniper play next

* Remove sniper gamemodes template from overrides

* Remove debug prints from scoring event handler

* Fix challenge multiplier

* Exclude sniper unlockables from stashpoint

* Start fixing up the missionEnd response for sniper

* Update misleading comment

* Use existing global challenge to check for SA on sniper contracts

* Re-add removed global challenges

* Proper support for the mission end screen on sniper contracts

* Remove redundant label

---------

Signed-off-by: Anthony Fuller <24512050+AnthonyFuller@users.noreply.github.com>
Co-authored-by: Govert de Gans <grappigegovert@hotmail.com>

* Add co-op sniper scoring defs

* Update MasteryUnlockable template

* Bump SMP version to v5.9.3

* Re-add deepmerge

* Fix SMP checksum

* Fix linting errors caused by merge

* Fix score handler imports

* Move load flags

* Remove unnecessary game version arg

* Whoopsies

Co-authored-by: Reece Dunham <me@rdil.rocks>
Signed-off-by: Anthony Fuller <24512050+AnthonyFuller@users.noreply.github.com>

---------

Signed-off-by: Anthony Fuller <24512050+AnthonyFuller@users.noreply.github.com>
Co-authored-by: Govert de Gans <grappigegovert@hotmail.com>
Co-authored-by: Reece Dunham <me@rdil.rocks>
2023-07-24 23:47:28 +01:00
AnthonyFuller
0702975c3e Bump H3 server version to 8.12.0 2023-05-11 11:59:22 +01:00
Reece Dunham
9a000b6d70
Update deps + eslint rules
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-04-28 23:39:57 -04:00
Reece Dunham
beb594d6d8
Fix the tests in the dumbest possible way
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-04-28 22:37:46 -04:00
Lennard Fonteijn
4551059a53 Added logic to generate require table for plugins
Fixed issue where non-development builds would try to load TypeScript-based plugins
Fixed issue of non-exported interface FakePlayer
2023-04-17 00:24:13 +02:00
Lennard Fonteijn
02f1fbbc00
Added additional logging for debugging purposes (#183) 2023-04-06 00:21:12 +01:00
moonysolari
e6f72eb53d
Prevent disconnections caused by contract report requests (#99) 2023-03-20 12:24:21 -04:00
Lennard Fonteijn
4031779a91 Added distinction between Mastery XP and Action XP
Added extended Profile Profile to main menu
Added support for Payout objectives on the score screen
Added flag for unlocking all shortcuts
Added flag for unlocking all Freelancer masteries
Added flag to allow Peacock to be restarted when the game is running and connected
Fixed issue where playstyle wasn't show properly
2023-03-19 14:15:19 -04:00
Lennard Fonteijn
ba9b799abe Add support for XP progression (#86)
* Fixed issue where restarting Peacock would require to first go offline again

* Added proper player progression

* Fixed most issues with the mission end screen

* Added final tweaks to scoring

* Update global challenges

* Added near-complete support for Freelancer
Added support for unlocking shortcuts
Cleaned up a bunch of magic values in relation to XP and levels

---------

Co-authored-by: moonysolari <changyiding@126.com>
2023-03-19 14:15:19 -04:00
Cookie303728
a2df1d615d
adds a plugins folder when non is detected (#129) 2023-02-09 19:39:38 +01:00
AnthonyFuller
499631fa01 Up the limit on metric requests 2023-01-29 04:34:29 +00:00
AnthonyFuller
71ce9f0f87 Bump server version
(cherry picked from commit fa5827e995)
2023-01-28 16:56:47 +00:00
Reece Dunham
8ec9fb1824
Update copyright years to 2023
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-01-23 13:37:33 -05:00
Reece Dunham
e238ecf720
Revert "Fixed issue where restarting Peacock would require to first go offline again"
This reverts commit 2cc63c9ec3.
2023-01-19 15:56:30 -05:00
Lennard Fonteijn
2cc63c9ec3 Fixed issue where restarting Peacock would require to first go offline again 2023-01-19 21:39:51 +01:00
Reece Dunham
9e6e5dd4ed
Fixes to the express patch
Signed-off-by: Reece Dunham <me@rdil.rocks>
2022-12-15 20:40:49 -05:00
moonysolari
e7fb1c9211
Escalation picker fixes and improvements (#61) 2022-12-14 15:21:44 -05:00
Alexandre Sanchez
81b130f5b3
fix(webui): fixing content type that broke webui (#43) 2022-11-27 21:35:34 -05:00
Lennard Fonteijn
b44774d971
Fixed an issue where ExpressJS doesn't seem to set a default content-type (#41) 2022-11-25 15:17:23 -05:00
Reece Dunham
87dc916fe4 Revert automatic reformat of flags fix 2022-11-23 22:13:02 -05:00
Reece Dunham
0ff03964b7 Fix Redsnapper and Golden Doublet images 2022-11-23 22:11:22 -05:00
Lennard Fonteijn
770187586b Prevent _checkInit debug message when LiveSplit is disabled 2022-11-19 17:50:53 -05:00
Alexandre Sanchez
70c67a3038
fix(livesplit): init livesplit after loadFlags completed 2022-11-17 21:28:19 +01:00
Lennard Fonteijn
e7e64865e3
Added flags for easily enabling program options (#26) 2022-11-15 13:41:25 -05:00
Lennard Fonteijn
6782fc5f7d
Fixed flags from being loaded rather late in the startup phase (#10)
Added flag toggle for LiveSplit
2022-11-10 16:45:03 -05:00
Lennard Fonteijn
84a00e8d83
Added additional reason to detect IIS as being the issue of an uncaught exception (#11) 2022-11-10 16:28:23 -05:00
Lennard Fonteijn
9affb237e3
Fixed issue where folders for cached images weren't properly created (#9) 2022-11-10 15:38:13 -05:00
Reece Dunham
5d34135956
Fix image loading (#4)
* Fix image loading (thanks for reporting Wojtek!)

* Add / to allowed characters

Signed-off-by: Reece Dunham <me@rdil.rocks>
2022-10-22 18:48:48 -04:00
Reece Dunham
6245e91624 Initial commit
Co-authored-by: Tino Roivanen <tino.roivanen98@gmail.com>
Co-authored-by: Govert de Gans <grappigegovert@hotmail.com>
Co-authored-by: Gray Olson <gray@grayolson.com>
Co-authored-by: Alexandre Sanchez <alex73630@gmail.com>
Co-authored-by: Anthony Fuller <24512050+anthonyfuller@users.noreply.github.com>
Co-authored-by: atampy25 <24306974+atampy25@users.noreply.github.com>
Co-authored-by: David <davidstulemeijer@gmail.com>
Co-authored-by: c0derMo <c0dermo@users.noreply.github.com>
Co-authored-by: Jeevat Singh <jeevatt.singh@gmail.com>
Signed-off-by: Reece Dunham <me@rdil.rocks>
2022-10-19 21:33:45 -04:00