Adriaan Wormgoor aee5fecb88 Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client into new_layouting_approach ... # By Adriaan Wormgoor (6) and peteruithoven (4) # Via Adriaan Wormgoor (2) and peteruithoven (2) * 'master' of https://github.com/Doodle3D/doodle3d-client: objectHeight and twist fix and temp display fix minor repositioning of temp-guage so that it doesn't overlap with the info-button gcode generated twist now complies with the doodle preview made the 'ok' button have a mouseover 'hand' cursor commented out call to missing setPrintprogress() removed wrong unit in settings Removed unused draw logic additions to Thermometer to allow the general Update function to show() and hide() the Thermometer's container DIV new favicon (for Firefox) a few new favicons and homescreen icons Conflicts: js/Thermometer.js js/gcodeGenerating_v01.js		2013-09-18 17:44:26 +02:00
..
libs	bunch of javascript	2013-07-26 22:39:28 +02:00
buttonbehaviors.js	Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client into new_layouting_approach	2013-09-18 17:44:26 +02:00
canvasDrawing_v01.js	first implementation of different layouting. Doesn't work well yet..	2013-09-18 10:46:36 +02:00
d3dServerInterfacing.js	bunch of javascript	2013-07-26 22:39:28 +02:00
gcodeGenerating_v01.js	Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client into new_layouting_approach	2013-09-18 17:44:26 +02:00
init_layout.js	intermediary progress	2013-09-18 16:02:51 +02:00
main.js	Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client into new_layouting_approach	2013-09-18 17:44:26 +02:00
previewRendering_v01.js	Changes to how we draw to the canvas and how the preview is rendered. This has massive speedup results for tablets and phones.	2013-08-16 22:27:26 +02:00
previewRendering_v02.js	added maximum rotation of preview and resetted height and rotation when a new doodle is made	2013-09-17 13:09:54 +02:00
Printer.js	objectHeight and twist fix and temp display fix	2013-09-18 16:59:48 +02:00
SettingsWindow.js	Setting fixes, enabled enableRetraction setting	2013-09-17 15:15:44 +02:00
Thermometer.js	Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client into new_layouting_approach	2013-09-18 17:44:26 +02:00
utils.js	new utils file for general methods. This first method grabs the query string variables from the URL	2013-08-16 22:23:24 +02:00