61 Commits

Author	SHA1	Message	Date
Tats	066337472c	Fixed bug related to width and height of videos being 0 (using meta-data collection) (closes #154).	2015-12-31 16:31:19 -06:00
Tats	e3cdf4f464	Moved classes pertaining to ShapeGraphicsItem and ShapeControlPainter in separate files outside of MappingGui.{h,cpp}.	2015-12-23 19:14:39 -05:00
Tats	e76bdf1d9f	Renamed Mapper to MappingGui (to correspond to Paint -> PaintGui).	2015-12-11 00:43:47 -05:00
Alexandre Quessy	a01aed4f7a	post-release version bump	2015-10-30 15:27:33 -04:00
Alexandre Quessy	c7c537dbc0	some more comments	2015-10-29 17:03:48 -04:00
Alexandre Quessy	0313f5b1f7	Add OSC support on OS X	2015-10-28 16:12:48 -04:00
Alexandre Quessy	e7a137f590	towards adding liblo on OS X	2015-10-28 15:40:13 -04:00
Tats	87136e568a	Resolved conflict	2015-09-17 09:13:58 -04:00
Tats	f3c199b3ce	Resolved conflict	2015-09-17 09:12:43 -04:00
Alexandre Quessy	b548341a7f	post-release version bump	2015-07-17 17:27:19 -04:00
Alexandre Quessy	351c10579e	prepare 0.3.0	2015-07-17 17:20:08 -04:00
Tats	8f13597451	Created a special class for output gl canvas to prevent some events (like zooming) to happen.	2015-07-13 16:44:41 -06:00
baydam	6a3545ff47	Segmentation fault fixed	2015-01-29 20:39:49 +00:00
baydam	146a7e4a43	Add Undo and Redo Command to Mesh, Triangle and Ellipse	2015-01-16 17:39:38 +00:00
Alexandre Quessy	5141672ffc	Disable installation of MIME type. Remove useless dep	2014-12-31 13:52:36 -05:00
Marc Lavallée	aa7e5d2e21	Merge branch 'develop' of github.com:mapmapteam/mapmap into develop	2014-12-28 21:07:12 -05:00
Marc Lavallée	174ec7a90a	simplified inclusion of translations	2014-12-28 21:07:09 -05:00
Alexandre Quessy	df8e41a36a	post-release version bump	2014-12-28 20:04:45 -05:00
Alexandre Quessy	f5144d7fd2	Merge branch 'develop' into release-0.2.0	2014-12-28 19:50:03 -05:00
Marc Lavallée	d7185009d2	added mimetype support, deleted arabic translation file	2014-12-28 19:31:44 -05:00
Alexandre Quessy	20053bd6f3	update version number in .pro file	2014-12-28 16:09:19 -05:00
Marc Lavallée	e7253a4850	fixed desktop icon	2014-12-28 15:23:20 -05:00
Marc Lavallée	dd92ab9317	mapmap.pro now install the software, and a desktop file	2014-12-28 14:35:19 -05:00
Alexandre Quessy	be0053764d	add PreferencesDialog - not yet effective	2014-10-27 14:05:36 -04:00
Tats	abb62dc1f2	Integrated file choosing pop-up for images and media in property browser.	2014-10-16 20:56:02 +00:00
Tats	ac29ca5c1f	Merged latest changes from develop	2014-10-15 13:42:32 +00:00
Tats	55e909dc69	Introduced a property panel for paints and managed the case of color (disabling double-click feature in the process)	2014-10-14 22:36:54 +00:00
Alexandre Quessy	f63885f4f0	Add missing MM.h to mapmap.pro	2014-10-14 10:52:10 -04:00
Alexandre Quessy	b8a3135169	post-release version bump	2014-07-07 16:35:58 -04:00
Alexandre Quessy	1018586265	Basic fixes in build files	2014-06-23 12:27:54 -04:00
Alexandre Quessy	0d51f784e4	update packaging for OS X	2014-05-21 14:34:06 -04:00
Alexandre Quessy	1da6d0479a	Add arabic translation file	2014-05-15 19:16:31 -04:00
Alexandre Quessy	19b3ca3826	build against GStreamer 1.0	2014-05-08 13:03:02 -04:00
Alexandre Quessy	f763bf3c7c	Use only pkg-config on Linux	2014-05-08 11:26:59 -04:00
Alexandre Quessy	fb4bd968b8	towards building against GStreamer 1.0 on OS X	2014-05-08 11:11:53 -04:00
Tats	ce98b107a2	Added MM.cpp to compil.	2014-05-02 14:13:13 -04:00
Alexandre Quessy	bf05ca0cd9	post-release version bump	2014-04-30 23:52:53 -04:00
Alexandre Quessy	5ce262be15	Merge branch 'develop' into release-0.1.0	2014-04-30 22:48:06 -04:00
Alexandre Quessy	5ced74f360	remove useless flags in .pro file for os x	2014-04-30 16:09:47 -04:00
Alexandre Quessy	73308ab117	Prepare 0.1.0: update version number	2014-04-30 14:14:22 -04:00
Tats	430b0f223a	Refactor Video -> Media	2014-04-26 12:22:33 +01:00
Tats	e4f8568b34	Merge branch 'gst-osx' into develop ... Conflicts: mapmap.pro	2014-04-26 12:04:16 +01:00
Alexandre Quessy	322da96ed2	more fixes for gst on os x	2014-04-25 22:02:49 -04:00
Tats	0e3ba9ee14	Added pkgconfig in .pro file (includes gstreamer in prevision of future dev.)	2014-04-26 02:17:49 +01:00
Alexandre Quessy	d2f43049a6	fixes to the packaging for gst for os x	2014-04-25 21:08:40 -04:00
Alexandre Quessy	e91496b96a	Merge branch 'spike-video-drone' into gst-osx	2014-04-25 20:52:49 -04:00
Alexandre Quessy	f731d6459e	link against gst on mac	2014-04-25 20:24:00 -04:00
Tats	a02bb298c3	Forgot to remove unused.h from .pro file	2014-04-10 18:27:09 -04:00
Alexandre Quessy	cfb88e6863	Fixes for when we don't have liblo on mac os x	2014-04-03 23:30:51 -04:00
Alexandre Quessy	a7608e5413	mv Math.h Maths.h, caused problems on Mac	2014-03-30 11:50:04 -04:00