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
032d6413f7
Merge branch 'text-experiment' of github.com:Doodle3D/doodle3d-client into text-experiment
2014-01-17 13:00:08 +01:00
62f2bc824b
Removed some z-indexes
2014-01-17 12:51:54 +01:00
8b229c0aff
More consistent button behaviour
2014-01-17 12:51:27 +01:00
b25044d2d6
Bounds checking on all sketch transforms (WIP, there's still an issue with scaling up).
2014-01-17 12:37:54 +01:00
bc4426faba
Added edit button group to tour
2014-01-17 12:10:34 +01:00
88b711d1f3
Small tour code cleanup
2014-01-17 12:04:01 +01:00
1098c86dd5
Bounds checking in shape move/zoom (WIP).
...
More specific unbinding of popup key handlers.
2014-01-17 00:57:22 +01:00
06ff438119
Add keyword to draw calibration diamond.
...
Remove some unneeded log messages.
2014-01-17 00:21:29 +01:00
fd6c55b69e
Merge branch 'text-experiment' of github.com:Doodle3D/doodle3d-client into text-experiment
2014-01-17 00:17:13 +01:00
725fb6d015
Separated vertical shape selection break point
2014-01-17 00:06:51 +01:00
efe1f72b02
Removed padding above print button
2014-01-16 23:50:15 +01:00
e56d4bcd84
Less & css cleanup
2014-01-16 23:49:52 +01:00
57c928f195
Add esc/enter support to cancel or accept popups.
2014-01-16 23:28:58 +01:00
c6058ed61d
Bigger info and settings buttons
2014-01-16 23:27:35 +01:00
0c8856587d
Restyled buttonGroupAdd (fixing position issues)
2014-01-16 23:14:30 +01:00
31cec107b0
Restyled settings popup
2014-01-16 22:51:19 +01:00
bbed35d877
Generalized Popups
2014-01-16 21:30:57 +01:00
548ea2732a
AddShape point icons
2014-01-16 17:09:15 +01:00
f371481c27
Hiding vertical shapes on mobile
2014-01-16 16:07:55 +01:00
f67d9a476e
Tour update
2014-01-16 16:07:47 +01:00
e9a2b90483
New Twist and Height buttons
2014-01-16 16:07:40 +01:00
0b908a8f44
Cleanup
2014-01-16 16:05:04 +01:00
17467edae1
Organised img folder
2014-01-16 14:09:03 +01:00
63a280ab18
Fixed and updated tour
2014-01-16 12:49:24 +01:00
ed3a769639
Nicer next/prev button layout
2014-01-16 12:49:13 +01:00
942d9d8bbf
Enable enter key usage for tour again
2014-01-16 12:48:57 +01:00
a01599fb54
Removed red border
2014-01-16 12:23:42 +01:00
7d726f513e
Turned logo into btn
2014-01-16 12:16:09 +01:00
89ee355b2e
Adding css user-select none etc
2014-01-16 12:05:27 +01:00
fc8c83ae19
Turning popupMask in a Button
2014-01-16 12:05:27 +01:00
a952a1ee7b
Disabling all click events after a touchStart
2014-01-16 12:05:27 +01:00
c697806385
Silliness.
2014-01-15 20:16:46 +01:00
e8c9932014
Prevent magnifying glass from appearing on iPad.
...
Cancel wordart on click/tap outside dialog popup.
2014-01-15 18:08:26 +01:00
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
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
606f7cb359
Implemented Copse as new WordArt font
2014-01-15 13:49:38 +01:00
d68b9cbefc
Edit menu
2014-01-13 18:04:51 +01:00
01f28a2403
Edit button group
2014-01-13 16:38:26 +01:00
ab329aaaf1
VerticalShapes toggle button
2014-01-13 15:52:40 +01:00
295ba222a3
Add settings for bottom layer speed and bottom layer flow rate.
...
Force travel from wait position to first point.
Disable traveling in bottom layers (providing sort of a poor man's raft).
Fix use of firstLayerSlow setting.
2014-01-10 17:47:05 +01:00
44f6534f9e
Remove ___settings.html (leftover?).
2014-01-10 17:44:19 +01:00
d156dc9902
Added mouse position info link in comments
2014-01-10 17:23:58 +01:00
b2fd2a2f77
Cross platform & cross browser relative mouse position retrieval
2014-01-10 17:22:02 +01:00
82b57def39
Cleanup
2014-01-10 17:21:43 +01:00
f7fec0aec6
FadeIn popups and button groups
2014-01-10 14:04:36 +01:00
139e4ca6ae
Cleanup
2014-01-10 14:04:17 +01:00
a4ad7d7198
Cleanup
2014-01-10 13:59:55 +01:00
af95065bbe
Fix mistake in js include.
2014-01-10 12:12:25 +01:00
0ad800b021
removed files
2014-01-09 18:10:54 +01:00
Wouter R
peteruithoven
Rick Companje