 baydam
|
d9ae92cfc6
|
Merge branch 'feature-zoom-control' into develop
|
2016-01-21 22:24:45 +00:00 |
|
|
baydam
|
a892efa860
|
Adding zoom images to the develop branch
|
2016-01-21 22:21:33 +00:00 |
|
|
baydam
|
37441401f4
|
Merge branch 'feature-logging-output' into develop
|
2016-01-21 21:56:24 +00: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 |
|
|
baydam
|
efe5c8f02a
|
Improvements of the menu elements
|
2016-01-20 18:56:39 +00:00 |
|
|
baydam
|
a7a56e6e92
|
Improvements of the menu elements
|
2016-01-20 16:35:36 +00:00 |
|
|
baydam
|
835d27b7bf
|
Merge branch 'feature-zoom-control' into develop
|
2016-01-18 15:04:46 +00:00 |
|
|
baydam
|
e53ca4581f
|
zoom toolbar margin enhancements
|
2016-01-18 15:02:50 +00:00 |
|
|
baydam
|
d289851890
|
Merge branch 'feature-zoom-control' into develop
|
2016-01-15 16:05:25 +00:00 |
|
|
baydam
|
ffd9d8aadd
|
Add dropdown menu to show or set zoom level
|
2016-01-15 16:03:13 +00:00 |
|
|
baydam
|
045c8a1055
|
Merge branch 'feature-zoom-control' into develop
|
2016-01-13 20:45:36 +00:00 |
|
|
baydam
|
4e3ccf45d4
|
Add "zoom in/out/reset and fit to content" buttons
|
2016-01-13 20:38:43 +00:00 |
|
|
baydam
|
b29207ccd7
|
Fix bug when display undo stack is unchecked
|
2016-01-12 18:28:24 +00:00 |
|
|
baydam
|
d23bc9b826
|
Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop
|
2016-01-07 18:42:42 +00:00 |
|
|
baydam
|
5afc6b3cb5
|
Fix: #181 Image glitch when undo stack not displayed
|
2016-01-07 18:42:26 +00:00 |
|
|
Tats
|
82faf0e3c8
|
Added exclusions for moc_ qrc_ and .txt files.
|
2016-01-07 11:44:26 -05:00 |
|
|
baydam
|
f03be893a3
|
Fix: #159 Handle corrupted files
|
2016-01-05 18:45:54 +00:00 |
|
|
baydam
|
03a66c5000
|
Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop
|
2016-01-05 12:19:38 +00:00 |
|
|
baydam
|
093fb3cd9d
|
Fix: #179 Paints and mappings renamings are now saved in file
|
2016-01-05 12:10:54 +00:00 |
|
|
Tats
|
1b7df1ce3d
|
Cosmetic change.
|
2015-12-31 16:32:50 -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
|
c3b57dcfe7
|
Fixed potentially unfreed QMenu.
|
2015-12-31 16:01:42 -06:00 |
|
|
Tats
|
6af8c396a2
|
Cleanup in files and gitignore.
|
2015-12-31 14:32:43 -06:00 |
|
|
Tats
|
0bd893ee6a
|
Bugfix: Zooming in the destination canvas changes the size of controls in output window. Closes #162.
|
2015-12-31 14:23:53 -06:00 |
|
|
Tats
|
45a8b536d8
|
Exclude unused files from doxygen compil
|
2015-12-31 12:04:46 -06:00 |
|
|
Tats
|
73d87ed08c
|
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
|
2015-12-31 11:31:33 -06:00 |
|
|
Tats
|
b39c91d37a
|
Depth of quads for mesh editing/viewing adjustable.
|
2015-12-31 11:19:23 -06:00 |
|
|
baydam
|
a20beba15b
|
Manage show and hide of Undo Stack tab #145
|
2015-12-31 15:46:56 +00:00 |
|
|
baydam
|
a7ddd309fb
|
Edit doxygen index file
|
2015-12-31 13:17:25 +00:00 |
|
|
baydam
|
91840fadec
|
Update doxygen configuration files
|
2015-12-31 13:04:23 +00:00 |
|
|
baydam
|
61a530375f
|
Be able to rename paints and mappings OSC #72
|
2015-12-29 16:44:31 +00:00 |
|
|
baydam
|
73f28ae340
|
Can rename Paint with double click #174
|
2015-12-29 14:36:06 +00:00 |
|
|
baydam
|
b2e03da2f2
|
Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop
|
2015-12-29 10:35:50 +00:00 |
|
|
baydam
|
a4384faf78
|
Center the test signal #97
|
2015-12-29 10:34:52 +00:00 |
|
|
Tats
|
41b1c87283
|
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
Conflicts:
MainWindow.cpp
|
2015-12-28 16:25:20 -06:00 |
|
|
baydam
|
442aa6469b
|
Delete unused fonction
|
2015-12-28 16:24:28 -06:00 |
|
|
Tats
|
e0c53be751
|
Imperfect fix of ellipse conical projection (works better but still perspectively incorrect) (enhancement #177).
|
2015-12-28 16:24:22 -06:00 |
|
|
Tats
|
4aa674847c
|
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
|
2015-12-28 16:20:11 -06:00 |
|
|
Tats
|
1b582f2f58
|
Imperfect fix of ellipse conical projection (works better but still perspectively incorrect) (enhancement #117).
|
2015-12-28 16:20:03 -06:00 |
|
|
Tats
|
60ca853956
|
Cleanup in Shape.h.
|
2015-12-28 15:28:32 -06:00 |
|
|
Tats
|
00523e15e3
|
Documentation of MeshTextureGraphicsItem
|
2015-12-28 15:28:19 -06:00 |
|
|
baydam
|
23847b86ed
|
Delete unused fonction
|
2015-12-28 13:28:47 +00:00 |
|
|
baydam
|
b30d2fac05
|
Fix merge conflict
|
2015-12-28 13:24:56 +00:00 |
|
|
Tats
|
390d4c49ec
|
Small fix: all meshes were getting rebuilt after any one of them was being dropped somewhere.
|
2015-12-26 23:38:41 -05:00 |
|
|
Tats
|
fc627b2306
|
Compilation errors fix in MainWindow.
|
2015-12-26 19:25:37 -05:00 |
|
|
Tats
|
02f411bc0e
|
Further improvements on mesh drawing performance: resolution is heightened on mouse release while during edit resolution is kept lower (closes #161).
|
2015-12-26 19:25:16 -05:00 |
|
|
Tats
|
9235ec1874
|
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
|
2015-12-26 02:52:20 -05:00 |
|
|
Tats
|
c67b4d3160
|
Improvements on the mesh drawing by caching the structure (bug #161).
|
2015-12-26 02:52:06 -05:00 |
|
|
baydam
|
61528b3701
|
Fix merge bugs
|
2015-12-24 19:17:10 +00:00 |
|
|
baydam
|
5854c2f5a3
|
Merge branch 'baydam-feature-osc-improve' into develop
|
2015-12-24 18:52:32 +00:00 |
|