Commit Graph

10311 Commits

Author SHA1 Message Date
Quentin Guidée
2f0fdc1a26 [1.18.3] Fixed a keyboard issue O1.18.3-E12 2019-12-30 22:03:01 +01:00
Quentin Guidée
79de4f48bb Merge branch 'omega-hotfix' into omega-master 2019-12-30 22:02:22 +01:00
Quentin Guidée
596ad276a3 Fix keyboard issue with shift + 2019-12-30 22:02:01 +01:00
Quentin Guidée
b9b4ca7a89 Merge branch 'omega-hotfix' into omega-master O1.18.2-E12 2019-12-30 21:23:47 +01:00
Quentin
ecf2933025 Merge pull request #117 from M4xi1m3/omega-hotfix
[simulator] changed apps id, changed icon, removed telemetry
2019-12-30 21:22:50 +01:00
M4x1m3
ba15b793cd [simulator] changed apps id 2019-12-29 20:35:37 +01:00
Quentin Guidée
114c97c1f9 [1.18.2] Fixed a bug where all contributors where not shown 2019-12-29 17:17:04 +01:00
Quentin Guidée
0d0f4c9313 Merge branch 'omega-hotfix' into omega-master 2019-12-29 17:16:10 +01:00
Quentin Guidée
05da125732 Merge branch 'M4xi1m3-omega-hotfix' into omega-hotfix 2019-12-29 17:15:44 +01:00
M4x1m3
ffe78c22cd [settings/about] Not all contributors were shown. 2019-12-29 16:33:08 +01:00
Quentin Guidée
ffac1b68fb [1.18.1] Disabled External in NoSym exam mode O1.18.1-E12 2019-12-29 11:54:56 +01:00
Quentin Guidée
f6d2ef441e [1.18.1] Disabled External in NoSym exam mode 2019-12-29 11:53:45 +01:00
Quentin Guidée
863a278d6c Fix binpacks O1.18.0-E12 2019-12-29 11:35:56 +01:00
Quentin Guidée
3d63ce043a Fix binpacks 2019-12-29 11:30:41 +01:00
Quentin Guidée
ef57ca81a3 Submodule updates 2019-12-28 14:48:16 +01:00
Quentin Guidée
fd02d153db O1.18 Merge 2019-12-28 14:45:48 +01:00
Quentin Guidée
be95067207 Fix for #113 2019-12-28 14:39:40 +01:00
Quentin
a0d38ecdea Merge pull request #113 from RedGl0w/MakeRun
Added `make PLATFORM=simulator run`
2019-12-28 14:36:34 +01:00
Quentin Guidée
b504892998 Theme submodule updated 2019-12-28 00:51:18 +01:00
Quentin Guidée
4f8453eb1a Merge branch 'M4xi1m3-fix-layout' into omega-dev 2019-12-27 23:52:36 +01:00
Quentin Guidée
c5ba1d8f6b Merge branch 'fix-layout' of https://github.com/M4xi1m3/Omega into M4xi1m3-fix-layout 2019-12-27 23:44:06 +01:00
Quentin
718d4e14f4 Merge pull request #114 from M4xi1m3/make-doc
[build] Added target doc, using doxygen.
2019-12-27 23:41:58 +01:00
Quentin Guidée
f630cc6274 Merge branch 'M4xi1m3-issue-109' into omega-dev 2019-12-27 23:40:22 +01:00
Quentin Guidée
083862dc2a Fix conflicts 2019-12-27 23:36:07 +01:00
Quentin Guidée
9e05f855f2 Merge branch 'M4xi1m3-mp-fix' into omega-dev 2019-12-27 23:33:19 +01:00
Quentin Guidée
4da34b7d81 Fix conflicts 2019-12-27 23:30:25 +01:00
Quentin Guidée
d837111da5 Merge branch 'M4xi1m3-issue-89' into omega-dev 2019-12-27 23:24:00 +01:00
Quentin Guidée
c87c5b63e3 Fix conflicts 2019-12-27 23:22:23 +01:00
Quentin Guidée
8866b1c9e9 Merge branch 'M4xi1m3-issue-106' into omega-dev 2019-12-27 23:19:37 +01:00
M4x1m3
0d183cedf2 [build] Added target doc, using doxygen. 2019-12-27 21:32:15 +01:00
M4x1m3
b8ae0f625d [settings/math] Changed from "Multiply symbol" to "Multiply", fixed #109. 2019-12-27 20:54:50 +01:00
M4x1m3
76a6678a29 [settings/about] MicroPython -> µPython, fixes offset of the version. 2019-12-27 20:36:59 +01:00
M4x1m3
3a4ffa9fb9 [settings/about] MicroPython version from mpconfig.h 2019-12-27 20:31:41 +01:00
M4x1m3
e1d907f7c2 [ion/keyboard] Fixed layout. Added shift + ( 2019-12-27 20:17:38 +01:00
M4x1m3
765e648d2b Added missing names, added usernames, closes #89 2019-12-27 19:44:48 +01:00
redgl0w
c91227bc2e Update Makefile 2019-12-27 19:33:06 +01:00
M4x1m3
9a9ae068ef Reworked exam mode, fixed #106 2019-12-27 16:48:45 +01:00
Quentin Guidée
b7fe5b51c8 Fixed alpha + % 2019-12-25 19:24:33 +01:00
Quentin Guidée
160adf6bab Fix compilation errors on n0110 2019-12-25 14:40:57 +01:00
Quentin Guidée
57f2b41c3f Fix: OMEGA not displayed on the home screen 2019-12-25 14:37:08 +01:00
Quentin Guidée
7e6ceaa8ac Merge branch 'RedGl0w-AlphaLock' into omega-dev 2019-12-24 17:36:50 +01:00
Quentin Guidée
85c98cefe5 Fix conflicts 2019-12-24 17:33:32 +01:00
Quentin Guidée
be8085eaf8 Updated submodules 2019-12-24 17:23:55 +01:00
Quentin Guidée
d030e5959e Merge branch 'pr/104' into omega-dev 2019-12-24 17:00:06 +01:00
Quentin Guidée
0ffe82fd17 Update themes 2019-12-24 16:56:55 +01:00
Quentin
b392e80bfc Merge pull request #103 from zardam/omega-dev-dutch
Disable "External" in Dutch exam mode
2019-12-24 16:28:06 +01:00
M4x1m3
dd16c9336c Merge branch 'omega-dev' of https://github.com/Omega-Numworks/Omega into omega-dev 2019-12-24 13:47:21 +01:00
Damien Nicolet
26dcc7c546 Disable "External" in Dutch exam mode 2019-12-24 13:28:13 +01:00
Quentin Guidée
eff2ba92a4 Ignore MacOS files 2019-12-24 10:57:56 +01:00
redgl0w
9a813b8dfb Update events.h 2019-12-24 09:23:28 +01:00