github/Peacock
1
Fork 0
mirror of https://github.com/thepeacockproject/Peacock synced 2024-11-22 22:12:45 +01:00
Code Releases Activity
302 Commits 13 Branches 57 Tags 61 MiB
75a4b259e4
Commit Graph

302 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
moonysolari
fdfe8ff779
Fix default starting suits across different locations (#69) 2023-01-07 16:29:02 -05:00
Reece Dunham
2f01422057
Update Node to v18.13.0 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2023-01-06 21:16:47 -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
f04a9f749b
Move the code of conduct to the docs folder [skip ci] 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2023-01-04 11:33:58 -05:00
Reece Dunham
fa2be4118c
Add security policy 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2023-01-04 11:33:30 -05:00
dependabot[bot]
2fc20247e5
Bump json5 from 2.2.1 to 2.2.2 (#65) 
Bumps [json5](https://github.com/json5/json5) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v2.2.1...v2.2.2)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-01-04 11:28:05 -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
a71bfff890 Use the new axios across all workspaces 2022-12-30 21:08:15 -05:00
Reece Dunham
c5488541e4 Merge branch 'v6' of https://github.com/thepeacockproject/Peacock into v6 2022-12-30 21:06:16 -05:00
Reece Dunham
79a32df1dd unlockorderComparer -> unlockOrderComparer 2022-12-30 21:06:09 -05:00
Govert de Gans
645d014dde Update axios to v1.2.2, fixing an 'unexpected end of file' error 
This error popped up when trying to download a contract via tools.cmd
 2022-12-30 15:47:28 +01:00
Reece Dunham
46c0537256 Add missing locale strings 2022-12-28 15:53:22 -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
3f52d87bc8 Merge branch 'v6' of https://github.com/thepeacockproject/Peacock into v6 2022-12-25 15:01:39 -05:00
Reece Dunham
4b6e2e9a3c Bump version to v5.6.0 2022-12-24 16:40:15 -05:00
Reece Dunham
7379688a91 The Christmas Calamity 2022-12-24 12:35:37 -05:00
Reece Dunham
03ac9a8eda Additional dynres fixes (h3 this time) 2022-12-22 17:44:45 -05:00
Reece Dunham
e512edac42 Rebuild h2 dynres 2022-12-22 16:11:13 -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
6520433705
Merge branch 'v6' of https://github.com/thepeacockproject/Peacock into v6 2022-12-15 11:12:21 -05:00
Reece Dunham
819ee16876
Disable Yarn global cache 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2022-12-15 11:12:05 -05:00
Reece Dunham
05730a084f
Fix the build 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2022-12-15 10:31:50 -05:00
Reece Dunham
e947ad3d71
Fix the build 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2022-12-15 10:31:37 -05:00
Reece Dunham
5f7a4bb458
Optimize built-in contracts 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2022-12-15 10:26:41 -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
moonysolari
3801d41048
disable saving on somve escalations (#60) 2022-12-13 18:12:07 -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
b08e19fd1d
#53: Escalation Level Picker does not show S2 or 3 escalations 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2022-12-05 14:38:40 -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
Reece Dunham
63b08dd99e
Run prettier 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2022-12-03 16:35:39 -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
Reece Dunham
a86e27ce66
Fix the gitattributes 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2022-12-02 12:01:29 -05:00
Cookie303728
51fb09a2d0
Translated Files in Dynamic Resources into German (#49) 2022-12-02 11:57:25 -05:00
Reece Dunham
fa0b5786a1
Mark some dynres files as generated 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2022-12-02 11:56:47 -05:00
WINNODD
c00e1e9648
multiple contract creation fix (#48) 
Multiple contract creation fixes (#48)
 2022-12-01 09:28:31 -05:00
Reece Dunham
51303d2adb
Merge branch 'v5' of https://github.com/thepeacockproject/Peacock into v5 2022-11-28 12:41:39 -05:00
Reece Dunham
2a5ef84bf7
Bump version to v5.6.1-dev.1 (not tagging yet) 
Signed-off-by: Reece Dunham <me@rdil.rocks>
 2022-11-28 12:41:34 -05:00
Alexandre Sanchez
81b130f5b3
fix(webui): fixing content type that broke webui (#43) 2022-11-27 21:35:34 -05:00
Reece Dunham
da59af34a2 Make english version of text show up for all languages instead of empty strings 2022-11-26 10:52: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
b92a793e84 Update some dependencies 2022-11-23 22:28:53 -05:00