Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-07-11 08:28:57 +00:00
Code Issues Projects Releases Wiki Activity
1,474 Commits 5 Branches 15 Tags 25 MiB
b300e60e2a
Commit Graph

1474 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Culliney
30b203e3da Changes insisted upon by Android Studio 2016-04-24 18:31:32 -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
28cdb24d18 Move an assert to avoid firing on load of Mac app 2016-04-23 12:38:55 -07:00
Aaron Culliney
14108fb97b Fix Mac assembly 2016-04-23 11:52:20 -07:00
Aaron Culliney
ae75ce2798 Avoid calling glGetError() on thread without OpenGL context 2016-04-23 11:51:02 -07:00
Aaron Culliney
98e5c883f9 Project file changes 2016-04-23 10:16:29 -07:00
Aaron Culliney
a77075c881 Set a lower limit to avoid thread starvation 2016-04-22 20:19:40 -07:00
Aaron Culliney
90b52702d6 Refactor __PIC__ codepaths on x86_64 2016-04-21 22:09:04 -07:00
Aaron Culliney
a5a498f96c Tweaks for arch builds 2016-04-21 22:06:42 -07:00
Aaron Culliney
b2acb4a1ed Ensure we don't unnecessarily sync preferences to native 2016-04-18 21:30:01 -07:00
Aaron Culliney
2bf379aad4 Improve Android keypad joystick selection routine 
- Changes Skip button to not set anything
    - Adds a None button to explicitly choose that
    - Will dismiss selection routine instead of looping
 2016-04-18 21:07:34 -07:00
Aaron Culliney
399617e77f Avoid NullPointerException when choosing custom keypad joystick keys 2016-04-18 20:30:29 -07:00
Aaron Culliney
d416edc7d8 Change splash screen preferences button to a reset-preferences button 
- Reset should be the only thing potentially needed from the splash screen (and even then hopefully not).  The main
      preferences menus can be accessed after starting emulation via back button or top right touch menu
 2016-04-17 18:13:26 -07:00
Aaron Culliney
7607126f7c Avoid resetting joystick buttons too soon (to allow for ClosedApple-Reset to trigger) 2016-04-17 12:51:23 -07:00
Aaron Culliney
76f29d0865 Allow emulator shutdown state to be queried as needed 2016-04-17 12:18:48 -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
13184ec4be Change the button gesture recognizer state machine 
- Use a synchronized event queue rather than overwriting "current" button state
    - Use aggressive assertions to ensure state machine is coherent
 2016-04-16 14:16:34 -07:00
Aaron Culliney
9c9ba6e7ef Render the correct activeChar when initially setting touch joystick preferences 2016-04-16 14:15:21 -07:00
Aaron Culliney
dcb35226b7 Lightly refactor max CPU speed checks 
- Better naming of the pivot point (@4.0x CPU)
    - Use floating point values divisible by 2 as the constants
 2016-04-16 14:08:00 -07:00
Aaron Culliney
f53dbea81e Pause CPU on Linux desktop initialization 2016-04-16 13:33:50 -07:00
Aaron Culliney
65882152a8 Insure preferences are propagated regardless of enabled state 2016-04-13 21:23:37 -07:00
Aaron Culliney
04f22686fa Do not hide touchmenu for portrait calibration 2016-04-13 21:22:26 -07:00
Aaron Culliney
fd7578a862 Always show touch joystick azimuth (if we're rendering the joystick axis) 2016-04-13 19:50:03 -07:00
Aaron Culliney
23a874456c Better audio defaults 2016-04-13 19:45:55 -07:00
Aaron Culliney
2a405f028f Streamline and fix test codepaths on Desktop Linux and Android 2016-04-13 19:33:08 -07:00
Aaron Culliney
9c1cfedf7d Fix some envvars on Android 2016-04-12 22:16:01 -07:00
Aaron Culliney
db816ad502 Refactor Android variant to use common shared JSON preferences 
- Eliminates a whole bunch of boilerplate setter/getter code in various places
    - Accesses preferences directly from JSON data through custom json_parse.h API
    - Improves code locality for Java menus/settings
 2016-04-11 22:01:30 -07:00
Aaron Culliney
b59e1ca7ab json_parse module passes new tests 2016-03-29 22:39:59 -07:00
Aaron Culliney
a03c074a52 Moar JSON/prefs tests including new array tests 2016-03-29 22:38:28 -07:00
Aaron Culliney
b065da9f4b Various test suite improvements 
- Possibly breaking changes for mobile ... #willunbreaklater
 2016-03-26 14:56:34 -07:00
Aaron Culliney
74a5b74ae3 Refactor prefs into JSON publish/subscribe API 
- Breaking changes currently only tested on Linux desktop build =P
    - Goal is to eventually eliminate most/many of the disparate getter/setter functions to allow better
      modularity/scaling and platform portability
 2016-03-26 13:44:13 -07:00
Aaron Culliney
87ae0f08e0 Refactor JSMN for better conformance to JSON spec and to pass our more stringent tests 2016-03-25 22:32:53 -07:00
Aaron Culliney
163035b0c7 Add a bunch of new JSON tests 2016-03-25 20:44:03 -07:00
Aaron Culliney
8b74dafc6f Check for and disallow NULL tokens in one location 2016-03-22 22:40:59 -07:00
Aaron Culliney
2da23f717a Simplify and refactor JSMN 
- Always enable strict mode
    - Always calculate parent links and skip counts
 2016-03-22 22:02:30 -07:00
Aaron Culliney
fdfe312a2b Changes needed after jsmn subtree upgrade 2016-03-09 22:21:15 -08:00
Aaron Culliney
10d9cc3c66 Add APPLE2IX defines 2016-03-09 22:20:17 -08:00
Aaron Culliney
c57bf83514 Merge commit 'b6d20bbe3b2a92a6db810a4e3ef6d67e91a38d36' as 'externals/jsmn' 2016-03-09 21:09:57 -08:00
Aaron Culliney
b6d20bbe3b Squashed 'externals/jsmn/' content from commit 3459957 
git-subtree-dir: externals/jsmn
git-subtree-split: 345995799311ed1e26ea20e3eeaa47224cd1a77d
 2016-03-09 21:09:57 -08:00
Aaron Culliney
48c6515790 Remove inline import of JSMN 2016-03-09 21:07:05 -08:00
Aaron Culliney
a87092bbd8 Add JSON mutation functions and tests 2016-03-09 21:06:00 -08:00
Aaron Culliney
01b25527fe Add JSON serialization and tests 
- Encourage use of opaque reference rather than internal struct
 2016-03-04 23:31:15 -08:00
Aaron Culliney
b87273e742 Expand coverage of heap memory checking of debug builds and simplify FREE() calls 2016-02-26 21:26:57 -08:00
Aaron Culliney
0663141589 Misc tweaks 2016-02-25 21:04:23 -08:00
Aaron Culliney
6e978810db First cut at testsuite for json/prefs 2016-02-25 20:56:59 -08:00
Aaron Culliney
b5dfd86310 Changes insited upon by Android Studio 2016-02-23 00:10:41 -08:00
Aaron Culliney
3120b75e00 Enforce module ctor priorities 2016-02-22 22:41:37 -08:00
Aaron Culliney
c5ed0bb5c6 Switch Android toolchain to stable Clang 2016-02-20 13:48:00 -08:00