 Tats
|
0c2de092bd
|
Fixed compilation error wrt shortcuts.
|
2016-03-05 19:45:58 -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 |
|
|
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
|
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 |
|
|
Tats
|
f998ba64e1
|
Renamed Media* to Video* to avoid confusion.
|
2016-02-19 13:07:38 -05:00 |
|
|
baydam
|
51b0976487
|
Wrong approach of mapping layers buttons
|
2016-02-19 13:50:11 +00:00 |
|
|
baydam
|
35c9f7b7f8
|
Wrong approach of mapping layers buttons
|
2016-02-19 13:38:11 +00:00 |
|
|
baydam
|
f175559012
|
Update gitignore file
|
2016-02-19 12:55:55 +00:00 |
|
|
Tats
|
21f124684a
|
Cosmetic change.
|
2016-02-18 23:36:46 -05:00 |
|
|
Tats
|
1a368a7cd9
|
Fixed bug: thumbnail had wrong colors due to bad conversion from RGBA to ARGB
|
2016-02-18 22:45:50 -05:00 |
|
|
Tats
|
1b449e0787
|
Merge branch 'feature/video-thumbnails' of github.com:mapmapteam/mapmap into feature/video-thumbnails
|
2016-02-17 18:06:16 -05:00 |
|
|
Tats
|
c4df418f7b
|
Fixed potential error in return policy of Media::setUri().
|
2016-02-17 18:02:03 -05:00 |
|
|
Tats
|
c8074e8e3a
|
Cleanup.
|
2016-02-17 18:01:39 -05:00 |
|
|
Tats
|
93a60ff3b1
|
Cleanup.
|
2016-02-17 18:00:53 -05:00 |
|
|
Tats
|
5600d5a137
|
Defined constant to control thumbnail generation timeout.
|
2016-02-17 16:06:02 -05:00 |
|
|
Tats
|
890e4043bc
|
Cosmetic change.
|
2016-02-17 16:05:43 -05:00 |
|
|
Tats
|
fb8ae149b6
|
Cleanup.
|
2016-02-17 15:55:51 -05:00 |
|
|
Tats
|
a86e38b2e4
|
Fixes in the seekTo() method.
|
2016-02-17 15:55:42 -05:00 |
|
|
Tats
|
8d780aeb61
|
Use new methods in MediaImpl to appropriately gather a thumbnail for the video.
|
2016-02-17 15:55:23 -05:00 |
|
|
Tats
|
51f5d7f9fb
|
Added a blocking method to wait for available new bits.
|
2016-02-17 15:54:58 -05:00 |
|
|
Tats
|
d62343ee95
|
Create a hasBits() method that tells whether there's currently bits available or not.
|
2016-02-17 15:53:55 -05:00 |
|
|
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 |
|