summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | om telolet omPriyadi Iman Nurcahyo2017-01-082-1/+10
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #990 from replicaJunction/masterJack Humbert2017-01-0812-22/+536
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Update replicaJunction keymap
| | * | | | | | Removed build.batJoshua T2017-01-071-51/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make.exe is easy enough to use, and there's no real sense in having a wrapper aroung it.
| | * | | | | | Merged from upstreamJoshua T2017-01-07336-3127/+39980
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Updated README and images to reflect latest keymapJoshua T2017-01-077-6/+10
| | | | | | | |
| | * | | | | | Added another Shift on Extend layer.Joshua T2017-01-071-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the GUI key to the pinkie, but honestly, I never use that function anyway.
| | * | | | | | Updated Atreus layout to 0.4Joshua T2017-01-061-26/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed Alt on base layer, replaced with Function layer. Moved function keys to left hand. Added mouse keys to right hand on the function layer. Moved middle click on gaming layer to be consistent with mouse layer. Added macro _USER. Macro contents are not implemented yet.
| | * | | | | | Increased TAPPING_TERM to 200Joshua T2017-01-061-1/+3
| | | | | | | |
| | * | | | | | Fixed key not matching its diagramJoshua T2017-01-061-1/+1
| | | | | | | |
| | * | | | | | Added comments with ASCII art keymapsJoshua T2016-10-241-1/+105
| | | | | | | |
| | * | | | | | Added VS Code dir to .gitignoreJoshua T2016-10-151-0/+1
| | | | | | | |
| | * | | | | | Added a bit more detail to headerJoshua T2016-10-151-24/+27
| | | | | | | |
| | * | | | | | Reversed tilde and graveJoshua T2016-10-151-4/+4
| | | | | | | |
| | * | | | | | Moved Extend tab and ^tabJoshua T2016-10-151-2/+2
| | | | | | | |
| | * | | | | | Added = to match AtreusJoshua T2016-10-151-4/+4
| | | | | | | |
| | * | | | | | Switched Tab and Ctrl backJoshua T2016-10-151-7/+7
| | | | | | | |
| | * | | | | | Fixed typoJoshua T2016-10-151-1/+1
| | | | | | | |
| | * | | | | | Added Menu key (the rclick menu)Joshua T2016-10-151-4/+4
| | | | | | | |
| | * | | | | | Updated layout to 1.2 - lots of changesJoshua T2016-10-151-112/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrote QWERTY to make it a first-class citizen instead of just a glorified game layer. Added a lot of keys to Extend layer to bring it in line with my Atreus. Plenty of other changes too.
| | * | | | | | Reduced TAPPING_TERM to 150Joshua T2016-10-151-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed duplicate definition of PREVENT_STUCK_MODIFIERS
| | * | | | | | Added Ctrl+` (ConEmu shortcut)Joshua T2016-10-151-1/+1
| | | | | | | |
| | * | | | | | Merge remote-tracking branch 'upstream/master'Joshua T2016-10-15192-2351/+10300
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Joshua T2016-09-01237-10442/+14521
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fixed getting "stuck" in gaming layerJoshua T2016-08-241-1/+1
| | | | | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'upstream/master'Joshua T2016-08-24219-3936/+16346
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Several key placement fixes.Joshua T2016-08-248-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Switched Tab and Super on the default layout * Moved Shift on Extend to pinky * Moved Caps Lock to upper right corner * Moved gaming toggle to avoid blocking Escape
| | * | | | | | | | | Minor changes to Extend and Number layers.Joshua T2016-08-163-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Brought QWERTY layer in line with normal layer. Removed Undo function, as it interfered with Shift. Moved Tab and Shift-Tab, and added Insert.
| | * | | | | | | | | Moved Shift keys to Z and ?Joshua T2016-08-091-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using a thumb shift, I was given the idea of using the pinky keys as dual-role keys that also send the Shift keypress. This gives me a Shift key on each hand again, but it will make me learn to Shift with opposite hands after all.
| | * | | | | | | | | Created build.batJoshua T2016-08-091-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Helper batch file for building the keyboard.
| | * | | | | | | | | Merged branch master into masterJoshua T2016-08-0928-168/+1575
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Changed left thumb back to Ctrl/AltJoshua T2016-08-091-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed Shift from left thumb
| | * | | | | | | | | | Created keymap-specific config.hJoshua T2016-08-091-0/+63
| | | | | | | | | | | |
| | * | | | | | | | | | Reverted Ergodox config.hJoshua T2016-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I will create a separate config.h for my keymap
| | * | | | | | | | | | Created keymap local config.h fileJoshua T2016-08-092-4/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverted the Atreus config.h to default and added one specific to this keymap.
| | * | | | | | | | | | Merge remote-tracking branch 'upstream/master'Joshua T2016-08-0735-612/+2743
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Moved PREVENT_STUCK_MODIFIERS to config.hJoshua T2016-07-302-3/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | Moved my Ergodox keymap to match upstream changesJoshua T2016-07-302-8/+10
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Joshua T2016-07-30245-1742/+3096
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Joshua T2016-07-2697-431/+6775
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Modified Atreus extend and Ergodox.Joshua T2016-07-265-179/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Atreus: Removed home row Shift. It's under the thumb anyway. Also replaced dual modifier keys with macro keys (cut, copy, paste, undo). Ergodox: Made Colemak the default layer instead of Dvorak. Also began the process of bringing it in line with the Atreus layout I've been working on.
| | * | | | | | | | | | | | | Created readme and added screenshotsJoshua T2016-07-206-15/+74
| | | | | | | | | | | | | | |