Permalink
Checking mergeability…
Don’t worry, you can still create the pull request.
Comparing changes
Open a pull request
1
contributor
Commits on Aug 26, 2016
Commits on Sep 01, 2016
Unified
Split
Showing
with
33 additions
and 6 deletions.
- +1 −0 CNAME
- BIN gba.bin
- +27 −2 index.html
- +4 −4 user_css/main.css
- +1 −0 user_scripts/ROMLoadGlueCode.js
View
1
CNAME
| @@ -0,0 +1 @@ | ||
| +gba.troiry.me |
View
BIN
gba.bin
Binary file not shown.
View
29
index.html
| @@ -4,6 +4,27 @@ | ||
| <title>IodineGBA</title> | ||
| <meta charset="UTF-8"> | ||
| <!--Required Scripts--> | ||
| + <script> | ||
| + var baseLogFunction = console.log; | ||
| + console.log = function(){ | ||
| + baseLogFunction.apply(console, arguments); | ||
| + | ||
| + var args = Array.prototype.slice.call(arguments); | ||
| + for(var i=0;i<args.length;i++){ | ||
| + createLogNode(args[i]); | ||
| + } | ||
| + | ||
| + } | ||
| + | ||
| + function createLogNode(message){ | ||
| + alert(message); | ||
| + } | ||
| + | ||
| + window.onerror = function(message, url, linenumber) { | ||
| + console.log("JavaScript error: " + message + " on line " + | ||
| + linenumber + " for " + url); | ||
| + } | ||
| + </script> | ||
| <script src="IodineGBA/includes/TypedArrayShim.js"></script> | ||
| <script src="IodineGBA/core/Cartridge.js"></script> | ||
| <script src="IodineGBA/core/DMA.js"></script> | ||
| @@ -56,27 +77,31 @@ | ||
| <script src="user_scripts/GfxGlueCode.js"></script> | ||
| <script src="user_scripts/GUIGlueCode.js"></script> | ||
| <script src="user_scripts/JoyPadGlueCode.js"></script> | ||
| - <script src="user_scripts/ROMLoadGlueCode.js"></script> | ||
| + <script src="user_scripts/ROMLoadGlueCode.js?v1"></script> | ||
| <script src="user_scripts/SavesGlueCode.js"></script> | ||
| <script src="user_scripts/WorkerGfxGlueCode.js"></script> | ||
| <script src="user_scripts/WorkerGlueCode.js"></script> | ||
| <script src="user_scripts/XAudioJS/swfobject.js"></script> | ||
| <script src="user_scripts/XAudioJS/resampler.js"></script> | ||
| <script src="user_scripts/XAudioJS/XAudioServer.js"></script> | ||
| <script src="user_scripts/VoiceController.js"></script> | ||
| - <link rel="stylesheet" href="user_css/main.css"> | ||
| + <link rel="stylesheet" href="user_css/main.css?v4"> | ||
| </head> | ||
| <body> | ||
| <div id="container"> | ||
| <div id="menu" class="paused"> | ||
| <ul id="menu_top"> | ||
| +<!-- | ||
| <li> | ||
| <span>File</span> | ||
| <ul> | ||
| <li class="nowrap"><span>BIOS: </span> <input type="file" id="bios_load" class="files"></li> | ||
| <li class="nowrap"><span>Game: </span> <input type="file" id="rom_load" class="files"></li> | ||
| </ul> | ||
| </li> | ||
| +--> | ||
| +<li class="nowrap"><span>BIOS: </span> <input type="file" id="bios_load" class="files"></li> | ||
| + <li class="nowrap"><span>Game: </span> <input type="file" id="rom_load" class="files"></li> | ||
| <li id="play" class="show"> | ||
| <span>Play</span> | ||
| </li> | ||
View
8
user_css/main.css
| @@ -51,7 +51,7 @@ span#tempMessage { | ||
| } | ||
| div#menu { | ||
| position: absolute; | ||
| - z-index: 1; | ||
| + z-index: 5; | ||
| width: 100%; | ||
| height: 0px; | ||
| } | ||
| @@ -84,10 +84,10 @@ div#menu ul li { | ||
| margin: 0; | ||
| padding: 0; | ||
| } | ||
| -div#menu ul li:hover { | ||
| +div#menu ul li:active { | ||
| background-color: rgb(240, 240, 240) !important; | ||
| } | ||
| -div#menu ul li:hover > ul { | ||
| +div#menu ul li:active > ul { | ||
| display: block; | ||
| } | ||
| li.hide { | ||
| @@ -114,7 +114,7 @@ div#menu ul ul ul { | ||
| input { | ||
| max-width: 150px; | ||
| } | ||
| -div#menu.paused > ul, div#menu.playing > ul:hover { | ||
| +div#menu.paused > ul, div#menu.playing > ul:active { | ||
| opacity: 1; | ||
| } | ||
| div#menu.playing > ul { | ||
View
1
user_scripts/ROMLoadGlueCode.js
| @@ -19,6 +19,7 @@ function attachBIOS(BIOS) { | ||
| function attachROM(ROM) { | ||
| try { | ||
| IodineGUI.Iodine.attachROM(new Uint8Array(ROM)); | ||
| + IodineGUI.Iodine.play(); | ||
| } | ||
| catch (error) { | ||
| IodineGUI.Iodine.attachROM(ROM); | ||