Wouter R
|
d634f2e9c3
|
Merge branch 'text-experiment' into develop
Conflicts:
js/Help.js
js/buttonbehaviors.js
js/main.js
js_src/Keyboard.js
js_src/Shape.js
js_src/verticalShapes.js
www/index.html
|
2014-01-17 13:21:02 +01:00 |
|
Wouter R
|
06ff438119
|
Add keyword to draw calibration diamond.
Remove some unneeded log messages.
|
2014-01-17 00:21:29 +01:00 |
|
Rick Companje
|
0ad800b021
|
removed files
|
2014-01-09 18:10:54 +01:00 |
|
Adriaan Wormgoor
|
4ec660fd74
|
overhaul of client files to 'www' dir. This dir will now as a 'bin' dir of sorts. Outside of the 'www' dir there will be old files, temp files and also shell scripts which support continuous compilation and minification of css and js files
|
2013-10-21 11:40:38 +02:00 |
|
Adriaan Wormgoor
|
88c6845592
|
some js files were postfixed with version numbers (eg. v01, v02, etc), but this is bullshit from source control perspective, hence removed the postfixes
|
2013-10-11 15:06:32 +02:00 |
|