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
af917de543
Fix style issues on some plateforme
2016-04-13 18:30:08 +00:00
8c3b2dc47a
Fix build script for cairo overlay prototype
2016-04-13 13:15:26 -04:00
8548ee3b67
add a blackmagic prototype
2016-04-13 12:57:23 -04:00
72472239f1
add a basic cairo overlay prototype
2016-04-13 12:53:08 -04:00
cdae273873
update splash.png
2016-04-11 17:05:33 -04:00
b393b1d556
Update gitignore file
2016-04-05 12:37:25 +00:00
9a4110dec1
Update INSTALL file for Archlinux specification
2016-03-31 13:28:50 +00:00
edb80d8edf
Cosmetic changes.
2016-03-26 19:47:33 -04:00
61dcef5db1
Automatically move output screen to secondary screen (untested).
2016-03-26 19:47:05 -04:00
6d7d5c8b55
Removed unused close event management.
2016-03-26 19:41:26 -04:00
6f9fde311f
Fixed bug: ESC key would not work properly to exit full screen.
2016-03-26 19:40:51 -04:00
512f30d1a6
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
2016-03-26 18:20:08 -04:00
14fd387c68
Bug fix: display test signal was wrongly managed in settings readings.
2016-03-26 18:19:31 -04:00
efea658001
Manage properly the state saving/reloading of display output, test and controls.
2016-03-26 18:19:06 -04:00
eca2e881d9
Manage properly fullscreen in OutputGLWindow: it was possible to have the window without the fullscreen, which caused issues in some circumstances.
2016-03-26 18:17:57 -04:00
4c5e104b46
Removed implicit shortcuts for menus (they were conflicting with other ALT+ based shortcuts).
2016-03-26 18:15:47 -04:00
fcf4c51193
Moved crosshair check into OutputGLWindow.
2016-03-26 18:15:18 -04:00
2bb758b4c6
Moved display of test signal into OutputGLCanvas where it belongs.
2016-03-26 18:13:06 -04:00
94211340b5
Preparing for windows package
2016-03-26 18:34:22 +01:00
Tats