Michel2/emularity
1
0
Fork 0
mirror of https://github.com/db48x/emularity.git synced 2026-09-14 10:32:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
141 Commits 6 Branches 0 Tags
599ee0bb950ba767ea8adcdbee839834e217a77d
Commit Graph
141 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Brooks db0d970dd6 Merge branch 'master' into promises 
Conflicts:
	emdosbox-loader.js
 2015-01-28 11:31:31 -08:00
Daniel Brooks ddb52d890c let the config file tell emscripten where ancillary files are 2015-01-27 17:09:01 -08:00
Daniel Brooks eefef077c0 show 'n of m' to differentiate game files instead of their url 2015-01-27 09:52:46 -08:00
Daniel Brooks d6a77de91c don't hide download status on failure 2015-01-25 06:46:32 -08:00
Daniel Brooks e3eb04894a fix property name 2015-01-25 06:41:19 -08:00
Daniel Brooks 1655701034 add local emacs settings 2015-01-25 06:40:00 -08:00
Daniel Brooks 09db127d95 add some error messages for download failures 2015-01-25 06:39:24 -08:00
Daniel Brooks 0ef8e8332c show basic download status information 2015-01-25 06:32:15 -08:00
Daniel Brooks 9df9b0bab1 Remove unused line 2015-01-24 13:13:50 -08:00
Daniel Brooks 4c3a89752c correctly handle executables inside subdirectories 2015-01-24 11:54:33 -08:00
Daniel Brooks 8e64147290 wait for key press after all downloads are complete 
but still before launching the emulator. Technically we "launch" the
emulator by adding a script tag to the document, so it may still have to
download that. It'd be nice if we could include that earlier and call a
method to start things up.
 2015-01-24 11:09:21 -08:00
Daniel Brooks 996671b854 show loading animation right away 
Also clean up the animation code a bit, and use requestAnimationFrame if
it's available.
 2015-01-24 10:59:40 -08:00
Daniel Brooks 94bb759d92 Allow loading multiple zips, as separate drives 
This is keyed off of the item metadata; use
dosbox_drive_d=item/path/to/file.zip to mount a zip file from an item as
drive D.
 2015-01-24 08:18:49 -08:00
Daniel Brooks d308ad8d61 move that url to a getter like the rest 
also whitespace, because reasons
 2015-01-17 02:15:35 -08:00
Daniel Brooks 88226ba09f gather the skeins 
By combining start and try_start into a single promise chain, and
straightening out the logic a bit, we simultaneously make the sequence
of events much clearer, and eliminate several possibilities for
bugs (nothing can be called out of order).
 2015-01-17 02:08:16 -08:00
Daniel Brooks 7d4c75378c use Promises, to make extending the file dependencies easier 
includes a polyfill for IE; this is included in emdosbox-loader.js for
the moment
 2015-01-16 07:58:54 -08:00
John Vilk b2eadbaeb0 Hackfixing a race condition where user clicks play before module data is loaded. 
IA has a separate click handler on emdosbox that is out of our control, violating internal loader assumptions that the emulator cannot be started before module data downloads.
 2015-01-15 23:20:02 -05:00
Daniel Brooks 40f9e345ca pulled the current version of the code from loaderlab 2015-01-15 20:13:56 -08:00
Daniel Brooks 6ab9c4a4b4 move some stuff to before the preInit, where it makes more simpler 2014-12-21 20:00:52 -08:00
Daniel Brooks 1c908c36ad rearrange a few things, and use promises 
needs testing
 2014-12-21 19:36:03 -08:00
Daniel Brooks f5f71a1bef rearrange a few things, and use promises 
Needs testing.
 2014-12-21 19:22:53 -08:00
Daniel Brooks 0882cc41c5 Module.preInit is apparently not called as a method; we can't use 'this' in it. 2014-12-21 00:23:59 -08:00
Daniel Brooks a0db7cb49a restore the js_filename option to the config, so that we can actually load dosbox :P 2014-12-20 22:56:02 -08:00
Daniel Brooks 7ea8cb3eb4 a little cleanup 2014-12-20 08:16:00 -08:00
Daniel Brooks b823c44461 use the correct request type when fetching the item metadata 2014-12-20 08:02:03 -08:00
Daniel Brooks 833bd4ce0c avoid an error when _SDL_PauseAudio is undefined 2014-12-20 08:01:36 -08:00
Daniel Brooks 960c015957 set the arguments after we've loaded the metadata 2014-12-19 16:42:49 -08:00
Daniel Brooks 0a37914480 load the metadata for the item to find the emulator_start value 2014-12-18 21:33:03 -08:00
Daniel Brooks c58dc5e1e7 finish renaming things to DOSBOX 2014-12-18 20:34:03 -08:00
Daniel Brooks 1425e22d5b don't fetch keymap/extra js; they're not needed here 2014-12-18 20:27:41 -08:00
Daniel Brooks a69202fdfc remove use_mame flag 2014-12-18 20:11:38 -08:00
Daniel Brooks c6ae5e59ed whitespace 2014-12-18 20:10:43 -08:00
Daniel Brooks 0687e9274c fix zipfile mount location 2014-12-18 20:08:36 -08:00
Daniel Brooks 868bdc866f set up dosbox arguments 2014-12-18 20:08:23 -08:00
Daniel Brooks 10892a3df0 mount the zip file so that it can be written, integrating the code from jvilk 2014-12-18 19:54:35 -08:00
Daniel Brooks 69aead60bc we don't need a bios; dosbox handles that 2014-12-18 19:50:22 -08:00
Daniel Brooks 00cc2190fc rename to DOSBOX 2014-12-18 19:30:15 -08:00
Daniel Brooks 00004e3b2c always use the MAME path, since it's most similar to what we need to do for DosBox 2014-12-18 19:27:15 -08:00
Daniel Brooks 6c01fb184b semicolons, mostly 2014-12-18 19:26:31 -08:00
Daniel Brooks 9b94fdf01e change spinner image 2014-12-18 19:16:40 -08:00
Daniel Brooks 15730ff8c3 code from textfiles 2014-12-18 19:14:24 -08:00