summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-05-06Merge branch 'master' of https://github.com/AndrewMurrell/minakAndrewMurrell
2014-05-06Added back those files Luke deleted and added circle display (positions may ↵AndrewMurrell
need to be fiddled with)
2014-05-06Revert "Andrew wants this"AndrewMurrell
This reverts commit ad4b6b21bb90cb774d95e2040642c5c444c11810. Conflicts: src/us/minak/IMEView.java
2014-05-06Revert "move 1251.odp into /doc/"AndrewMurrell
This reverts commit 43571cef6ca00ab5a9b6164c8310fe76044277b6.
2014-05-06Merge branch 'master' of https://github.com/AndrewMurrell/minakDavisLWebb
2014-05-06changed a variable to minak syntaxDavisLWebb
2014-05-06Merge branch 'master' of github.com:AndrewMurrell/minakLuke Shumaker
Conflicts: src/us/minak/IMEView.java
2014-05-06Andrew wants thisLuke Shumaker
2014-05-06move 1251.odp into /doc/Luke Shumaker
2014-05-06backspace arrow addedDavisLWebb
2014-05-06Added containsPoint method to MetaCircle.javaAndrewMurrell
2014-05-06piece 3AndrewMurrell
2014-05-06piece 2AndrewMurrell
2014-05-06Piece 1AndrewMurrell
2014-05-06Commented more stuff.AndrewMurrell
2014-05-06Merge branch 'master' of https://github.com/AndrewMurrell/minakAndrewMurrell
2014-05-06Hopefully this fixes it.AndrewMurrell
2014-05-06Initial Project Submission slides.nfoy
2014-05-06Basic Cirle Implementation Update of Doom.AndrewMurrell
2014-05-06Added touchListener and locationsAndrewMurrell
2014-05-06Added the proper gestures file.DavisLWebb
2014-05-06Use a generic StringReciever interface instead of On*Listener garbageLuke Shumaker
2014-05-06Add text labels to the buttons in the IMELuke Shumaker
2014-05-06Remove the insert symbol viewLuke Shumaker
2014-05-05Transplant in the code from Penboard, just to have something working.Luke Shumaker
The diff of this commit will likely be helpful.
2014-05-05un-uglify the minak stringsLuke Shumaker
2014-05-05remove dead stringsLuke Shumaker
2014-05-05Whitespace and formattingLuke Shumaker
2014-05-05Clean up iconsLuke Shumaker
2014-05-05clean up gestures locationsLuke Shumaker
2014-05-05Merge branch 'master' of github.com:AndrewMurrell/minakLuke Shumaker
Conflicts: src/us/minak/IMEService.java src/us/minak/IMEView.java
2014-05-05Perhaps our problem is that the Symbol Activity didn't do what we thought it ↵AndrewMurrell
did or had some other side effects. I added a file to experiment with that and added minor changes elsewhere.
2014-05-05made my stuff actually compileAndrewMurrell
2014-05-05Added basic outlines for MetaCircle and MetaExpression which aren't useful yet.AndrewMurrell
2014-05-05stuffLuke Shumaker
2014-05-05Load the default gesturesLuke Shumaker
2014-05-05fix the saved dialogLuke Shumaker
2014-05-05whitespaceLuke Shumaker
2014-05-05make errors go awayLuke Shumaker
2014-05-04grrLuke Shumaker
2014-05-04Merge branch 'lukeshu'Luke Shumaker
Conflicts: src/us/minak/OnGestureRecognizedListener.java
2014-05-04ignore files that should be ignoredlukeshuLuke Shumaker
2014-05-04Merge remote-tracking branch 'origin/davis' into lukeshuLuke Shumaker
2014-05-04did shitDavisLWebb
2014-05-04Touched up Icons for easy switching.nfoy
2014-05-04asdjfaDavisLWebb
2014-05-04Icons are herenfoy
2014-05-04Merge branch 'lukeshu' of https://github.com/AndrewMurrell/minak into lukeshuAndrewMurrell
2014-05-04added the svg for minakAndrewMurrell
2014-05-04MY BRANCHDavisLWebb