Commit graph

351 commits

Author SHA1 Message Date
Sam Ellicott 4b405029ae Merge branch 'master' of github.com:CaiB/colorchord 2020-05-21 23:13:24 -04:00
Sam Ellicott 5a6e342a23 Fix Linux build issues 2020-05-21 23:13:20 -04:00
Sam Ellicott 2cc03c3123
Merge pull request #7 from cnlohr/master
Merge in changes again
2020-05-21 23:10:50 -04:00
cnlohr 4626c40991 Bump submodule 2020-05-21 19:52:47 -07:00
cnlohr 052d1b32d0 Merge branch 'master' of https://github.com/cnlohr/colorchord 2020-05-21 19:52:26 -07:00
cnlohr aa4e95681c Update swapped order of ops in CNFA. 2020-05-21 19:52:10 -07:00
Sam Ellicott 26b6173853
Merge pull request #6 from cnlohr/master
Merge in changes from upstream
2020-05-21 22:40:55 -04:00
CNLohr 46156fe9e0
Update compile.bat 2020-05-21 02:38:22 -07:00
CNLohr 303d164e43 Update default.conf
Fix default dev recording and explain
2020-05-21 06:20:06 -07:00
CNLohr 99aefdef87 Bump ColorChord on Windows 2020-05-21 06:13:26 -07:00
cnlohr 0d1401cfa6 Some cleanup from merge. 2020-05-20 22:38:19 -07:00
CNLohr a4dd3dc4e1
Merge pull request #105 from CaiB/master
Add official WASAPI support to colorchord
2020-05-20 22:07:09 -07:00
Sam Ellicott 69dcc03f39 Slightly change default config 2020-05-21 00:03:53 -04:00
Sam Ellicott 4eb0eb8d4a Misc fixes:
-Make the submodule match upstream.
-Update Windows makefile to work.
2020-05-20 23:59:59 -04:00
Sam Ellicott 98623aa299 Fix CNFA initilization call. 2020-05-20 22:40:53 -04:00
Sam Ellicott 3274984ebf bump submodule version 2020-05-20 22:39:50 -04:00
Sam Ellicott d8578fe6d9 Fix TCC being dumb 2020-05-20 20:34:37 -04:00
Sam Ellicott c8eff4975b
Merge pull request #5 from NikkyAI/feature/android-network
add DisplayNetwork support to android
2020-05-20 18:55:58 -04:00
nikky 556338cfcb add DisplayNetwork support to android 2020-05-20 21:34:57 +02:00
CaiB bf95be1226 Clarifying config comments 2020-05-20 14:42:39 +09:00
CaiB d291fc224a Merging part 2 2020-05-20 14:40:52 +09:00
CaiB 003a1f4f8a Marging 2020-05-20 14:38:56 +09:00
Sam Ellicott 33f33ed9fd Oops, that could have been embareassing. 2020-05-20 00:10:59 -04:00
Sam Ellicott 779651da4b Remove VS-Code files 2020-05-20 00:04:14 -04:00
Sam Ellicott 4cc141bff1 Add more comments to the default configuration 2020-05-20 00:01:30 -04:00
Sam Ellicott bb0c7a0dc8 Add in NULL for the opaque object for CNFA. 2020-05-19 23:59:04 -04:00
Sam Ellicott 776a5dc5f5 bump submodule version 2020-05-19 23:55:16 -04:00
Sam Ellicott a2359e1f02 Modify build scripts 2020-05-19 23:39:10 -04:00
Sam Ellicott 2b0bb5a78d Redefine strdup to make Windows happy 2020-05-19 23:19:58 -04:00
CaiB cbc15a30c0 Ignoring clang output 2020-05-19 20:45:55 +09:00
CaiB 64c6c508b0 Updating CNFA and removing excessive console output on compile. 2020-05-19 20:41:20 +09:00
CaiB 80944b289f Update Windows build info in readme 2020-05-19 17:58:24 +09:00
CaiB 163e53d086 Merge branch 'cnlohr-master' 2020-05-19 17:40:10 +09:00
CaiB 64a01179ef Merge branch 'master' of https://github.com/cnlohr/colorchord into cnlohr-master
Fixing merge conflicts
2020-05-19 17:39:29 +09:00
Sam Ellicott 6fdbe1df89 Edit the default configuration 2020-05-18 22:15:19 -04:00
cnlohr 3c2c0d7fc9 Update .gitignore to ignore object files. 2020-05-18 15:47:12 -07:00
cnlohr 8449e772a0 Bump submodule 2020-05-18 15:46:22 -07:00
cnlohr 9d11a76f69 Switch search paths + update CNFA 2020-05-18 15:29:35 -07:00
cnlohr 911f60ae56 Update submodules 2020-05-18 15:25:20 -07:00
cnlohr df06ca12d7 Bump to new CNFA subsystem 2020-05-18 14:05:24 -07:00
Sam Ellicott af7afd6af5 Make vscode settings file 2020-05-17 19:25:17 -04:00
Sam Ellicott d10255bb61 Make clang not use windows headers 2020-05-17 19:24:43 -04:00
Sam Ellicott cddec68e5b Remove debugging printf. 2020-05-17 19:23:35 -04:00
Sam Ellicott 9029c87c96 Make a function to manually register parameters. 2020-05-17 19:22:57 -04:00
Sam Ellicott ffc4ac5d41 Force float constants for TCC 2020-05-17 19:19:21 -04:00
cnlohr 9c85dd87f2 TAG FOR RELEASE 8
Fix name of config file.
2020-05-17 05:41:13 -07:00
cnlohr 4dfeb870b7 Allow ColorChord to run down to Android 5.1 (SDK 22) 2020-05-17 05:11:32 -07:00
cnlohr 13ab20b1fc bump submodule 2020-05-17 03:06:42 -07:00
CaiB 92f765817c Adding new required DLL reference, and updating CNFA 2020-05-17 17:28:16 +09:00
CaiB e1896cf8d9 Updating CNFA 2020-05-17 15:46:51 +09:00