 Tats
|
28261033c6
|
Removed DestinationGLCanvas and SourceGLCanvas which were not doing much: integrated them directly in MapperGLCanvas.
|
2016-03-06 00:43:01 -05:00 |
|
|
Tats
|
35cbe281c0
|
Fixed segfault when loading a file: trying to call setLocked() on a non-existing shape.
|
2016-03-06 00:24:43 -05:00 |
|
|
Tats
|
64f2874a14
|
Found a temporary workaround to support reordering of mappings.
|
2016-03-06 00:23:58 -05:00 |
|
|
Tats
|
689dc0b306
|
Rename MM::MuteColunm to MM::HideColumn.
|
2016-03-06 00:23:29 -05:00 |
|
|
Tats
|
038a0e7e55
|
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
# Conflicts:
# MainWindow.h
|
2016-03-05 22:47:33 -05:00 |
|
|
Tats
|
3d58c92e97
|
Merge branch 'feature-advanced-mapping-list' into develop-try-to-merge-with-adv
# Conflicts:
# MainWindow.cpp
|
2016-03-05 22:41:41 -05:00 |
|
|
baydam
|
ab9478c4c2
|
The fullscreen button is activated only in dual screen mode
|
2016-03-06 03:11:13 +00:00 |
|
|
Tats
|
9644b636be
|
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
# Conflicts:
# VideoImpl.cpp
|
2016-03-05 21:47:39 -05:00 |
|
|
Tats
|
fd92154e95
|
Small cleanup.
|
2016-03-05 21:42:00 -05:00 |
|
|
Tats
|
bddcf15c0b
|
Cleanup (including passing gstreamer and std::cout printouts to QDebug).
|
2016-03-05 21:41:45 -05:00 |
|
|
baydam
|
afaccacd26
|
Fix shortcut propagation
|
2016-03-06 02:41:22 +00:00 |
|
|
baydam
|
30db5dcc72
|
Fix: #143 "The output window should provide the same menus and shortcuts as the main window"
|
2016-03-06 01:36:14 +00:00 |
|
|
baydam
|
17e4353b4f
|
Fix: #143 "The output window should provide the same menus and shortcuts as the main window"
|
2016-03-06 01:36:14 +00:00 |
|
|
Alexandre Quessy
|
61de7911b7
|
Decrease verbosity in VideoImpl.cpp
|
2016-03-05 20:04:34 -05:00 |
|
|
Tats
|
e7b95cd8f4
|
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
|
2016-03-05 19:46:04 -05:00 |
|
|
Tats
|
0c2de092bd
|
Fixed compilation error wrt shortcuts.
|
2016-03-05 19:45:58 -05:00 |
|
|
Alexandre Quessy
|
aec2dba6b8
|
use qDebug for logging
|
2016-03-05 19:36:05 -05:00 |
|
|
Alexandre Quessy
|
5a56e1bba6
|
fix a syntax error
|
2016-03-05 19:32:28 -05:00 |
|
|
Alexandre Quessy
|
fa6a88e87f
|
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
|
2016-03-05 19:12:36 -05:00 |
|
|
Alexandre Quessy
|
bf256e60e6
|
remove translate shortcuts - See issue #200
|
2016-03-05 19:12:16 -05:00 |
|
|
Tats
|
2429728e49
|
Removed drawControls*() methods in Utils.h which are not used anymore.
|
2016-03-05 18:16:49 -05:00 |
|
|
Tats
|
e5f73277b2
|
Removed unused items to prevent compilation warnings.
|
2016-03-05 18:15:57 -05:00 |
|
|
Tats
|
97ff5ff47d
|
Fixed: Paint and mapping renamings are not saved in file (closes #179).
|
2016-03-05 17:07:46 -05:00 |
|
|
Tats
|
fcbc1b3aef
|
Arranged name properties in Element.cpp.
|
2016-03-05 16:56:31 -05:00 |
|
|
Tats
|
f6ec081334
|
Save id in attributes in state saving.
|
2016-03-05 15:12:46 -05:00 |
|
|
Tats
|
35b74c8d1f
|
Renamed source and destination tags to appropriate names.
|
2016-03-05 15:09:56 -05:00 |
|
|
Tats
|
a41b05693a
|
Compilation error fix.
|
2016-03-05 14:12:12 -05:00 |
|
|
Tats
|
ee5133a48a
|
Fixed bug: when reloading video it was badly positioned.
|
2016-03-05 14:11:56 -05:00 |
|
|
Tats
|
218de01f6e
|
Some cleanup performed related to reverse playback #216.
|
2016-03-05 13:45:51 -05:00 |
|
|
Tats
|
59e95e4c02
|
Replace "mute" by "hide".
|
2016-03-04 18:46:54 -05:00 |
|
|
Tats
|
5c29f54a66
|
Cosmetic change.
|
2016-03-04 18:12:51 -05:00 |
|
|
Tats
|
22acf3c215
|
Changing mapping solo/visible/locked state changes the corresponding QActions in the main window.
|
2016-03-04 18:12:45 -05:00 |
|
|
Tats
|
f97e4920ed
|
Cosmetic change.
|
2016-03-04 14:39:48 -05:00 |
|
|
Tats
|
49b46290bb
|
Uids now start at 1 instead of 0.
|
2016-03-04 14:39:43 -05:00 |
|
|
Tats
|
14be9bedbf
|
Made use of _seekEnabled in a more useful/stable way.
|
2016-03-04 14:27:53 -05:00 |
|
|
Tats
|
39970eb81e
|
Removed all references to audio in VideoImpl for now.
|
2016-03-04 14:17:03 -05:00 |
|
|
Tats
|
e4ed0e939c
|
Fixed bug introduced with latest changes: movie was not properly reloaded resulting in hanging.
|
2016-03-04 14:16:51 -05:00 |
|
|
baydam
|
7cc1043368
|
Fix broken Undo/Redo for Delete command
|
2016-03-04 12:10:08 +00:00 |
|
|
Tats
|
fc0f8f528c
|
Save/load x,y in Texture but not considered a settable property (for example osc should not be able to change it).
|
2016-03-04 00:08:55 -05:00 |
|
|
Tats
|
e93d1123c3
|
Cosmetic change.
|
2016-03-03 22:25:07 -05:00 |
|
|
Tats
|
e87de3d3e9
|
Fixed signal/slot loop: on property changes model emits signals that are collected by the MainWindow and sent back to the PaintGui/MappingGui (this fixes OSC changes of model objects).
|
2016-03-03 22:25:00 -05:00 |
|
|
baydam
|
7a9457d26d
|
Cosmetic changes.
|
2016-03-03 11:36:09 +00:00 |
|
|
baydam
|
23331abf57
|
Add buttons on mapping layers
|
2016-03-03 10:18:54 +00:00 |
|
|
baydam
|
d3975c841f
|
Add buttons on mapping layers
|
2016-03-03 10:15:24 +00:00 |
|
|
baydam
|
fde9114009
|
Work In Progress (reverted from commit 17a64fdade)
|
2016-02-29 16:46:07 +00:00 |
|
|
baydam
|
17a64fdade
|
Work In Progress
|
2016-02-29 16:44:26 +00:00 |
|
|
baydam
|
5fe89ab9ac
|
Cosmetic changes.
|
2016-02-23 22:01:07 +00:00 |
|
|
baydam
|
38db95ffd4
|
Wrong approach of mapping layers buttons (reverted from commit 51b0976487)
|
2016-02-23 18:54:30 +00:00 |
|
|
Tats
|
1002d9d824
|
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
# Conflicts:
# VideoImpl.cpp
# VideoImpl.h
Signed-off-by: Tats <info@sofianaudry.com>
|
2016-02-19 19:02:43 -05:00 |
|
|
Tats
|
8b48b6dc8b
|
Renamed Media* to Video* to avoid confusion.
|
2016-02-19 18:58:38 -05:00 |
|