d162c19c69
Bug fix: when moving layers around video would pause.
2016-05-13 18:02:06 +00:00
7f0018d493
Cleanup in code related to display of paint icons in list widgets.
2016-05-13 16:16:12 +00:00
689231d441
Adjustments in paint icons (make sure they are always square with the right dimensions).
2016-05-13 16:15:49 +00:00
11ce1fd28f
Fixed bug: main pause button was not working anymore.
2016-05-13 16:13:34 +00:00
4d2c1e490d
Merge branch 'setup/dakar-bideew-show-2016' of github.com:mapmapteam/mapmap into setup/dakar-bideew-show-2016
2016-05-13 15:32:09 +00:00
3a83366164
New feature: Paints that are currently not visible are shown in interface with a red bar on them.
2016-05-13 15:31:18 +00:00
3759184588
Small fix: Switch between vertex with Shift+Space keys
2016-05-13 13:08:01 +00:00
75c6a25dbf
Fixed bug: OSC messages that change solo, visible, locked status of mappings were not changed in the GUI.
2016-05-13 02:59:55 +00:00
982dc6950e
Small fix: path is valid for regexp if at least one element was valid
2016-05-13 02:08:36 +00:00
f9633b0065
Allow OSC message addressing of paints and mappings by names through regular expressions.
2016-05-13 01:31:53 +00:00
7ac70e7cf7
Added support for OSC message: rewind individual paint.
2016-05-13 00:19:09 +00:00
81ed463c6d
Fixed problem with OSC port being overriden by default settings even after changing it in preferences.
2016-05-13 00:18:55 +00:00
4554a593c3
Integrated true FPS in the status bar.
2016-05-12 23:40:56 +00:00
c9afeaf47b
Fix bug: vertices were not sticking correctly on source.
2016-05-12 18:44:50 +00:00
c598c2c896
Cleanup in main.cpp options.
2016-05-12 17:39:27 +00:00
9f8a967af1
Some cleanup related to OSC.
2016-05-12 17:39:18 +00:00
5e6179fbae
Frame rate is now an option that can be specified on the commandline.
2016-05-12 17:38:58 +00:00
c92eb78963
Pause paints that are not visible anyway.
2016-05-12 16:27:55 +00:00
065a561df6
Create meshes instead of quads for color mappings ( closes #150 ).
2016-05-12 15:19:41 +00:00
c562dc1d56
Increased the sticky radius a bit.
2016-05-12 10:28:46 +00:00
2734624f61
Fixed bug introduced by paint control option (segfaulted with color paints).
2016-05-12 10:28:28 +00:00
9cf56ad962
Merge branch 'videoimpl-refactor' into setup/dakar-bideew-show-2016
...
# Conflicts:
# mapmap.pro
2016-05-12 10:27:59 +00:00
bee45a3491
Enable display of controls of mappings related to current paint ( closes #142 ).
2016-05-12 00:42:44 +00:00
e44ad38cc3
Improved look of locked color.
2016-05-12 00:42:01 +00:00
91882b3378
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
2016-05-11 22:56:55 +00:00
37771654c9
Added script to automatically convert videos to PhotoJPEG (a good format for MapMap).
2016-05-11 22:56:39 +00:00
ed5e6e843b
Disable right click on context menu actions
2016-05-11 14:25:11 +00:00
b353a76c2c
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
2016-05-06 15:45:28 +00:00
84c915e88b
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
2016-05-06 15:26:40 +00:00
dd76c248a8
more decklink prototypes
2016-05-06 15:23:49 +00:00
b1f8d4c39f
Don't need screen actions on single screen mode
2016-05-05 12:09:35 +00:00
de2ff27c51
Merged MapperGLCanvas.cpp
2016-05-05 11:28:41 +00:00
5d37219833
Refactoring VideoImpl
...
VideoImpl now creates the backend pipeline (queue->videoconvert->...->appsink)
Separate subclasses build a different frontend of the pipeline depending on the
type of video stream (uri, webcam , shared memory) that attaches to the backend
pipeline.
- VideoUridecodeBin: front-end for video file / uri
- VideoV4l2SrcBin: front-end for webcam (at the moment only works with
/dev/video*files, tested only on Ubuntu 14.04)
- VideoShmSrcBin: front-end for Shared memory / socket (used to work, currently
has problems)
Code is still hacky, needs work.
2016-04-26 18:32:03 +02:00
d01dd4d356
Allow to finely choose on which display to output
2016-04-22 17:00:55 +00:00
d8d9671b6c
improving the menu and adding some useful link
2016-04-20 17:25:31 +00:00
225163fd94
Make the duplication of mapping {Undo, Redo}able
2016-04-20 11:18:49 +00:00
7369a9cdd2
Merge branch 'release-0.4.0' into develop
2016-04-19 15:24:40 -04:00
02bf122500
post-release version bump
2016-04-19 15:24:21 -04:00
915a0c4fad
prepare 0.4.0
2016-04-19 15:19:23 -04:00
19eefde166
update solo icon
2016-04-19 15:08:04 -04:00
5a83ad3a4a
update coding style + add a todo: tooltips for solo/lock buttons
2016-04-19 14:40:11 -04:00
0ec61b193f
Hide cursor when canvas controls are not shown
2016-04-19 12:23:46 -04:00
ff93b46660
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
2016-04-19 11:46:23 -04:00
2c7dd61048
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
2016-04-19 11:42:32 -04:00
f5c0c8a221
Mention of removing unused fonctions in TODO entries
2016-04-19 15:42:18 +00:00
c08733df8e
reduce the size of the splash screen image
2016-04-19 12:56:25 +00:00
f4f5f14c3f
The menu bar is not become visible when the main windows receive focus (untesting on Ubuntu)
2016-04-19 11:55:15 +00:00
1b09dd08d8
Can undo or redo Add/Remove paint
2016-04-15 13:05:34 +00:00
a3355d86be
Fix : #240 Allow easy switch between destination+source, destination-only and source-only views
2016-04-14 17:27:01 +00:00
4481ed4be5
update blackmagic prototype
2016-04-13 14:48:25 -04:00
Tats