Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into next-release

Browse source
This commit is contained in:
Jeff Parsons 2016-04-02 09:18:59 -07:00
commit 477cdfe539
52 changed files with 6771 additions and 446 deletions
Download patch file Download diff file Expand all files Collapse all files

2
devices/pc/video/ibm/cga/ibm-cga-dual.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<video id="videoCGA" model="cga" screenwidth="960" screenheight="480" scale="true" charset="/devices/pc/video/ibm/cga/ibm-cga.json" pos="center" padding="8px">
<video id="videoCGA" model="cga" screenwidth="960" screenheight="600" scale="true" charset="/devices/pc/video/ibm/cga/ibm-cga.json" pos="center" padding="8px">
<menu>
<title>Color Display</title>
</menu>

2
devices/pc/video/ibm/cga/ibm-cga-keygrid.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<video id="videoCGA" screenwidth="960" screenheight="480" scale="true" charset="/devices/pc/video/ibm/cga/ibm-cga.json" touchscreen="keygrid" pos="center" padding="8px">
<video id="videoCGA" screenwidth="1280" screenheight="800" scale="true" charset="/devices/pc/video/ibm/cga/ibm-cga.json" touchscreen="keygrid" pos="center" padding="8px">
<menu>
<title>Color Display</title>
<control type="container" pos="right">

2
devices/pc/video/ibm/cga/ibm-cga-lock.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<video id="videoCGA" screenwidth="960" screenheight="480" scale="true" touchscreen="mouse" autolock="true" charset="/devices/pc/video/ibm/cga/ibm-cga.json" padding="8px">
<video id="videoCGA" screenwidth="1280" screenheight="800" scale="true" touchscreen="mouse" autolock="true" charset="/devices/pc/video/ibm/cga/ibm-cga.json" padding="8px">
<menu>
<title>Color Display</title>
<control type="container" pos="right">

2
devices/pc/video/ibm/cga/ibm-cga.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<video id="videoCGA" screenwidth="960" screenheight="480" scale="true" charset="/devices/pc/video/ibm/cga/ibm-cga.json" pos="center" padding="8px">
<video id="videoCGA" screenwidth="1280" screenheight="800" scale="true" charset="/devices/pc/video/ibm/cga/ibm-cga.json" pos="center" padding="8px">
<menu>
<title>Color Display</title>
<control type="container" pos="right">