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

1051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tats
0ed995e6a9 Fixed: It should be possible to have an output window when using a single screen (closes #209). 2016-03-26 12:58:19 -04:00
Bay Dam
86a5ef7cbe Create LICENSE 2016-03-25 18:31:10 +01:00
baydam
34bb866a98 Mapping list context menu improvements 2016-03-25 17:02:05 +00:00
baydam
69d1b7840a Set application icon 2016-03-24 21:22:39 +00:00
baydam
37ce6e6cee remove MainWindow event filter 2016-03-22 23:02:42 +00:00
baydam
aadbcb42ce Can reorder mapping by drag & drop 2016-03-22 22:24:57 +00:00
Tats
5a83f15c9e Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2016-03-17 16:05:11 -04:00
Tats
345643bad1 Fixed: Flickering video images when loading from the commandline (closes #218). 2016-03-17 16:05:03 -04:00
baydam
64c3d92705 Able to show or hide canvases zoom toolbars 2016-03-17 13:59:22 +00:00
Tats
3e04d19797 Fixed: Introduction of namespace had broken compatibility with file format. 2016-03-16 20:15:49 -04:00
Tats
f02933d9a4 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2016-03-16 17:28:45 -04:00
Tats
8421c87cd4 Added OSC support for play, pause, and rewind. 2016-03-16 17:28:33 -04:00
Bay Dam
ae88f9d8fb Fix some name space conflicts 2016-03-16 22:18:57 +01:00
baydam
b375367811 Integrate all code inside a namespace 2016-03-16 18:05:47 +00:00
Tats
4564c269b0 Fixed: On Ubuntu 15.10 : window geometry not preserved after quit (closes #227). 2016-03-16 13:55:47 -04:00
Tats
ae06d62e13 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2016-03-16 11:35:08 -04:00
Tats
bd2aba7075 Update INSTALL building instructions for Mac OSX. 2016-03-16 11:34:49 -04:00
Tats
c9ff73a744 Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop 2016-03-16 11:16:50 -04:00
Tats
7fd3d70092 Fixed the building script for generating bundled MapMap.app 2016-03-16 11:14:04 -04:00
Tats
a4e4d282ea Passing files to new version 0.4.0 2016-03-16 11:13:39 -04:00
Tats
470b360d14 Reverts commit afb771ba22 which has been fixed by adb076ab12. 2016-03-16 11:03:26 -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
baydam
afb771ba22 Fix compilation error 2016-03-16 10:41:28 +00:00
Bay Dam
c708fc24e4 Preparing for Windows operating system 2016-03-16 11:08:49 +01:00
Tats
0836e904a3 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2016-03-16 01:12:37 -04:00
Tats
448d9e877c Made source and destination panel QWidgets part of the MainWindow class. 2016-03-16 01:12:21 -04:00
Tats
296772d34c Some cleanup in mapmap.qrc. 2016-03-16 01:11:50 -04:00
Tats
a98b164aee Added option on the commandline to force language. 2016-03-16 01:11:38 -04:00
Tats
12a46018fe Fixed error in mapmap.pro related to translations. 2016-03-16 01:11:14 -04:00
Tats
0dd48c3ccb Fixed blocking bug on OSX: program was freezing when move was loaded 2016-03-15 19:19:20 -04:00
Tats
20839efc05 Implemented new feature: holding the shift key while moving a vertex temporarily inverts sticky vertex condition (closes #226). 2016-03-11 10:21:33 -05: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
baydam
df5cf42fdc Revert: circular dependencies of header files on Windows 2016-03-08 17:44:35 +00:00
Bay Dam
41264505eb Fix circular dependencies of header files on Windows 2016-03-08 17:57:47 +01:00
baydam
fce79952c1 Add check state indicator on mapping layers 2016-03-07 18:18:27 +00:00
baydam
92edc569bf Remove margin from source ans destination panel 2016-03-07 13:05:24 +00:00
Tats
4c71e0a707 Fixed bug: paint names were not preserved on filesave. 2016-03-06 12:24:12 -05:00
Tats
7896c24bf5 Fixed problem wrt reordering of layers. 2016-03-06 04:15:06 -05: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
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