github/Peacock
1
Fork 0
mirror of https://github.com/thepeacockproject/Peacock synced 2024-11-29 09:15:11 +01:00
Code Releases Activity
244 Commits 13 Branches 58 Tags 61 MiB
7f86bddf21
Commit Graph

153 Commits

Author SHA1 Message Date
moonysolari
e548325955
New saving/loading behaviors to fix bugs related to saving (#73) 
Signed-off-by: moonysolari <118079569+moonysolari@users.noreply.github.com>
 2023-01-09 14:49:04 -05:00
moonysolari
d95553bd33
Fix image and text details on challenges page (#71) 
* Remove getChallengePlanningDataForContract
Use getChallengeTreeForContract in instead.

* Separate out the better function for switched data

* reduce calls of generateCompletionData

* Use new switch data batcher for destination part

* Move Contract Not Found warning to resolveContract
 2023-01-08 09:28:00 -05:00
moonysolari
fdfe8ff779
Fix default starting suits across different locations (#69) 2023-01-07 16:29:02 -05:00
moonysolari
f3803be4ef
Added Mission Story Progression (#68) 2023-01-06 21:15:14 -05:00
moonysolari
2ed110a703
Added challenges page for mission debriefing (#67) 
* add debriefing challenges page
 2023-01-04 11:36:22 -05:00
Reece Dunham
ba751852f1 Fix challenges being able to cause a recursion deadlock 
Happens rarely, see https://discord.com/channels/826809653181808651/1058021993661861938 for an explanation.
 2022-12-30 21:14:55 -05:00
Reece Dunham
79a32df1dd unlockorderComparer -> unlockOrderComparer 2022-12-30 21:06:09 -05:00
Reece Dunham
114a72038e Add a few more event-specific type definitions. 2022-12-28 15:25:32 -05:00
Reece Dunham
c35f9a463d Fix a bug causing an infinite loop when certain challenges are completed 2022-12-28 15:25:12 -05:00
Reece Dunham
7379688a91 The Christmas Calamity 2022-12-24 12:35:37 -05:00
Reece Dunham
193df194c5 Fix paginating of fake contracts 2022-12-22 14:49:04 -05:00
Reece Dunham
79558dd4a6
Clarify that push messages should not be pre-encoded. 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2022-12-20 16:03:08 -05: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
Reece Dunham
e34d1d0234
Fix SMF integration crash, dependency updates 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2022-12-15 10:04:56 -05:00
moonysolari
e7fb1c9211
Escalation picker fixes and improvements (#61) 2022-12-14 15:21:44 -05:00
atampy25
2d6a4ad616
Implement support for SMF's server replacement compatibility 2022-12-12 22:42:10 -05:00
Reece Dunham
73ff78b7c2
Reworking of challenge system (#50) 2022-12-12 16:38:55 -05:00
Alexandre Sanchez
240436f249
Livesplit - Provide a TimeCalc URL for Season/Trilogy speedruns (#42) 
* wip(livesplit): store individual times for timecalc sheet

* feat(livesplit): generate timecalc link at run end

* chore: move livesplit typings in its own types file

* feat(livesplit): complete timecalc feature
- Return 2 URLs if there is not enough lines to fit all the resets
- Print time as mm:ss when time is over 60s
- Include resetMinimum and time under 1s logics in TimeCalc output
- Handle unsplit logic in TimeCalc

* feat(livesplit): couple of changes over pr comments
- Updated _addMissionTime to always return a floored time
- Updated _formatSecondsToTime to better match other code patterns in module
- Removed debug logs entries
 2022-12-12 08:17:37 -07:00
Reece Dunham
556d9a6970 Retire The Barbegue Befuddlement 2022-12-10 21:11:50 -05:00
Reece Dunham
a1b656d364
Peacock-52: Option to use legacy contract downloader in H3 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2022-12-04 17:53:10 -05:00
atampy25
9969168616
Fix documentation for addClientSideModDependency and add new modIsInstalled function with more sensible naming and semantics (#51) 
* Fix documentation and add new function

Signed-off-by: atampy25 <24306974+atampy25@users.noreply.github.com>
Co-authored-by: Reece Dunham <me@rdil.rocks>
 2022-12-02 22:33:14 -05:00
Alexandre Sanchez
81b130f5b3
fix(webui): fixing content type that broke webui (#43) 2022-11-27 21:35:34 -05:00
Lennard Fonteijn
c37241210a
Changed importing .json as text instead for performance reasons (#40) 2022-11-25 15:18:03 -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
Reece Dunham
a0dab8be67 Export calculatePlaystyle 2022-11-22 21:43:15 -05:00
Reece Dunham
840cd0b57a Move challenge contexts to the session 2022-11-20 20:28:01 +01:00
Lennard Fonteijn
770187586b Prevent _checkInit debug message when LiveSplit is disabled 2022-11-19 17:50:53 -05:00
Lennard Fonteijn
449a8f7fe9 Added logDebug for ease of debugging 2022-11-19 22:05:44 +01:00
Reece Dunham
f0cb118c88 Fix 2016 route not returning the right data (doesn't do anything yet) 2022-11-18 21:49:11 -05:00
Alexandre Sanchez
70c67a3038
fix(livesplit): init livesplit after loadFlags completed 2022-11-17 21:28:19 +01:00
Lennard Fonteijn
381df4ea6f Added hook for the MissionEnd response 2022-11-17 00:59:44 +01:00
Reece Dunham
15e829d0d5
Merge branch 'v5' of https://github.com/thepeacockproject/Peacock into v5 2022-11-16 10:31:27 -05:00
Reece Dunham
6b1f37f149
Backport GameChangerReferences duplication fix from Evergreen branch 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2022-11-16 10:31:22 -05:00
Lennard Fonteijn
e7e64865e3
Added flags for easily enabling program options (#26) 2022-11-15 13:41:25 -05:00
Reece Dunham
d0ff3d5f6d
Remove duplicate escalation 2022-11-14 21:44:09 -05:00
riisikumi
3e83fae9db
Fix the order of H2 escalations (#24) 
based!

Signed-off-by: riisikumi <54016129+riisikumi@users.noreply.github.com>

Signed-off-by: riisikumi <54016129+riisikumi@users.noreply.github.com>
 2022-11-13 19:50:00 +00:00
Lennard Fonteijn
e608f4d7c7
Fixed issue where the newEvent-hook is called twice (#23) 2022-11-13 08:48:31 -05:00
Kaki
79771533cb
Add h2 escalations (#14) 2022-11-13 10:30:44 +00: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
Govert de Gans
76d6028c5e Tools/ContractDownloader: create "contracts" folder if it does not exist 2022-11-10 21:14:45 +01:00
Reece Dunham
410827f538
Remove requirement for stashpoints to be on a specific contract 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2022-11-10 12:13:32 -05:00
Reece Dunham
6ed867cdf6
Rebase a few Evergreen-specific types 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2022-11-10 12:05:42 -05:00
Reece Dunham
ffaabc6095
Fix image loading (mk2) 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2022-11-08 12:11:30 -05:00
Reece Dunham
cbc7238912
Add type for challenge scopes 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2022-10-25 15:11:38 -04:00
Reece Dunham
3800111b50 Add type for group contract definitions 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2022-10-23 21:37:32 -04:00
Reece Dunham
34789f8ff2 [Security] Intentionally remove prototypes from objects being cloned 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2022-10-22 21:31:22 -04: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
_Sakura
d8827a0097
feat(plugins): Load plugins from "plugins" folder (#1) 2022-10-21 09:44:24 -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