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

Feature: Placeholder Sprites #21

Closed
wants to merge 73 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
689531d
New Replays: Support private replays & more
Zarel Oct 27, 2023
3bb2271
New Replays: Two column support
Zarel Oct 28, 2023
6d26ace
New Replays: Support linking to viewpoints
Zarel Oct 28, 2023
0dcff6c
New Replays: Support pagination in search results
Zarel Oct 29, 2023
7305b58
Rename switchSides -> switchViewpoint
Zarel Oct 29, 2023
177e3e9
New Replays: Support sorting by rating
Zarel Oct 29, 2023
40ef9a2
New Replays: Wider supported width
Zarel Oct 29, 2023
357a1d6
New Replays: Support Download button
Zarel Oct 29, 2023
0951a7a
New Replays: Support keyboard shortcuts
Zarel Oct 30, 2023
b24a8c8
Add ZU teambuilder support
KrisXV Nov 1, 2023
32d5476
Fix ADV ZU teambuilder
KrisXV Nov 1, 2023
c99981e
FIx LC teambuilder
KrisXV Nov 1, 2023
5e638d4
New Replays: Fix misc bugs
Zarel Nov 2, 2023
463948f
Support more variable best-of challenges (#2173)
DaWoblefet Nov 2, 2023
b64f891
Account for custom challenges with best of default checks
mia-pi-git Nov 2, 2023
d8b94d5
Update xfix's name in credits (#2176)
KamilaBorowska Nov 3, 2023
e7814d3
Design refresh (#2175)
Zarel Nov 4, 2023
f9bc940
Give JSON files the Access-Control-Allow-Origin: * header (#2172)
LumarisX Nov 4, 2023
fb41336
Improve design
Zarel Nov 4, 2023
6ca49c5
Teambuilder: Fix desync bugs
Zarel Nov 4, 2023
9b60505
Move unpackTeam/exportTeam to battle-dex
Zarel Nov 4, 2023
e3b82f2
Restore downloaded replay CSS
Zarel Nov 4, 2023
befbf58
Fix more design refresh bugs
Zarel Nov 4, 2023
7a2b323
Deploy New Replays
Zarel Nov 5, 2023
51a285c
Replays: Restore support for -restoreboost
Zarel Nov 5, 2023
fb049be
Storage: Ensure teams of nonstandard length don't duplicate on load
mia-pi-git Nov 6, 2023
3a8a793
Support old replay search API
Zarel Nov 7, 2023
a083b1d
Give all data/ files Access-Control-Allow-Origin header (#2183)
LumarisX Nov 9, 2023
57e8302
Replays: Support "music off, effects on" sound mode
Zarel Nov 8, 2023
dc8e6cf
Replays: Correct link previews
Zarel Nov 8, 2023
ed36b96
Replays: Add Dark mode selector
Zarel Nov 8, 2023
7c18649
Workaround for large cookies
Zarel Nov 10, 2023
910be16
Clearer error message for teams corruption
Zarel Nov 10, 2023
12a83e9
Make sure replay downloading works correctly
Zarel Nov 10, 2023
9219fb3
Fix another oversight from design refresh
Zarel Nov 10, 2023
8750d6b
Add home button for friends list
mia-pi-git Nov 10, 2023
626ecec
Storage: Add colors to all 6 mainmenu buttons
mia-pi-git Nov 13, 2023
e0e2ea0
Add some new move animations (#2185)
KrisXV Nov 13, 2023
dbd4a9e
Add Ivy Cudgel and Matcha Gotcha animations
KrisXV Nov 14, 2023
21de8d9
Remove old action.php and replays
Zarel Nov 14, 2023
0b8a9bb
Fix Tourney Bracket panning for touch devices (#2184)
SirzBenjie Nov 15, 2023
cc9f6ae
Make Replays work better on database failures
Zarel Nov 15, 2023
9d8655c
Remove references to the old logo
Zarel Nov 16, 2023
426656e
Don't default https://localhost.psim.us to HTTPS
Zarel Nov 16, 2023
f1a74eb
Tooltips: Fix Low Kick BP in Gen 1/2 (#2186)
Karthik99999 Nov 16, 2023
8358265
Fix formats not found message not appearing (#2170)
Karthik99999 Nov 16, 2023
077b762
Tooltips: show Tera BP floor (#2153)
pyuk-bot Nov 16, 2023
a3fdd95
Add framebuster
Zarel Nov 16, 2023
f53f8e4
Remove unused news PHP files
Zarel Nov 16, 2023
5d41f3e
Reorganize directories (#2187)
Zarel Nov 16, 2023
3d1623b
Update News for new directory layout
Zarel Nov 16, 2023
ae7c61f
Fix unstyled buttons in teams dropdown (#2178)
shrianshChari Nov 16, 2023
f3500bc
Fix 2FA authentication
mia-pi-git Nov 16, 2023
4fa3ed7
Build-tools: Always try to update news
mia-pi-git Nov 16, 2023
5b97740
Fix overlooked paths from directory reorg
Zarel Nov 16, 2023
d66b080
Move replay-config to config/
Zarel Nov 16, 2023
7732ec7
Refactor build tools for readability
Zarel Nov 16, 2023
bd134f4
Fix crash in customcss
Zarel Nov 16, 2023
49cb741
Move Analytics/ads into config
Zarel Nov 17, 2023
5f614de
Satisfy eslint
Zarel Nov 17, 2023
77b75b5
Adjust ZU teambuilder support
KrisXV Nov 17, 2023
e4d5f64
Teambuilder: Fix CAP mashup support
KrisXV Nov 18, 2023
2677570
Formats dropdown: Default Unofficial Formats to open
KrisXV Nov 18, 2023
94a6a80
Fix build
KrisXV Nov 18, 2023
0408736
Modified Tera Blast animations (#2188)
shrianshChari Nov 18, 2023
aef3474
Revert "Modified Tera Blast animations (#2188)"
KrisXV Nov 18, 2023
c9851eb
November 18, 2023: Merge with PS
Rezzo64 Nov 18, 2023
21c760c
work ModConfig and mod-sprites into build
Rezzo64 Nov 18, 2023
ecfe055
update server path in workflow script
Rezzo64 Nov 18, 2023
145d541
index.html to check modconfig and modsprites
Rezzo64 Nov 18, 2023
9267500
add Substitute as placeholder sprite
Rezzo64 Nov 18, 2023
1ac9ed5
Merge pull request #20 from Rezzo64/main
Rezzo64 Nov 19, 2023
7f98e2e
Merge branch 'placeholder-sprites' of https://github.com/Rezzo64/dh2-…
Rezzo64 Nov 19, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
28 changes: 14 additions & 14 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
data/*
node_modules/
js/*
/play.pokemonshowdown.com/data/*
/play.pokemonshowdown.com/js/*

!/js/client-battle.js
!/js/client-chat-tournament.js
!/js/client-chat.js
!/js/client-ladder.js
!/js/client-mainmenu.js
!/js/client-rooms.js
!/js/client-teambuilder.js
!/js/client-topbar.js
!/js/client.js
!/js/replay-embed.template.js
!/js/search.js
!/js/storage.js
!/play.pokemonshowdown.com/js/client-battle.js
!/play.pokemonshowdown.com/js/client-chat-tournament.js
!/play.pokemonshowdown.com/js/client-chat.js
!/play.pokemonshowdown.com/js/client-ladder.js
!/play.pokemonshowdown.com/js/client-mainmenu.js
!/play.pokemonshowdown.com/js/client-rooms.js
!/play.pokemonshowdown.com/js/client-teambuilder.js
!/play.pokemonshowdown.com/js/client-topbar.js
!/play.pokemonshowdown.com/js/client.js
!/play.pokemonshowdown.com/js/replay-embed.template.js
!/play.pokemonshowdown.com/js/search.js
!/play.pokemonshowdown.com/js/storage.js
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
run: npm run build --if-present
- name: start DH2 server instance
run: |
node DH2/pokemon-showdown &
node caches/DH2/pokemon-showdown &
while ! curl -s http://localhost:8000 -o /dev/null; do
sleep 60
done
Expand Down
49 changes: 29 additions & 20 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,39 +1,48 @@
/sprites/
/audio/
/index.php
/index.html
/preactalpha.html
/crossprotocol.html
/data/*
node_modules/
eslint-cache/
.DS_Store
Thumbs.db
npm-debug.log
package-lock.json
/config/
/vendor/
/caches/

/js/server/
/js/*.js.map
/js/battle*.js
/js/panel*.js
/js/replay-embed.js
/js/client-main.js
/js/client-core.js
/js/client-connection.js
/play.pokemonshowdown.com/sprites/
/play.pokemonshowdown.com/audio/
/play.pokemonshowdown.com/index.php
/play.pokemonshowdown.com/index.html
/play.pokemonshowdown.com/preactalpha.html
/play.pokemonshowdown.com/crossprotocol.html
/play.pokemonshowdown.com/data/

/replays/caches/
/replays/replay-config.inc.php
/replays/theme/wrapper.inc.php
/play.pokemonshowdown.com/js/server/
/play.pokemonshowdown.com/js/*.js.map
/play.pokemonshowdown.com/js/battle*.js
/play.pokemonshowdown.com/js/panel*.js
/play.pokemonshowdown.com/js/replay-embed.js
/play.pokemonshowdown.com/js/client-main.js
/play.pokemonshowdown.com/js/client-core.js
/play.pokemonshowdown.com/js/client-connection.js
/play.pokemonshowdown.com/ads.txt

/website/.well-known/
/website/.pages-cached/
/website/files/
/website/images/
/website/ads.txt

/DH2/*
/DH2/
/website/replays/index.html
/website/replays/js/
node_modules
/pokemonshowdown.com/.well-known/
/pokemonshowdown.com/.pages-cached/
/pokemonshowdown.com/files/
/pokemonshowdown.com/images/
/pokemonshowdown.com/ads.txt

/replay.pokemonshowdown.com/index.php
/replay.pokemonshowdown.com/js/
/replay.pokemonshowdown.com/caches/
/replay.pokemonshowdown.com/theme/wrapper.inc.php
/replay.pokemonshowdown.com/ads.txt
39 changes: 0 additions & 39 deletions action.php

This file was deleted.

1 change: 0 additions & 1 deletion ads.txt

This file was deleted.

1 change: 1 addition & 0 deletions build-tools/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ module.exports = {
"no-confusing-arrow": 0,
"no-const-assign": 2,
"no-dupe-class-members": 2,
"no-restricted-syntax": "off",
"no-this-before-super": 2,
"no-var": 2,
"require-yield": 2,
Expand Down
Loading
Loading