eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-03 22:19:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
964 Commits 60 Branches 10 Tags
17a64fdade83f237aefc394ef6f103ab4e697eb9
Commit Graph

964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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