Skip to content

Merge old development code into trunk #13

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.

Sign up for GitHub

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

Open
FairlySadPanda wants to merge 24 commits into
base: master
Choose a base branch
from
Open

Merge old development code into trunk #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
44f22c3
Huge, huge amounts of cleanup
FairlySadPanda Nov 6, 2019
b9d2e3a
Added a function to Window that allows easy deduction of maximum wind…
FairlySadPanda Nov 12, 2019
14b40ac
Better typings in BattleManager
FairlySadPanda Nov 12, 2019
33be897
Better typings
FairlySadPanda Nov 12, 2019
2ef3f76
Window_Base gets lots of typings
FairlySadPanda Nov 12, 2019
3f57403
Fix to BattleLog to avoid CTD
FairlySadPanda Nov 12, 2019
5f58806
BattkeSkill tracks the active player (better UI)
FairlySadPanda Nov 12, 2019
7b9651a
BattleItem tracks the user - better UI
FairlySadPanda Nov 12, 2019
2449829
Moveroute stuff
FairlySadPanda Feb 1, 2020
92828fe
Added VSCode stuff
FairlySadPanda Feb 1, 2020
9597c50
Only ignore JS plugins
FairlySadPanda Feb 1, 2020
775a498
Removed some junk from the html/package file
FairlySadPanda Feb 1, 2020
a693308
Everything is upside down
FairlySadPanda Feb 1, 2020
2399bde
Some more tinkering
FairlySadPanda Feb 1, 2020
51b9ca2
It's not upside down anymore
FairlySadPanda Feb 2, 2020
3258f8f
Allow Pixi Devtools to work
FairlySadPanda Feb 2, 2020
3f13453
Tilemaps still load late but otherwise working
FairlySadPanda Feb 2, 2020
7495c44
Fixes for remaining defects! Huzzah!
FairlySadPanda Feb 3, 2020
8129abe
Fix picture offset
FairlySadPanda Feb 3, 2020
aa14eaf
Stop expecting chrome debug tool extensions.
FairlySadPanda Mar 19, 2020
97dd8e0
Modify Gitignore
FairlySadPanda Mar 19, 2020
d76e610
Again
FairlySadPanda Mar 19, 2020
e656a0b
Again
FairlySadPanda Mar 19, 2020
3febc3f
Fix to allow for the game to boot on git pull
FairlySadPanda Mar 19, 2020
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
3 changes: 2 additions & 1 deletion .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ module.exports = {
"@typescript-eslint/no-unused-vars": "off",
"no-control-regex": "off",
"no-eval": "off",
"no-unused-expressions": "off"
"no-unused-expressions": "off",
"import/order": "off"
}
};
7 changes: 3 additions & 4 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
node_modules
.vscode
audio
chrome
data
fonts
icon
img
js
js/*
movies
save
Game.rpgproject
package-lock.json
/ts/plugins
*.code-workspace
*.rar
!js/plugins.js
25 changes: 25 additions & 0 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "nwjs",
"request": "launch",
"name": "Launch NWjs with Build",
"nwjsVersion": "any",
"webRoot": "${workspaceFolder}",
"reloadAfterAttached": false,
"preLaunchTask": "tsc: build - tsconfig.json"
},
{
"type": "nwjs",
"request": "launch",
"name": "Launch NWjs",
"nwjsVersion": "any",
"webRoot": "${workspaceFolder}",
"reloadAfterAttached": false
}
]
}
23 changes: 23 additions & 0 deletions .vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"type": "typescript",
"tsconfig": "tsconfig.json",
"problemMatcher": ["$tsc"],
"options": {
"shell": {
"executable": "powershell.exe"
}
}
},
{
"type": "typescript",
"tsconfig": "tsconfig.json",
"option": "watch",
"problemMatcher": ["$tsc-watch"]
}
]
}
7 changes: 5 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,15 @@
<link rel="icon" href="icon/icon.png" type="image/png" />
<link rel="apple-touch-icon" href="icon/icon.png" />
<link rel="stylesheet" type="text/css" href="fonts/gamefont.css" />
<title>Dragon Slayers Demo</title>
<title>Testbench</title>
</head>
<body style="background-color: black">
<script type="text/javascript" src="js/plugins.js"></script>
<script type="text/javascript">
var game = require("./js/main");
const PIXI = require("pixi.js");
require("pixi-tilemap");
require("./js/pixi/pixi-picture");
require("./js/main");
</script>
</body>
</html>
267 changes: 267 additions & 0 deletions js/plugins.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "stronk-v1.1.0",
"main": "index.html",
"js-flags": "--expose-gc",
"chromium-args": "--mixed-context --remote-debugging-port=9223 --load-extension=chrome --limit-fps=60",
"chromium-args": "--mixed-context --remote-debugging-port=9223 --limit-fps=60 --disable-features=nw2",
"window": {
"title": "STRONK! v.0.1.0",
"toolbar": false,
Expand All @@ -18,7 +18,6 @@
"devDependencies": {
"@types/lz-string": "^1.3.33",
"@types/node": "^11.13.13",
"@types/pixi.js": "^4.8.8",
"@typescript-eslint/eslint-plugin": "^1.9.0",
"bestzip": "^1.1.3",
"concat-with-sourcemaps": "^1.0.4",
Expand Down Expand Up @@ -46,9 +45,9 @@
"lodash": "^4.17.15",
"lz-string": "^1.4.4",
"nw": "^0.41.1",
"pixi-picture": "^1.3.1",
"pixi-tilemap": "^1.2.4",
"pixi.js": "^4.8.8",
"pixi-picture": "^1.3.2",
"pixi-tilemap": "^2.0.3",
"pixi.js": "^5.2.1",
"source-map-support": "^0.5.13",
"ts-node": "^8.2.0",
"typescript": "^3.5.1"
Expand Down
Loading