Commit Graph

942 Commits

Author SHA1 Message Date
Tats 0e2baa4d76 Removed struct pad handler data from MediaImpl. 2016-02-17 14:32:49 -05:00
Tats aaef36b1ab Fix shape lock check in MapperGLCanvas.h. 2016-02-16 08:47:52 -05:00
Tats 34abb070bb Provide default icon from system if problem seeking thumbnail. 2016-02-15 20:05:36 -05:00
Tats 3df0f7a955 Generate thumbnails for videos (closes #178). 2016-02-15 19:49:17 -05:00
Tats 52dd188afe Merge branch 'feature/qt-properties' into feature/video-thumbnails 2016-02-15 18:42:05 -05:00
Tats c2ff8acc7e Removed AsyncQueue (unused). 2016-02-15 18:09:42 -05:00
Tats 1146a6408e Merge branch 'develop' into feature/qt-properties
# Conflicts:
#	Mapping.h
#	OscInterface.cpp
#	ProjectReader.cpp
#	ProjectWriter.cpp
#	Shape.h
#	main.cpp
2016-02-15 13:16:04 -05:00
Tats 445cf7550b Merge branch 'feature/qt-properties' of github.com:mapmapteam/mapmap into feature/qt-properties
# Conflicts:
#	OscInterface.cpp
2016-02-15 01:49:54 -05:00
Tats f656b73880 Integrated QProperty system into OSC support. 2016-02-15 01:48:26 -05:00
Tats c4762375c5 Integrated QProperty system into OSC support. 2016-02-15 01:42:00 -05:00
Tats 44e3f853c2 Added ptr typedef for Element. 2016-02-15 01:38:16 -05:00
Tats 89f95d9d46 Renamed concurrentqueue.h -> ConcurrentQueue.h. 2016-02-14 18:36:22 -05:00
baydam 8281f7dfef Show and hide menu bar option not available on Mac & Ubuntu 2016-02-14 22:14:02 +00:00
baydam 420e30b187 UX Design document: status bar 2016-02-14 17:05:03 +00:00
Alexandre Quessy 18ff7e2dca Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2016-02-12 12:23:43 -05:00
Alexandre Quessy 6a0b3afdeb update NEWS 2016-02-12 12:23:35 -05:00
Tats ed859fadf5 Fix bug: solo was not working. 2016-02-12 12:16:11 -05:00
Tats 8de0b3c7d6 Cleanup. 2016-02-12 12:03:16 -05:00
Tats e1270cd17a Rate (speed) and volume both reset to be in 0..1 instead of 0..100. 2016-02-12 11:59:37 -05:00
Tats e07bb6324f Fixed bug: volume was not loaded. 2016-02-12 11:59:08 -05:00
Tats 42de64ff9f Fixed loading of video paints and mappings. 2016-02-12 11:52:20 -05:00
Alexandre Quessy f837b80c20 update NEWS 2016-02-12 11:39:53 -05:00
Tats b32b882210 Fixed segfault when loading meshes with images. 2016-02-12 11:26:09 -05:00
Tats 8fff8735b8 Used ProjectLabels in Mappings (was missing). 2016-02-12 11:20:01 -05:00
Tats 1caff94eba Replaced ProjectAttributes with ProjectLabels. 2016-02-12 11:19:47 -05:00
baydam 21c91295d1 Display lock/mute/solo options in the context menu 2016-02-11 21:24:08 +00:00
Tats 1309305614 Bug fix: when moving vertex pressing any key (eg. CTRL) added an extra command into the undo stack thus forcing the user who wanted to undo to press CTRL-Z twice. 2016-02-11 15:52:48 -05:00
Tats b21c46b3d2 Fixed bug wrt wheel event scrolling (contains a compat. fix for Qt5/Qt4.8) (closes #198). 2016-02-11 14:26:01 -05:00
baydam acffd5f75a Add a macro to check for Qt >= 5.5 2016-02-09 12:04:21 +00:00
baydam 18e00e5cbe Add a macro to check for Qt >= 5.5 2016-02-09 12:01:40 +00:00
baydam b3065af6ba Add a macro to check for Qt >= 5.5 2016-02-09 11:52:16 +00:00
baydam 5c66fa1b8d User can show or hide toolbar 2016-02-08 19:08:37 +00:00
baydam d1af8b4208 Now we are able to show and hide menubar with ALT key 2016-02-08 16:20:45 +00:00
baydam 685e422ed2 Merge branch 'ux-document-implements' into develop 2016-02-05 18:25:08 +00:00
baydam d889a6c616 Output window is fullscreen only if a video projector is connected or not visible 2016-02-05 18:17:47 +00:00
baydam ce74dace68 Reorder the toolbar icons 2016-02-04 20:45:31 +00:00
baydam f4d0e6bd6a Merge import media and image actions 2016-02-04 18:28:08 +00:00
baydam 9fbb31d949 Switch between vertex to turn them active with Shift+Space shortcut 2016-02-04 16:47:22 +00:00
baydam 03eec503fc Able to speed up shifting of active vertex with SHIFT+ArrowKey 2016-02-04 14:02:08 +00:00
baydam 9c5deae1d7 Refresh View at startup 2016-02-04 13:41:05 +00:00
baydam 35ab79eb57 Translate the view with arrows keys and increase moving speed 2016-02-04 13:30:17 +00:00
baydam 3238efbdb4 Fix: #199 zoom toolbar moved into the visible area 2016-02-03 13:14:25 +00:00
baydam e9a64540df Merge branch 'feature-zoom-control' into develop 2016-02-03 00:41:01 +00:00
baydam 39ccd56eef Fix: #197 Put the zoom toolbar in the bottom-right corner 2016-02-03 00:40:12 +00:00
baydam 1180c310a2 Merge branch 'feature-logging-output' into develop 2016-02-02 18:50:32 +00:00
baydam 6c723fddd9 Make the console and the application more readable 2016-02-02 18:35:47 +00:00
Tats cb07e630a2 Added CTRL+= for zoom-in (closes #192). 2016-01-30 18:57:19 -05:00
baydam eeca30197a Fix zoom in key not working 2016-01-30 23:35:50 +00:00
Tats 8dc7177ae9 Read/write of texture mappings for triangle and ellipses works. 2016-01-28 21:52:47 -05:00
Tats 7c95971da0 Fixed error where coordinates were saved with a "," instead of a "." to represent fractions. 2016-01-28 12:28:50 -05:00