golemjager/thegame-2024
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated dependencies. centered game window. tightened sizes

Browse Source
This commit is contained in:
Your Name
2020-10-25 09:18:44 -04:00
parent 40342a0068
commit 499529ba1d
3 changed files with 95 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
package-lock.json generated
View File

@@ -6460,9 +6460,9 @@
} }
}, },
"interpret": { "interpret": {
"version": "1.2.0", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz", "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
"integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==", "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
"dev": true "dev": true
}, },
"invariant": { "invariant": {
@@ -7761,6 +7761,29 @@
"boolbase": "~1.0.0" "boolbase": "~1.0.0"
} }
}, },
"null-loader": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/null-loader/-/null-loader-3.0.0.tgz",
"integrity": "sha512-hf5sNLl8xdRho4UPBOOeoIwT3WhjYcMUQm0zj44EhD6UscMAz72o2udpoDFBgykucdEDGIcd6SXbc/G6zssbzw==",
"dev": true,
"requires": {
"loader-utils": "^1.2.3",
"schema-utils": "^1.0.0"
},
"dependencies": {
"schema-utils": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
"dev": true,
"requires": {
"ajv": "^6.1.0",
"ajv-errors": "^1.0.0",
"ajv-keywords": "^3.1.0"
}
}
}
},
"num2fraction": { "num2fraction": {
"version": "1.2.2", "version": "1.2.2",
"resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
@@ -9609,9 +9632,9 @@
"dev": true "dev": true
}, },
"sass": { "sass": {
"version": "1.26.5", "version": "1.27.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.26.5.tgz", "resolved": "https://registry.npmjs.org/sass/-/sass-1.27.0.tgz",
"integrity": "sha512-FG2swzaZUiX53YzZSjSakzvGtlds0lcbF+URuU9mxOv7WBh7NhXEVDa4kPKN4hN6fC2TkOTOKqiqp6d53N9X5Q==", "integrity": "sha512-0gcrER56OkzotK/GGwgg4fPrKuiFlPNitO7eUJ18Bs+/NBlofJfMxmxqpqJxjae9vu0Wq8TZzrSyxZal00WDig==",
"dev": true, "dev": true,
"requires": { "requires": {
"chokidar": ">=2.0.0 <4.0.0" "chokidar": ">=2.0.0 <4.0.0"
@@ -9883,9 +9906,9 @@
"dev": true "dev": true
}, },
"shelljs": { "shelljs": {
"version": "0.8.3", "version": "0.8.4",
"resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz", "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz",
"integrity": "sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==", "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"glob": "^7.0.0", "glob": "^7.0.0",
@@ -11188,24 +11211,25 @@
"dev": true "dev": true
}, },
"vue": { "vue": {
"version": "2.6.11", "version": "2.6.12",
"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz", "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz",
"integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==" "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="
}, },
"vue-cli-plugin-vuetify": { "vue-cli-plugin-vuetify": {
"version": "2.0.5", "version": "2.0.7",
"resolved": "https://registry.npmjs.org/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.0.5.tgz", "resolved": "https://registry.npmjs.org/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.0.7.tgz",
"integrity": "sha512-jtxcidjLT5f1H9QLYKLFjo/ZG42ud4pI9bK3WNO5DXyhiMDMTwSZ7b3NcJVRH7tKYbv5/ty0VPdDGlf4w22AMA==", "integrity": "sha512-4riK5bzyvkZ4CxpQk/Vl6z8n8tmJUhuxh+k8xc/MZRdCt9RxAm3G4SxcEweroqKGXg+CRRfhqysaEQVtd4D40Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"null-loader": "^3.0.0",
"semver": "^7.1.2", "semver": "^7.1.2",
"shelljs": "^0.8.3" "shelljs": "^0.8.3"
}, },
"dependencies": { "dependencies": {
"semver": { "semver": {
"version": "7.3.0", "version": "7.3.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.0.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
"integrity": "sha512-uyvgU/igkrMgNHwLgXvlpD9jEADbJhB0+JXSywoO47JgJ6c16iau9F9cjtc/E5o0PoqRYTiTIAPRKaYe84z6eQ==", "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
"dev": true "dev": true
} }
} }
@@ -11282,9 +11306,9 @@
} }
}, },
"vue-template-compiler": { "vue-template-compiler": {
"version": "2.6.11", "version": "2.6.12",
"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz", "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz",
"integrity": "sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA==", "integrity": "sha512-OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg==",
"dev": true, "dev": true,
"requires": { "requires": {
"de-indent": "^1.0.2", "de-indent": "^1.0.2",
@@ -11298,14 +11322,14 @@
"dev": true "dev": true
}, },
"vuetify": { "vuetify": {
"version": "2.2.29", "version": "2.3.15",
"resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.2.29.tgz", "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.3.15.tgz",
"integrity": "sha512-UI1i8kEdV+s7tNQe2yJJMPlvxGTE8cZfUAXEGV2yO4owHmeybn6p5YzFpJqimoKkfX6ok+zV29+6yIKfkyUDAA==" "integrity": "sha512-YVJN/ld60S2mmFCKxoVFkB8X2kmuLT0E28ql4kr8HQUeCYdK8axoca/N8ZIP1hFH4NIz392f0nVpZKS4ZFZBVA=="
}, },
"vuetify-loader": { "vuetify-loader": {
"version": "1.4.4", "version": "1.6.0",
"resolved": "https://registry.npmjs.org/vuetify-loader/-/vuetify-loader-1.4.4.tgz", "resolved": "https://registry.npmjs.org/vuetify-loader/-/vuetify-loader-1.6.0.tgz",
"integrity": "sha512-ryEtVZ/t+zvTM9UscEX5mWsbTOH5HGWITxlysYkkXtcgzgV21t7rRLHBhReH8oMBYddAij4AOosimhcfKnxFHQ==", "integrity": "sha512-1bx3YeZ712dT1+QMX+XSFlP0O5k5O5Ui9ysBBmUZ9bWkAEHWZJQI9soI+qG5qmeFxUC0L9QYMCIKP0hOL/pf3Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"file-loader": "^4.0.0", "file-loader": "^4.0.0",

12
package.json
View File

@@ -12,8 +12,8 @@
"dependencies": { "dependencies": {
"core-js": "^3.6.4", "core-js": "^3.6.4",
"font-picker-vue": "^1.0.3", "font-picker-vue": "^1.0.3",
"vue": "^2.6.11", "vue": "^2.6.12",
"vuetify": "^2.2.29" "vuetify": "^2.3.15"
}, },
"devDependencies": { "devDependencies": {
"@vue/cli-plugin-babel": "~4.3.0", "@vue/cli-plugin-babel": "~4.3.0",
@@ -22,11 +22,11 @@
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"eslint": "^6.7.2", "eslint": "^6.7.2",
"eslint-plugin-vue": "^6.2.2", "eslint-plugin-vue": "^6.2.2",
"sass": "^1.26.5", "sass": "^1.27.0",
"sass-loader": "^8.0.0", "sass-loader": "^8.0.0",
"vue-cli-plugin-vuetify": "~2.0.5", "vue-cli-plugin-vuetify": "^2.0.7",
"vue-template-compiler": "^2.6.11", "vue-template-compiler": "^2.6.12",
"vuetify-loader": "^1.4.4" "vuetify-loader": "^1.6.0"
}, },
"eslintConfig": { "eslintConfig": {
"root": true, "root": true,

79
src/App.vue
View File

@@ -1,10 +1,10 @@
<template> <template>
<v-app> <v-app>
<v-content> <v-content>
<v-container> <v-container width="100%">
<div <div
id="gamediv" id="gamediv"
style="width: 640px; height: 480px; display: block; position: relative" style="width: 640px; height: 480px; display: block; position: relative; margin-left: auto; margin-right: auto;"
class="apply-font" class="apply-font"
> >
<div style="width: 640px; height: 480px; position: absolute; overflow: hidden;"> <div style="width: 640px; height: 480px; position: absolute; overflow: hidden;">
@@ -76,37 +76,22 @@
</v-card-text> </v-card-text>
</v-card> </v-card>
</div> </div>
<v-row dense>
<v-card> <v-col :cols="10">
<v-card-text>
<v-row>
<v-col cols="auto">
<v-btn x-small dense @click="reset">Reset</v-btn> <v-btn x-small dense @click="reset">Reset</v-btn>
</v-col> <v-btn v-if="currentLevel>0" x-small @click="previouslevel">Previous Level</v-btn>
<v-col cols="auto" v-if="currentLevel>0">
<v-btn x-small @click="previouslevel">Previous Level</v-btn>
</v-col>
<v-col cols="auto">
<v-btn x-small dense @click="previoustask">Previous Task</v-btn> <v-btn x-small dense @click="previoustask">Previous Task</v-btn>
</v-col>
<v-col cols="auto">
<v-btn x-small dense @click="scramble">Shuffle</v-btn> <v-btn x-small dense @click="scramble">Shuffle</v-btn>
</v-col>
<v-col cols="auto">
<v-btn x-small dense @click="nexttask">Next Task</v-btn> <v-btn x-small dense @click="nexttask">Next Task</v-btn>
</v-col> <v-btn v-if="currentLevel<(slides.length -1)" x-small @click="nextlevel">Next Level</v-btn>
<v-col cols="auto" v-if="currentLevel<(slides.length -1)"> </v-col><v-col :cols="2">
<v-btn x-small @click="nextlevel">Next Level</v-btn> <v-checkbox x-dense v-model="autonext" label="Auto-next task"></v-checkbox>
</v-col>
<v-col cols="auto">
<v-checkbox v-model="autonext" label="Next task after complete"></v-checkbox>
</v-col> </v-col>
</v-row> </v-row>
<v-row> <v-row dense>
<v-col cols="1"> <v-col :cols="2">
<v-text-field dense v-model="name" label="Player Name" placeholder="Player Name"></v-text-field> <v-text-field dense v-model="name" label="Player Name" placeholder="Player Name"></v-text-field>
</v-col> </v-col><v-col :cols="2">
<v-col cols="1">
<v-text-field <v-text-field
style="text-shadow: 0" style="text-shadow: 0"
dense dense
@@ -114,49 +99,47 @@
label="High Score name" label="High Score name"
placeholder="High Score Name" placeholder="High Score Name"
></v-text-field> ></v-text-field>
</v-col> </v-col><v-col :cols="2">
<v-col cols="1">
<v-text-field dense v-model="highscore" label="High Score" placeholder="High Score"></v-text-field> <v-text-field dense v-model="highscore" label="High Score" placeholder="High Score"></v-text-field>
</v-col> </v-col><v-col :cols="2">
<v-col cols="1">
<v-text-field <v-text-field
dense dense
v-model="bonuspoints" v-model="bonuspoints"
label="Bonus Points" label="Bonus Points"
placeholder="Bonus Points" placeholder="Bonus Points" />
></v-text-field> </v-col><v-col :cols="2">
</v-col>
<v-col cols="1">
<v-btn @click="givebonuspoints">Give bonus</v-btn> <v-btn @click="givebonuspoints">Give bonus</v-btn>
</v-col> </v-col>
</v-row> </v-row>
<v-row> <v-row dense>
<v-col cols="auto"> <v-col :cols="2">
<v-select <v-select dense
v-model="levelselect" v-model="levelselect"
:items="slides" :items="slides"
item-text="title" item-text="title"
item-value="index" item-value="index"
label="Select level" label="Select level"
></v-select> ></v-select>
<v-btn @click="leveljump">Jump To Level</v-btn> </v-col><v-col :cols="1">
</v-col> <v-btn dense x-small @click="leveljump">Jump</v-btn>
<v-col cols="auto"> </v-col><v-col :cols="2">
<v-select <v-select
v-model="overlayselect" v-model="overlayselect"
:items="overlayimages" :items="overlayimages"
dense
item-text="name" item-text="name"
item-value="file" item-value="file"
label="Select cutscene" label="Select cutscene"
></v-select> ></v-select>
<v-btn @click="startoverlay">Start Cutscene</v-btn> </v-col><v-col :cols="1">
<v-btn @click="startoverlay" x-small>Cut</v-btn>
</v-col> </v-col>
<v-col cols="auto"> <v-col :cols="1">
<v-select v-model="timer" label="Countdown time" :items="countdownitems"></v-select> <v-select dense v-model="timer" label="Countdown time" :items="countdownitems"></v-select>
<v-btn @click="starttimer">Start Timer</v-btn> </v-col><v-col :cols="1">
</v-col> <v-btn x-small @click="starttimer">Start</v-btn>
<v-col cols="1"> </v-col><v-col :cols="2">
<font-picker <font-picker dense
:api-key="'AIzaSyCAW_4WvUsVuikytJw_yvJKxHKRHrCsBAs'" :api-key="'AIzaSyCAW_4WvUsVuikytJw_yvJKxHKRHrCsBAs'"
:options="options" :options="options"
:active-font="fontFamily" :active-font="fontFamily"
@@ -164,8 +147,6 @@
></font-picker> ></font-picker>
</v-col> </v-col>
</v-row> </v-row>
</v-card-text>
</v-card>
</v-container> </v-container>
</v-content> </v-content>
</v-app> </v-app>