Skip to content

Commit

Permalink
Merge pull request #39 from biancuercole/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
biancuercole authored Oct 20, 2023
2 parents f32c81c + 4f8f0d5 commit e3a5a5a
Show file tree
Hide file tree
Showing 31 changed files with 96,369 additions and 340 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"},{"size":1875,"mtime":1696460708377,"results":"4","hashOfConfig":"5"},{"size":1756,"mtime":1696460551547,"results":"6","hashOfConfig":"5"},{"size":2853,"mtime":1696461270703,"results":"7","hashOfConfig":"5"},{"filePath":"8","messages":"9","suppressedMessages":"10","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"n38qlr",{"filePath":"11","messages":"12","suppressedMessages":"13","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"14","messages":"15","suppressedMessages":"16","errorCount":0,"fatalErrorCount":0,"warningCount":2,"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",["17","18"],[],{"ruleId":"19","severity":1,"message":"20","line":22,"column":5,"nodeType":"21","messageId":"22","endLine":22,"endColumn":16},{"ruleId":"19","severity":1,"message":"20","line":85,"column":5,"nodeType":"21","messageId":"22","endLine":85,"endColumn":16},"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"},{"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"]
Binary file added public/assets/images/Fondo.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/androide.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/banderaArg.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/banderaEEUU.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/credits.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/drone.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/flag.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/helpback.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/menufinal.jpg
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/nota.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.
Loading

0 comments on commit e3a5a5a

Please sign in to comment.