Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-01 13:41:28 +00:00
Code Issues Projects Releases Wiki Activity
1,722 Commits 5 Branches 15 Tags 25 MiB
android_develop
Commit Graph

166 Commits

Author SHA1 Message Date
Aaron Culliney
0eb4dad0da More fixes to get iOS build unstuck 2016-05-15 18:22:58 -07:00
Aaron Culliney
e5b3099b04 Improved clamping of Mac joystick/gamepad axes 2016-04-23 14:56:05 -07:00
Aaron Culliney
747a469241 Fixes to get Mac build working again 
- TODO : various settings appear to be broken, but basic emulator functionality appears to be working ;-)
 2016-04-23 14:54:46 -07:00
Aaron Culliney
e7b2dd3ad1 Fix product name 2016-04-23 12:46:59 -07:00
Aaron Culliney
98e5c883f9 Project file changes 2016-04-23 10:16:29 -07:00
Aaron Culliney
3ed159dd0b Lightly refactor joystick and button handling during reset 
- Remove unused button2 variable
    - Remake little-used backend joystick reset function as function pointer
    - Allow soft reset and self-test on Android (although there is still a race condition due to code that directly sets
      joy_button[12] values
 2016-04-17 11:42:13 -07:00
Aaron Culliney
0dbcfbc9a2 Various fixes to get Mac and iOS building 2016-02-15 21:10:16 -08:00
Aaron Culliney
829291feba Refactor all drawing to run on video thread in one scanner pass 
- Moves extra work off CPU/audio thread
    - Prepares the way to possibly remove the vestigal intermediate indexed framebuffer and do direct RGBA_8888 writes
      to XImage or OpenGL texture
    - Prepares the ground for possible better emulation of video scanner hardware

Conflicts:
	src/display.c
	src/video/glvideo.c
	src/video/video.h
 2016-02-15 13:29:58 -08:00
Aaron Culliney
261ae2efae Refactor to not use video_backend in so many places 2016-02-07 14:42:32 -08:00
Aaron Culliney
281fccb73b Update misc project settings =) 2016-01-05 00:11:38 -08:00
Aaron Culliney
c5256dde85 Add new shader to iOS and Mac bundle 2016-01-05 00:10:11 -08:00
jvernet
1b2c6fff83 Project update 2016-01-04 21:25:28 -08:00
jvernet
5f21ef14a4 Macs Flat icons, Toolbar 2016-01-04 21:25:28 -08:00
jvernet
4de4fa6685 ?? 2016-01-04 21:25:28 -08:00
jvernet
680fbea853 Add missing IOS icon 2016-01-04 21:25:28 -08:00
jvernet
29e6dcde2f dsk document definition 
so that you can download .dsk directly in Apple2IOS Document/inbox
directly from Safari. But need a way to show Inbox folder in Disk View…
 2016-01-04 21:25:28 -08:00
jvernet
0fee86bc3c Added ReadOnly Switchs for disks 2016-01-04 21:25:27 -08:00
jvernet
b6a9f667ef Latest commit from mauiaaron need common.h in imagutil for FREE and MALLOC macros 2016-01-04 21:25:27 -08:00
jvernet
7008d21fcf IOS icon 2016-01-04 21:25:27 -08:00
jvernet
f05ce4d247 IOS icons 2016-01-04 21:25:27 -08:00
jvernet
6445546ff9 Toolbar Icons 2016-01-04 21:25:27 -08:00
jvernet
672d824946 Yes, it work ! 
https://youtu.be/C5no96qnCNQ
 2016-01-04 21:25:27 -08:00
jvernet
4d89d173f4 Here we are: now everything work for iPad. 2016-01-04 21:25:27 -08:00
jvernet
86064cf1c6 Hard to understand those Segues ***ing 2016-01-04 21:25:27 -08:00
jvernet
b60a697b86 Finally ! First time loading disk !!! 2016-01-04 21:25:27 -08:00
jvernet
3cea55cc40 Est ce que je vais terminer un jour ? 2016-01-04 21:25:26 -08:00
jvernet
f722725992 IOS Pref more 2016-01-04 21:25:26 -08:00
jvernet
28875b5e76 IOS Prefs 2016-01-04 21:25:26 -08:00
jvernet
a3040dfb05 IOS stuff 2016-01-04 21:25:26 -08:00
jvernet
d23b0593fb IOS Stuff 2016-01-04 21:25:26 -08:00
jvernet
97700bbff6 More IOS work 
but it doesn’t work better.
 2016-01-04 21:25:26 -08:00
jvernet
b9a6f0060d test on real iPad 2016-01-04 21:25:26 -08:00
jvernet
4522fa98ac ToolBar properly at bottom 2016-01-04 21:25:26 -08:00
jvernet
bf341731f0 Separate View/controller 2016-01-04 21:25:26 -08:00
jvernet
b04e7760c2 IOS ToolBar Trying 
Need to know how it work…
 2016-01-04 21:25:26 -08:00
jvernet
f984bfc5b0 IOS 2016-01-04 21:25:25 -08:00
jvernet
b251e122e2 Localization Preferences 2016-01-04 21:25:25 -08:00
jvernet
4d1224ce29 Localization French 2016-01-04 21:25:25 -08:00
jvernet
746dcb2e3d Suite 2016-01-04 21:25:25 -08:00
jvernet
f4258ade45 Initials changes 
Added NSToolbar and French Localization
 2016-01-04 21:25:25 -08:00
Aaron Culliney
e7e6af1335 WIP : first cut at MainMenu popup 2016-01-04 20:34:27 -08:00
Aaron Culliney
5737e89150 Initial iOS target compiles, links, and appears to run in simulator and on device =) 2016-01-04 20:34:27 -08:00
Aaron Culliney
6af1309e2d Various project changes to prepare for iOS target 2016-01-04 20:33:35 -08:00
Aaron Culliney
042edd8bab Segregate Mac-specific classes into OSX group 2016-01-04 20:33:35 -08:00
Aaron Culliney
d69b416c58 Lightly refactor emulator joystick API in preparation for more comprehensive refactor 2015-12-19 13:01:28 -08:00
Aaron Culliney
c35122beb6 Changes insisted upon by Xcode 7.x 2015-11-14 10:42:17 -08:00
Aaron Culliney
ee83ecb52c Enable CPU speed animation 2015-11-14 10:41:53 -08:00
Aaron Culliney
a61fd339a6 Various fixes to get Mac build compiling 2015-11-14 08:01:20 -08:00
Aaron Culliney
dc1845afe9 Add correct files to Mac project 2015-11-13 23:09:24 -08:00
Aaron Culliney
2cc23cf35d Upgrade to GPLv3 "or later" and update copyrights 2015-10-22 21:09:13 -07:00
Aaron Culliney
ed60b2ea73 Refactor VM initialization and shutdown 2015-09-11 23:03:17 -07:00
Aaron Culliney
2c97f7af19 Excise HEADLESS ... it was only being used by testcpu 2015-09-06 17:14:38 -07:00
Aaron Culliney
7d4b63e12d Refactor : move reinitialize() to timing module and make static (mostly) 2015-09-06 14:05:18 -07:00
Aaron Culliney
a0cadc83c6 Refactor timing locking behavior 
- Do not start CPU thread until after splash screen
    - Insure that only CPU thread can actually create/destroy the audio interfaces
 2015-07-26 13:48:24 -07:00
Aaron Culliney
2bc846d1fe Revert "Fix non-deterministic ctor load issues and use singleton for video_backend module access" 
This reverts commit af95212a19.

    TODO : make ctor loads deterministic
 2015-04-17 21:40:56 -07:00
Aaron Culliney
af95212a19 Fix non-deterministic ctor load issues and use singleton for video_backend module access 2015-04-16 21:53:12 -07:00
Aaron Culliney
4d3b1189d4 Add new sources to Mac project 2015-04-16 21:52:41 -07:00
Aaron Culliney
805357e5ad Mac target builds again after Android upheaval 2015-04-10 16:05:36 -07:00
Aaron Culliney
d657ab8c46 Unstick Mac builds and tests 2015-03-10 10:22:47 -07:00
Aaron Culliney
274978bc7d whitespace changes 2015-03-05 21:28:55 -08:00
Aaron Culliney
21f2665da5 Bump Mac version number 2015-02-06 20:23:26 -08:00
Aaron Culliney
978011cffa Unstick Mac builds 2015-02-01 15:27:18 -08:00
Aaron Culliney
191a1b7395 Fix Mac builds 2015-01-16 21:11:29 -08:00
Aaron Culliney
ee3fde8c73 Get disk tests working on Mac 2014-12-29 19:08:09 -08:00
Aaron Culliney
f2ece67eac smaller template file 2014-12-11 16:37:36 -08:00
Aaron Culliney
1c982adb04 New keyboard help topics and updates 2014-12-11 11:20:58 -08:00
Aaron Culliney
3b07bfffed Disk image template file for distributing Apple2Mac 
- bunzip2 -c > Apple2Mac.dmg && mount it...
    - remove the placeholder Apple2Mac.app file, replace with real Apple2Mac.app
    - ship it!
 2014-12-09 21:58:41 -08:00
Aaron Culliney
720b68e23f Don't allow joy_step values < 1 2014-12-07 14:24:09 -08:00
Aaron Culliney
ac1931d2ba Clean up some unused outlets 2014-12-07 13:40:36 -08:00
Aaron Culliney
3a7eec8603 Updated Apple2Mac help documentation 2014-12-07 13:39:54 -08:00
Aaron Culliney
91b1cc58f9 Default to bundled images path 2014-12-06 17:19:47 -08:00
Aaron Culliney
d52075d5c1 Include DDHidLib framework in Apple2Mac.app 2014-12-06 16:53:35 -08:00
Aaron Culliney
81dc987869 Clean up packaging 2014-12-06 16:30:35 -08:00
Aaron Culliney
a24436e88f Gamepad clamp-beyond-radius implemented 2014-12-05 22:31:12 -08:00
Aaron Culliney
e61ff8e660 Adds a joystick calibration routine to preferences window 
- TODO : use common code paths for key handling
 2014-12-01 22:48:10 -08:00
Aaron Culliney
5c6c66f243 Joystick controller fixes 
- only poll for joystick connectivity once per second
    - if keypad joystick enabled, pump the handler
 2014-12-01 22:39:46 -08:00
Aaron Culliney
575bb2448b Pause emulation if prefs or disks window becomes key 2014-12-01 22:16:05 -08:00
Aaron Culliney
a6935b18c8 EmulatorGLView posts an NSNotification rather than calls API method(s) 
- Joystick connectivity polling is a consumer
 2014-12-01 21:58:18 -08:00
Aaron Culliney
c1bf118fa2 Startup disks should be gzipped 2014-11-29 13:36:56 -08:00
Aaron Culliney
9c320c4de6 Joystick fixes for Mac 
- Prevent spurious NSExceptions from harshing our mellow
    - Allow joystick hot-plugging by polling connectivity during link/timer callback
 2014-11-29 13:33:57 -08:00
Aaron Culliney
b6e329a3c6 Prevent segfault in glGetError() during app initialization 2014-11-29 13:31:21 -08:00
Aaron Culliney
6c1215dbb2 Tests build/run on Mac 
- Fixes statistics printing
    - Some VM tests currently fail on Mac
 2014-11-27 10:52:12 -08:00
Aaron Culliney
95680c6a15 Handle joysticks/gamepads on Mac 2014-11-09 19:59:47 -08:00
Aaron Culliney
78cd319107 Merge commit '7d64531b89057a2beed03af65b8ed6d1e5a1ddce' as 'Apple2Mac/DDHidLib' 2014-11-09 17:08:23 -08:00
Aaron Culliney
06a4bd3961 First cut at Mac help docs 2014-11-02 10:24:21 -10:00
Aaron Culliney
94822df9a7 Misc tweaks for Mac version 
* Accessing disks and prefs windows forces app into "almost-fullscreen"
    * Added emulator icons
    * Mac version is 0.9
    * About text updated
 2014-10-26 13:55:29 -07:00
Aaron Culliney
3297f671b3 Robustify disk interface 
* Don't keep extra non-GUI state
    * Better ability to (un)select startup disks
    * Don't error when selecting inflated disk already in drive
    * Adds an OK button to dismiss disks window
 2014-10-25 16:26:49 -07:00
Aaron Culliney
ec0af686b2 Mac can toggle emulation pause state 2014-10-25 13:51:32 -07:00
Aaron Culliney
cfc779a86f A Mac preferences window and settings 2014-10-19 12:56:30 -07:00
Aaron Culliney
21660fdcb9 Misc tweaks 
* intercept application terminate and eject disks
    * closing last window terminates app
    * send scancodes for control keys
 2014-10-18 12:50:46 -07:00
Aaron Culliney
2f884cf129 Refactor disk interface into separate controller class 2014-10-18 12:02:02 -07:00
Aaron Culliney
a632166767 Adds EmulatorWindow to pass keycodes when not fullscreen 
* Also bumps XIB to Xcode 6
 2014-10-14 19:06:04 -07:00
Aaron Culliney
abf5944064 Handle more keys 2014-10-13 19:45:17 -07:00
Aaron Culliney
a42a10eb86 Beginnings of key handling for Apple2Mac 2014-10-12 17:09:54 -07:00
Aaron Culliney
6c63c49d09 Improvements to Mac GUI 
* Reboot... menu option
    * Disk image selection interface
    * Whitespace code changes
 2014-10-12 16:43:51 -07:00
Aaron Culliney
442e4c99b2 Display tests on Mac and Mac tests cleanup 2014-10-12 12:42:29 -07:00
Aaron Culliney
e941d5b10f First cut at getting audio working on Mac 2014-10-12 12:14:13 -07:00
Aaron Culliney
a37ed6cd98 tests run again on Mac 2014-10-11 19:34:12 -07:00
Aaron Culliney
d6b8057c57 Beginning of VM Tests on Mac 2014-10-10 20:05:46 -07:00
Aaron Culliney
6eaf4e1871 Get CPU test running on Mac 2014-10-10 19:14:46 -07:00