eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-01 13:09:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,095 Commits 60 Branches 10 Tags
mac-bundle
Commit Graph

90 Commits

Author SHA1 Message Date
Tats
e9bf69017a Use $$QMAKE_RELEASE instead of release to get full path 2016-05-07 08:44:15 -04:00
Alexandre Quessy
02bf122500 post-release version bump 2016-04-19 15:24:21 -04:00
Alexandre Quessy
915a0c4fad prepare 0.4.0 2016-04-19 15:19:23 -04:00
Bay Dam
94211340b5 Preparing for windows package 2016-03-26 18:34:22 +01:00
Tats
c9ff73a744 Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop 2016-03-16 11:16:50 -04:00
Tats
a4e4d282ea Passing files to new version 0.4.0 2016-03-16 11:13:39 -04:00
Tats
7b7f0639b0 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2016-03-16 10:57:14 -04:00
Tats
adb076ab12 Integrated the lrelease process of *.ts to *.qm to avoid "RCC: Error in 'mapmap.qrc': Cannot find file 'mapmap_fr.qm'" errors. 2016-03-16 10:56:46 -04:00
Bay Dam
c708fc24e4 Preparing for Windows operating system 2016-03-16 11:08:49 +01:00
Tats
12a46018fe Fixed error in mapmap.pro related to translations. 2016-03-16 01:11:14 -04:00
Bay Dam
7b5fe0c7e9 Fix compilation error 2016-03-10 17:41:24 +01:00
baydam
0c093eefe3 Update Linux spec in pro file 2016-03-10 16:12:32 +00:00
Bay Dam
706f40309a Fix circular dependencies on Windows 2016-03-10 17:09:12 +01:00
Tats
84ebb9d3ad Moved the zoom toolbar into a separate widget class, added them in the right spots and made them correctly interoperate with the canvases. 2016-03-06 01:22:34 -05:00
Tats
28261033c6 Removed DestinationGLCanvas and SourceGLCanvas which were not doing much: integrated them directly in MapperGLCanvas. 2016-03-06 00:43:01 -05: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
Tats
8b48b6dc8b Renamed Media* to Video* to avoid confusion. 2016-02-19 18:58:38 -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
89f95d9d46 Renamed concurrentqueue.h -> ConcurrentQueue.h. 2016-02-14 18:36:22 -05:00
Tats
1caff94eba Replaced ProjectAttributes with ProjectLabels. 2016-02-12 11:19:47 -05:00
Tats
f6fc556b3e Generalized the constructors for Mapping to always allow input shape (making it more general). 2016-01-28 12:27:45 -05:00
baydam
eb38336e16 Insert header may fix compilation error 2016-01-22 09:26:44 +00:00
Tats
21cceff534 Moved base read/write functions to Serializable class (to give functionality to MShape). 2016-01-21 21:57:01 -05:00
baydam
156e74acd5 Fix:#183 "Display logging output in a console and able to show and hide" 2016-01-21 21:54:34 +00:00
Tats
c656f8246a Split the shapes in different files and made them all QObjects with QProperties. 2016-01-21 16:18:19 -05:00
Tats
ba1af4b724 Added a MetaObjectRegistry class that allows the dynamic creation of new instances. 2016-01-21 16:15:08 -05:00
Tats
99b19dfcc6 First step in refactoring: brought both Paint and Mapping under the common umbrella class Element and implemented basic QProperties. 2016-01-04 00:19:34 -06:00
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