Skip to content

Commit

Permalink
Merge pull request #45 from biancuercole/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
biancuercole authored Oct 24, 2023
2 parents e3a5a5a + 557d8b3 commit 56459e1
Show file tree
Hide file tree
Showing 28 changed files with 46,226 additions and 1,239 deletions.
2 changes: 1 addition & 1 deletion .eslintcache
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"C:\\Programacion\\Bigotes-de-Acero\\src\\components\\Player.js":"1","C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Preload.js":"2","C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Game.js":"3","C:\\Programacion\\Bigotes-de-Acero\\src\\main.js":"4","C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Menu.js":"5","C:\\Programacion\\Bigotes-de-Acero\\src\\enums\\keys.js":"6","C:\\Programacion\\Bigotes-de-Acero\\src\\services\\translations.js":"7","C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Credits.js":"8","C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\UI.js":"9","C:\\Programacion\\Bigotes-de-Acero\\src\\components\\Clue.js":"10","C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\GameOver.js":"11","C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Victory.js":"12","C:\\Programacion\\Bigotes-de-Acero\\src\\components\\Enemy.js":"13"},{"size":1954,"mtime":1697654756650,"results":"14","hashOfConfig":"15"},{"size":2674,"mtime":1697674316770,"results":"16","hashOfConfig":"15"},{"size":6894,"mtime":1697655206679,"results":"17","hashOfConfig":"15"},{"size":899,"mtime":1697063736575,"results":"18","hashOfConfig":"15"},{"size":3594,"mtime":1697674828738,"results":"19","hashOfConfig":"15"},{"size":201,"mtime":1697674633730,"results":"20","hashOfConfig":"15"},{"size":2187,"mtime":1696964506083,"results":"21","hashOfConfig":"15"},{"size":794,"mtime":1696967569923,"results":"22","hashOfConfig":"15"},{"size":1275,"mtime":1696967512655,"results":"23","hashOfConfig":"15"},{"size":420,"mtime":1697489768974,"results":"24","hashOfConfig":"15"},{"size":1650,"mtime":1697498689253,"results":"25","hashOfConfig":"15"},{"size":951,"mtime":1697498689254,"results":"26","hashOfConfig":"15"},{"size":1091,"mtime":1697655254223,"results":"27","hashOfConfig":"15"},{"filePath":"28","messages":"29","suppressedMessages":"30","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"n38qlr",{"filePath":"31","messages":"32","suppressedMessages":"33","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"34","messages":"35","suppressedMessages":"36","errorCount":0,"fatalErrorCount":0,"warningCount":5,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"37","messages":"38","suppressedMessages":"39","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"40","messages":"41","suppressedMessages":"42","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"43","messages":"44","suppressedMessages":"45","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"46","messages":"47","suppressedMessages":"48","errorCount":0,"fatalErrorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"49","messages":"50","suppressedMessages":"51","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"52","messages":"53","suppressedMessages":"54","errorCount":0,"fatalErrorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"55","messages":"56","suppressedMessages":"57","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"58","messages":"59","suppressedMessages":"60","errorCount":0,"fatalErrorCount":0,"warningCount":2,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"61","messages":"62","suppressedMessages":"63","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"64","messages":"65","suppressedMessages":"66","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"C:\\Programacion\\Bigotes-de-Acero\\src\\components\\Player.js",[],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Preload.js",[],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Game.js",["67","68","69","70","71"],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\main.js",[],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Menu.js",[],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\enums\\keys.js",[],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\services\\translations.js",["72"],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Credits.js",[],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\UI.js",["73","74","75"],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\components\\Clue.js",[],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\GameOver.js",["76","77"],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Victory.js",[],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\components\\Enemy.js",[],[],{"ruleId":"78","severity":1,"message":"79","line":104,"column":5,"nodeType":"80","messageId":"81","endLine":104,"endColumn":16},{"ruleId":"78","severity":1,"message":"79","line":141,"column":5,"nodeType":"80","messageId":"81","endLine":141,"endColumn":16},{"ruleId":"78","severity":1,"message":"79","line":178,"column":5,"nodeType":"80","messageId":"81","endLine":178,"endColumn":16},{"ruleId":"78","severity":1,"message":"79","line":186,"column":7,"nodeType":"80","messageId":"81","endLine":186,"endColumn":18},{"ruleId":"78","severity":1,"message":"79","line":191,"column":5,"nodeType":"80","messageId":"81","endLine":191,"endColumn":16},{"ruleId":"78","severity":1,"message":"79","line":47,"column":5,"nodeType":"80","messageId":"81","endLine":47,"endColumn":16},{"ruleId":"78","severity":1,"message":"79","line":16,"column":5,"nodeType":"80","messageId":"81","endLine":16,"endColumn":16},{"ruleId":"78","severity":1,"message":"79","line":17,"column":5,"nodeType":"80","messageId":"81","endLine":17,"endColumn":16},{"ruleId":"78","severity":1,"message":"79","line":40,"column":5,"nodeType":"80","messageId":"81","endLine":40,"endColumn":16},{"ruleId":"78","severity":1,"message":"79","line":37,"column":7,"nodeType":"80","messageId":"81","endLine":37,"endColumn":18},{"ruleId":"78","severity":1,"message":"79","line":54,"column":7,"nodeType":"80","messageId":"81","endLine":54,"endColumn":18},"no-console","Unexpected console statement.","MemberExpression","unexpected"]
[{"C:\\Programacion\\Bigotes-de-Acero\\src\\components\\Player.js":"1","C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Preload.js":"2","C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Game.js":"3","C:\\Programacion\\Bigotes-de-Acero\\src\\main.js":"4","C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Menu.js":"5","C:\\Programacion\\Bigotes-de-Acero\\src\\enums\\keys.js":"6","C:\\Programacion\\Bigotes-de-Acero\\src\\services\\translations.js":"7","C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Credits.js":"8","C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\UI.js":"9","C:\\Programacion\\Bigotes-de-Acero\\src\\components\\Clue.js":"10","C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\GameOver.js":"11","C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Victory.js":"12","C:\\Programacion\\Bigotes-de-Acero\\src\\components\\Enemy.js":"13","C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Controls.js":"14","C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Pause.js":"15"},{"size":2164,"mtime":1698081546023,"results":"16","hashOfConfig":"17"},{"size":3546,"mtime":1698097552767,"results":"18","hashOfConfig":"17"},{"size":9264,"mtime":1698098471524,"results":"19","hashOfConfig":"17"},{"size":899,"mtime":1697063736575,"results":"20","hashOfConfig":"21"},{"size":3942,"mtime":1698000100871,"results":"22","hashOfConfig":"17"},{"size":425,"mtime":1697842764308,"results":"23","hashOfConfig":"17"},{"size":2187,"mtime":1696964506083,"results":"24","hashOfConfig":"21"},{"size":794,"mtime":1696967569923,"results":"25","hashOfConfig":"21"},{"size":2471,"mtime":1698005186985,"results":"26","hashOfConfig":"17"},{"size":420,"mtime":1697489768974,"results":"27","hashOfConfig":"21"},{"size":2442,"mtime":1697843553133,"results":"28","hashOfConfig":"17"},{"size":1822,"mtime":1697842532363,"results":"29","hashOfConfig":"17"},{"size":1091,"mtime":1697655254223,"results":"30","hashOfConfig":"21"},{"size":1017,"mtime":1697952826738,"results":"31","hashOfConfig":"17"},{"size":2519,"mtime":1698000128476,"results":"32","hashOfConfig":"17"},{"filePath":"33","messages":"34","suppressedMessages":"35","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"x3x5mt",{"filePath":"36","messages":"37","suppressedMessages":"38","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"39","messages":"40","suppressedMessages":"41","errorCount":0,"fatalErrorCount":0,"warningCount":6,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"42","messages":"43","suppressedMessages":"44","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"n38qlr",{"filePath":"45","messages":"46","suppressedMessages":"47","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"48","messages":"49","suppressedMessages":"50","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"51","messages":"52","suppressedMessages":"53","errorCount":0,"fatalErrorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"54","messages":"55","suppressedMessages":"56","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"57","messages":"58","suppressedMessages":"59","errorCount":0,"fatalErrorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"60","messages":"61","suppressedMessages":"62","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"63","messages":"64","suppressedMessages":"65","errorCount":0,"fatalErrorCount":0,"warningCount":2,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"66","messages":"67","suppressedMessages":"68","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"69","messages":"70","suppressedMessages":"71","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"72","messages":"73","suppressedMessages":"74","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"75","messages":"76","suppressedMessages":"77","errorCount":0,"fatalErrorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"C:\\Programacion\\Bigotes-de-Acero\\src\\components\\Player.js",[],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Preload.js",[],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Game.js",["78","79","80","81","82","83"],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\main.js",[],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Menu.js",[],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\enums\\keys.js",[],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\services\\translations.js",["84"],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Credits.js",[],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\UI.js",["85","86","87"],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\components\\Clue.js",[],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\GameOver.js",["88","89"],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Victory.js",[],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\components\\Enemy.js",[],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Controls.js",[],[],"C:\\Programacion\\Bigotes-de-Acero\\src\\scenes\\Pause.js",["90","91","92"],[],{"ruleId":"93","severity":1,"message":"94","line":141,"column":5,"nodeType":"95","messageId":"96","endLine":141,"endColumn":16},{"ruleId":"93","severity":1,"message":"94","line":176,"column":5,"nodeType":"95","messageId":"96","endLine":176,"endColumn":16},{"ruleId":"93","severity":1,"message":"94","line":220,"column":5,"nodeType":"95","messageId":"96","endLine":220,"endColumn":16},{"ruleId":"93","severity":1,"message":"94","line":228,"column":7,"nodeType":"95","messageId":"96","endLine":228,"endColumn":18},{"ruleId":"93","severity":1,"message":"94","line":235,"column":5,"nodeType":"95","messageId":"96","endLine":235,"endColumn":16},{"ruleId":"93","severity":1,"message":"94","line":239,"column":5,"nodeType":"95","messageId":"96","endLine":239,"endColumn":16},{"ruleId":"93","severity":1,"message":"94","line":47,"column":5,"nodeType":"95","messageId":"96","endLine":47,"endColumn":16},{"ruleId":"93","severity":1,"message":"94","line":26,"column":5,"nodeType":"95","messageId":"96","endLine":26,"endColumn":16},{"ruleId":"93","severity":1,"message":"94","line":27,"column":5,"nodeType":"95","messageId":"96","endLine":27,"endColumn":16},{"ruleId":"93","severity":1,"message":"94","line":76,"column":5,"nodeType":"95","messageId":"96","endLine":76,"endColumn":16},{"ruleId":"93","severity":1,"message":"94","line":48,"column":7,"nodeType":"95","messageId":"96","endLine":48,"endColumn":18},{"ruleId":"93","severity":1,"message":"94","line":65,"column":7,"nodeType":"95","messageId":"96","endLine":65,"endColumn":18},{"ruleId":"93","severity":1,"message":"94","line":35,"column":13,"nodeType":"95","messageId":"96","endLine":35,"endColumn":24},{"ruleId":"93","severity":1,"message":"94","line":50,"column":13,"nodeType":"95","messageId":"96","endLine":50,"endColumn":24},{"ruleId":"93","severity":1,"message":"94","line":68,"column":13,"nodeType":"95","messageId":"96","endLine":68,"endColumn":24},"no-console","Unexpected console statement.","MemberExpression","unexpected"]
Binary file added public/assets/images/ayuda.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/cables.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/cluebg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/contrasena.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/help.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/images/helpback.png
Binary file not shown.
Binary file added public/assets/images/key.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/keySS.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/palancaSS.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/password.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/images/platforms_atlas.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/puertaSS.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/ui.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/vias.aseprite
Binary file not shown.
Loading

0 comments on commit 56459e1

Please sign in to comment.