vmario/doodle3d-client
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-12-22 21:23:48 +01:00
Code Issues Releases Wiki Activity
370 Commits 8 Branches 37 Tags 2.6 MiB
7f5079d2cb
Commit Graph

164 Commits

Author SHA1 Message Date
peteruithoven
7f5079d2cb Removed debug status message 2014-01-18 15:41:09 +01:00
Wouter R
92a28f54b8 Merge branch 'develop' of github.com:Doodle3D/doodle3d-client into develop 2014-01-17 18:04:40 +01:00
Wouter R
de757cae0a Disable log messages in shape transform functions. 2014-01-17 18:03:42 +01:00
Wouter R
7288ac8b1e Change settings window to use popup handlers as well. 2014-01-17 17:59:26 +01:00
peteruithoven
679cf9b5a5 Check if there is preview slice image when doing redraw 2014-01-17 16:29:42 +01:00
peteruithoven
6dafeafa37 less logs 2014-01-17 16:29:42 +01:00
peteruithoven
577bc28bc9 Update preview bounds when move/zoom or rotate 2014-01-17 16:29:42 +01:00
Wouter R
74b9149175 Formatting of SettingsWindow.js. 2014-01-17 16:28:29 +01:00
Wouter R
5eb129d2a2 New event structure in Popup, shape and wordart popups now behave correctly. 
Add copyright notice for wordart font.
 2014-01-17 15:10:39 +01:00
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
032d6413f7 Merge branch 'text-experiment' of github.com:Doodle3D/doodle3d-client into text-experiment 2014-01-17 13:00:08 +01:00
peteruithoven
8b229c0aff More consistent button behaviour 2014-01-17 12:51:27 +01:00
Wouter R
b25044d2d6 Bounds checking on all sketch transforms (WIP, there's still an issue with scaling up). 2014-01-17 12:37:54 +01:00
peteruithoven
88b711d1f3 Small tour code cleanup 2014-01-17 12:04:01 +01:00
Wouter R
1098c86dd5 Bounds checking in shape move/zoom (WIP). 
More specific unbinding of popup key handlers.
 2014-01-17 00:57:22 +01:00
Wouter R
06ff438119 Add keyword to draw calibration diamond. 
Remove some unneeded log messages.
 2014-01-17 00:21:29 +01:00
Wouter R
57c928f195 Add esc/enter support to cancel or accept popups. 2014-01-16 23:28:58 +01:00
peteruithoven
bbed35d877 Generalized Popups 2014-01-16 21:30:57 +01:00
peteruithoven
e9a2b90483 New Twist and Height buttons 2014-01-16 16:07:40 +01:00
peteruithoven
942d9d8bbf Enable enter key usage for tour again 2014-01-16 12:48:57 +01:00
peteruithoven
7d726f513e Turned logo into btn 2014-01-16 12:16:09 +01:00
peteruithoven
fc8c83ae19 Turning popupMask in a Button 2014-01-16 12:05:27 +01:00
peteruithoven
a952a1ee7b Disabling all click events after a touchStart 2014-01-16 12:05:27 +01:00
Wouter R
c697806385 Silliness. 2014-01-15 20:16:46 +01:00
Wouter R
e8c9932014 Prevent magnifying glass from appearing on iPad. 
Cancel wordart on click/tap outside dialog popup.
 2014-01-15 18:08:26 +01:00
Wouter R
97201587c0 Fix move/zoom/rotate buttons on android (both chrome and native browser). 
Remove reference to undefined variable; remove unneeded log message.
 2014-01-15 17:30:11 +01:00
Wouter R
e125939db8 Fix direction of rotate buttons. 
Ignore key presses with modifiers in order to not obstruct regular shortcuts.
 2014-01-15 14:20:49 +01:00
peteruithoven
606f7cb359 Implemented Copse as new WordArt font 2014-01-15 13:49:38 +01:00
peteruithoven
d68b9cbefc Edit menu 2014-01-13 18:04:51 +01:00
peteruithoven
01f28a2403 Edit button group 2014-01-13 16:38:26 +01:00
peteruithoven
ab329aaaf1 VerticalShapes toggle button 2014-01-13 15:52:40 +01:00
peteruithoven
d156dc9902 Added mouse position info link in comments 2014-01-10 17:23:58 +01:00
peteruithoven
b2fd2a2f77 Cross platform & cross browser relative mouse position retrieval 2014-01-10 17:22:02 +01:00
peteruithoven
82b57def39 Cleanup 2014-01-10 17:21:43 +01:00
peteruithoven
f7fec0aec6 FadeIn popups and button groups 2014-01-10 14:04:36 +01:00
peteruithoven
139e4ca6ae Cleanup 2014-01-10 14:04:17 +01:00
peteruithoven
a4ad7d7198 Cleanup 2014-01-10 13:59:55 +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
66271c5287 Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver 
# By peteruithoven
# Via peteruithoven
* 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client:
  Small css tweak
  Messages! Showing info about buffering, connection to wifibox and printer
  Leave warning while sending
  Added heatup in startgcode and replace {printingTemp} and {preheatTemp} for settings
  Added network reconnect hint
  Integrated progressbar
  Save settings before connect to network / create access point and display validation errors and only close settings when settings are saved

Conflicts:
	css/styles.min.css
	js/main.js
 2013-10-21 10:39:21 +02:00
Adriaan Wormgoor
524643e28a clearfix fix for progressguage and thermometer layouting 2013-10-21 10:28:04 +02:00
peteruithoven
10724b1746 Messages! Showing info about buffering, connection to wifibox and printer 2013-10-18 19:11:10 +02:00
peteruithoven
46d2ae4bfc Leave warning while sending 2013-10-18 16:38:20 +02:00
peteruithoven
5ceabf41ba Added heatup in startgcode and replace {printingTemp} and {preheatTemp} for settings 2013-10-18 15:55:11 +02:00
peteruithoven
10ca22d7e9 Added network reconnect hint 2013-10-18 13:23:50 +02:00
peteruithoven
b978b5ada5 Integrated progressbar 2013-10-17 14:40:33 +02:00
peteruithoven
53e8ccc294 Save settings before connect to network / create access point and display validation errors and only close settings when settings are saved 2013-10-17 14:09:13 +02:00
Adriaan Wormgoor
b2191217cb better margins for thermo and progress 2013-10-16 23:32:50 +02:00
Adriaan Wormgoor
b89f2385b8 removed debug-method (thermo and progress (dis)appearing) 2013-10-16 23:20:13 +02:00
Adriaan Wormgoor
5c9c8c8e8c Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver 
# By peteruithoven
# Via peteruithoven
* 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client:
  Check gcode generation feasibility check to prevent iPad/iPhone crashes
  Removing confirm
  stop status checks on override and start them again when there is a first response
  reset the status check when printer state is overruled
 2013-10-16 23:11:13 +02:00