ce8e306994
Preventing OS X / iOS captive portal popup altogether
2013-09-25 19:01:08 +02:00
80b4a53d5a
Raw captive portal detected popup
2013-09-25 16:19:40 +02:00
1842ec01b2
Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client
...
# By peteruithoven
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client :
Slightly longer allowed temp mod time
2013-09-18 22:35:59 +02:00
267587fe2f
vertical shapes implemented
2013-09-18 22:35:38 +02:00
ecae281a74
new vertical shape icons
2013-09-18 21:22:58 +02:00
6c7018a00d
Slightly longer allowed temp mod time
2013-09-18 20:59:35 +02:00
44f3895d34
small change to make settings page appear directly over the d3d interface
2013-09-18 20:43:00 +02:00
6cf58db7a3
reduced maximem rotation slightly, to reduce risk of overlapping
2013-09-18 20:42:32 +02:00
fdfaafd99d
simple code changes. Border around D3D interface makes slightly more sense.
2013-09-18 20:17:25 +02:00
3d318bb56e
gcode changes submitted by Rick, w.r.t. centering the doodle for Ultimakers (means: doodle is only in positive space, i.e. there are no negative coordinates)
2013-09-18 20:15:58 +02:00
979403826a
another hack to show targetTemp
2013-09-18 19:20:44 +02:00
6e32a36e12
a lot of changes -> almost there but the drawing is not consistent yet across devices.
...
Drawing on the draw canvas is going OK but the preview is not drawing well now.
Giving up for now.
2013-09-18 19:08:58 +02:00
a692976be6
Only preheat the first time the settings where saved
2013-09-18 18:56:57 +02:00
6c7b832a30
update timing hacks
2013-09-18 18:56:57 +02:00
c51107a275
changes (sry)
2013-09-18 17:45:02 +02:00
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
d610e802f5
Merge branches 'master' and 'master' of https://github.com/Doodle3D/doodle3d-client
...
# By peteruithoven
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client :
objectHeight and twist fix and temp display fix
# By peteruithoven
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client :
objectHeight and twist fix and temp display fix
2013-09-18 17:16:23 +02:00
ac5f129e47
Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client
...
Conflicts:
js/gcodeGenerating_v01.js
2013-09-18 17:01:45 +02:00
0b49256fd5
objectHeight and twist fix and temp display fix
2013-09-18 16:59:48 +02:00
5a45d1f3b5
minor repositioning of temp-guage so that it doesn't overlap with the info-button
2013-09-18 16:19:06 +02:00
8a88c173e5
Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client
...
# By peteruithoven
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client :
commented out call to missing setPrintprogress()
removed wrong unit in settings
Removed unused draw logic
2013-09-18 16:10:47 +02:00
001428f349
gcode generated twist now complies with the doodle preview
2013-09-18 16:10:22 +02:00
066eb182f0
intermediary progress
2013-09-18 16:02:51 +02:00
f6fd05113a
made the 'ok' button have a mouseover 'hand' cursor
2013-09-18 12:06:47 +02:00
bd83fc42f8
commented out part of the css (not final solution)
2013-09-18 12:04:53 +02:00
d7c32c926f
added todo for future
2013-09-18 12:04:06 +02:00
51aabf56c1
tiny, tiny indent change
2013-09-18 11:39:34 +02:00
fa0a610a8c
commented out call to missing setPrintprogress()
2013-09-18 11:34:36 +02:00
4788321a62
removed wrong unit in settings
2013-09-18 11:28:21 +02:00
287518c6cf
Removed unused draw logic
2013-09-18 11:28:21 +02:00
82165c585b
additions to Thermometer to allow the general Update function to show() and hide() the Thermometer's container DIV
2013-09-18 10:57:46 +02:00
77b6ed3357
new favicon (for Firefox)
2013-09-18 10:52:40 +02:00
847243922a
a few new favicons and homescreen icons
2013-09-18 10:52:18 +02:00
6eddb1835c
first implementation of different layouting. Doesn't work well yet..
2013-09-18 10:46:36 +02:00
5d29d099ab
Setting fixes, enabled enableRetraction setting
2013-09-17 15:15:44 +02:00
198da6566d
doodle3d facivon
2013-09-17 13:13:23 +02:00
ee7d3357d4
small update: method name change to better reflect what it does
2013-09-17 13:12:51 +02:00
7333f0d83a
updated logo for on handhelds
2013-09-17 13:12:32 +02:00
0a40895509
Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client
...
# By peteruithoven
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client :
Always dump gcode in textarea
2013-09-17 13:10:38 +02:00
84ee0c259a
updated Thermometer code (should be final for now)
2013-09-17 13:10:27 +02:00
ebf84cad42
added maximum rotation of preview and resetted height and rotation when a new doodle is made
2013-09-17 13:09:54 +02:00
95bedd09f1
Thermometer class plus the changes necessary to implement it
2013-09-17 13:08:52 +02:00
a57a36f420
Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client
...
Conflicts:
js/buttonbehaviors.js
2013-09-13 16:06:27 +02:00
b830205a73
Always dump gcode in textarea
2013-09-13 16:03:04 +02:00
3a11106535
code for new printprogressmeter and new thermometer
2013-09-07 17:08:52 +02:00
bd6417f71a
minor changes -> slightly more abstracted
2013-09-07 16:09:09 +02:00
df8c202ad8
Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client
...
# By peteruithoven
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client :
Network ui tweaks
2013-09-07 16:07:18 +02:00
edf24d45d2
- additional items added to the settings array (which is set from wifibox)
...
- gcode generation takes more settings from that settings array (making gcode generation more configurable by the user)
2013-09-07 16:06:59 +02:00
7bd05d4f1f
Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client
...
# By peteruithoven
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client :
Network ui
2013-09-06 11:03:50 +02:00
a0b5c92b2f
Network ui tweaks
2013-09-04 19:24:52 +02:00
