Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Beta][QoL] Run History #2877

Closed
wants to merge 49 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
3af459f
Files added. They fail the ESLint check right now but I will fix it.
Jun 2, 2024
8677fbd
Removed images used for some other test-branch
Jun 2, 2024
d73f87f
Fixed SaveSessionData issue + Added loss details + removed Modifiers
Jun 3, 2024
8d128de
Moved run_history into LocalStorage + barebones setup for network com…
Jun 3, 2024
670a349
Added network functionality
Jun 5, 2024
77a37e6
I hate Git
Jun 5, 2024
131ec4c
Cleaned up code. Improved network methods so there should be no devic…
Jun 5, 2024
f7c4597
Added some UI improvements
Jun 5, 2024
3ebebb4
Refined UI, tested with Endless Mode
Jun 5, 2024
4636277
Fixed async methods to work+More clean-up
Jun 5, 2024
5dacdae
Final changes
Jun 6, 2024
e49cc8c
Merge branch 'main' into runHistory
frutescens Jun 10, 2024
2e2f749
Revert "Final changes"
Jun 11, 2024
9b758be
Final changes
Jun 6, 2024
8925e7c
Merge branch 'main' into runHistory
frutescens Jun 15, 2024
583e2db
Updated code with the current repo + mode localization
Jun 16, 2024
92f085c
Merge branch 'main' into runHistory
frutescens Jun 16, 2024
660c484
Fixed issues noticed by Brain Frog
Jun 17, 2024
15bb022
Added localization framework
Jun 18, 2024
6e625a3
Run History Extended Mode - Modifiers still buggy
Jun 20, 2024
9caca20
UI Files
Jun 20, 2024
3aa75ff
Language Support + Other additions
Jun 20, 2024
afc38e3
Fusion and Shiny Indicators
Jun 20, 2024
e2cec75
Added handling for trainer double battles
Jun 21, 2024
af9ec4b
Cleaned up more, added feature to indicate terastalized enemy pokemon
Jun 24, 2024
f12ba0e
Removed imports from old phases.ts file
Jun 24, 2024
18af5d7
Fixed color for SSS luck
Jun 24, 2024
2467f2f
Minor UI Changes
Jun 26, 2024
18c8a43
Menu option is not visible if player has no run history
Jun 27, 2024
1d74602
Linted files
Jun 28, 2024
547fade
Fixed UI based on feedbackfrom others
Jun 28, 2024
979a829
Fixed dangling UI issue
Jun 28, 2024
5b196d4
Aligned stats
Jun 28, 2024
c4d6643
Merge branch 'main' into runHistory
frutescens Jun 28, 2024
663b02f
Experienced some stress over spacing
Jun 28, 2024
2275dcd
Merge remote-tracking branch 'origin/runHistory' into runHistory
Jun 28, 2024
03e26f2
Added new variable to replace magic string
Jun 28, 2024
0ddd624
Merge branch 'main' into runHistory
frutescens Jul 6, 2024
75e1712
Tiny fix to help address Github Pages errors
Jul 6, 2024
4076e2b
Removed i18n.ts from tracking
Jul 6, 2024
cd35417
i18n.ts update
Jul 6, 2024
574d84c
More fixes for Github Pages
Jul 6, 2024
4b57682
Github Pages test errors
Jul 6, 2024
0858bcf
Finished addressing TypeDoc test failures
Jul 6, 2024
ab155aa
Update src/system/game-data.ts
frutescens Jul 6, 2024
88c7378
Merge branch 'beta' into runHistory
frutescens Jul 6, 2024
56bfa62
Revert "Merge branch 'beta' into runHistory"
Jul 6, 2024
74c6f0c
Localization files
Jul 6, 2024
e84a68a
UI now checks for fusionAbilityIndex and missing victory runInfo bug …
Jul 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
VITE_TITLE=PokéRogue
VITE_BYPASS_LOGIN=0
VITE_BYPASS_TUTORIAL=0
VITE_SERVER_URL=http://localhost:8001
3 changes: 1 addition & 2 deletions .env.beta
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
VITE_TITLE=PokéRogue Beta
VITE_BYPASS_LOGIN=0
VITE_BYPASS_TUTORIAL=0
VITE_SERVER_URL=https://api.beta.pokerogue.net
VITE_SERVER_URL=https://api.beta.pokerogue.net
3 changes: 1 addition & 2 deletions .env.development
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
VITE_TITLE=PokéRogue Dev
VITE_BYPASS_LOGIN=1
VITE_BYPASS_TUTORIAL=0
VITE_SERVER_URL=http://localhost:8001
VITE_SERVER_URL=http://localhost:8001
1 change: 0 additions & 1 deletion .env.production
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
VITE_TITLE=PokéRogue
VITE_BYPASS_LOGIN=0
VITE_BYPASS_TUTORIAL=0
VITE_SERVER_URL=https://api.pokerogue.net
4 changes: 2 additions & 2 deletions .github/workflows/deploy-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ jobs:
env:
NODE_ENV: production
- name: Set up SSH
if: github.event_name == 'push' && (github.ref_name == github.event.repository.default_branch || github.ref_name == 'beta')
if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
run: |
mkdir ~/.ssh
echo "${{ secrets.BETA_SSH_PUBLIC_KEY }}" > ~/.ssh/id_ed25519.pub
echo "${{ secrets.BETA_SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519
chmod 600 ~/.ssh/*
ssh-keyscan -H ${{ secrets.BETA_SSH_HOST }} >> ~/.ssh/known_hosts
- name: Deploy build on server
if: github.event_name == 'push' && (github.ref_name == github.event.repository.default_branch || github.ref_name == 'beta')
if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
run: |
rsync --del --no-times --checksum -vrm dist/* ${{ secrets.BETA_SSH_USER }}@${{ secrets.BETA_SSH_HOST }}:${{ secrets.BETA_DESTINATION_DIR }}
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,4 @@ coverage
# Local Documentation
/typedoc

/dependency-graph.svg
/.vs
/dependency-graph.svg
198 changes: 0 additions & 198 deletions MEs-Roadmap-Documentation.md

This file was deleted.

2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<head>
<meta charset="UTF-8" />
<title>%VITE_TITLE%</title>
<title>PokéRogue</title>
<meta name="title" content="PokéRogue" />
<meta name="description" content="A Pokémon fangame heavily inspired by the roguelite genre. Battle endlessly while gathering stacking items, exploring many different biomes, and reaching Pokémon stats you never thought possible." />
<meta name="theme-color" content="#da3838" />
Expand Down
Loading
Loading