Commit Graph

69 Commits

Author SHA1 Message Date
tomcw
e98de27039 Manual merge from master @ c798157 2016-03-21 23:48:02 +00:00
TomCh
60db3d6622 Merge pull request #279 from AppleWin/1.25.0.4
Fix for Applewin exiting when using -d1 arg (#276) and set version to 1.25.0.4
2015-04-23 21:48:35 +01:00
tomcw
9191efe5f9 Fix for Applewin exiting when using -d1 arg (#276) 2015-04-23 21:45:41 +01:00
unknown
c2b62d26d3 Sound page has SAM card option 2015-03-11 12:43:24 +09:00
michaelangel007
a1d730a0b9 Bump version to 1.26 Alpha 2015-01-07 00:46:37 -08:00
michaelangel007
8809caefe2 Added new logo, fixed fullscreen y offset 2015-01-06 01:45:38 -08:00
tomcw
0e31e91e61 Disk configuration: Minor coding style tweaks & clean-up 2014-10-10 21:24:50 +01:00
pedgarcia
9d0c9e6e2d Reverted to old bmp 2014-10-01 23:26:51 -04:00
pedgarcia
d97f77aaff Fixed resource.h merge mistake 2014-10-01 19:32:19 -04:00
pedgarcia
87a7485e80 Merge branch 'master' of https://github.com/pedgarcia/AppleWin
Conflicts:
	resource/resource.h
	source/Configuration/PageDisk.h
2014-10-01 19:28:32 -04:00
pedgarcia
43b31c28db New disk selection interface
The Configuration Dialog -> Disks tab now has combos to show
insert/eject disks, as well as it now the images are automatically
swapped if you try to insert on one drive the image connected to the
other
The Apple logo was redone following the same-ish colour pattern but with
a more modern look.

(*) Updated based on first review:
- Removed bmp from this pull request (coming later)
- Corrected resource's constants values and deleted unused one
- Initializing variables in CPageDisk constructot
2014-10-01 19:18:46 -04:00
pedgarcia
d9e37e007c New disk selection interface
The Configuration Dialog -> Disks tab now has combos to show
insert/eject disks, as well as it now the images are automatically
swapped if you try to insert on one drive the image connected to the
other
The Apple logo was redone following the same-ish colour pattern but with
a more modern look.
2014-09-30 19:29:26 -04:00
tomcw
d1dddbe813 1.25.0.3: Restore MIP_FF_FF_00_00 as memory init default (see GH Bug#225) 2014-09-08 22:25:29 +01:00
tomcw
9526ec6052 Bumped version to 1.25.0.2 2014-09-07 10:02:34 +01:00
tomcw
9194ea9b36 1.25.0.1: Rebuilt with VS2005 Express 2014-09-01 21:14:39 +01:00
tomcw
a05979a6d1 Bump version to 1.25 & added comment to History.txt stating dropping Win98/ME support 2014-08-28 22:34:25 +01:00
michaelangel007
50ed260710 #199 #215 Cleanup: "Confirm Reset" to "Confirm reboot" 2014-07-27 14:31:00 -07:00
michaelangel007
b0928645a2 Initial work for dialog to confirm reset 2014-07-26 13:44:27 -07:00
tomcw
d591dd006b Remove the top-level AppleWin folder 2014-05-23 22:59:02 +01:00