eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-09 09:10:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 990250ed13 Cosmetic change. Tats 2016-01-23 14:51:32 -05:00
  • eb38336e16 Insert header may fix compilation error baydam 2016-01-22 09:26:44 +00:00
  • 608f2b6cf5 Started management of QProperties-supported read/write for mappings and shapes. Tats 2016-01-21 21:57:38 -05:00
  • 21cceff534 Moved base read/write functions to Serializable class (to give functionality to MShape). Tats 2016-01-21 21:57:01 -05:00
  • b9f2c80a19 Read/write of Color and Image paint working. Tats 2016-01-21 20:50:44 -05:00
  • d9ae92cfc6 Merge branch 'feature-zoom-control' into develop baydam 2016-01-21 22:24:45 +00:00
  • a892efa860 Adding zoom images to the develop branch baydam 2016-01-21 22:21:33 +00:00
  • 37441401f4 Merge branch 'feature-logging-output' into develop baydam 2016-01-21 21:56:24 +00:00
  • 156e74acd5 Fix:#183 "Display logging output in a console and able to show and hide" baydam 2016-01-21 21:54:34 +00:00
  • 2208468f4e Removed Controller class. Tats 2016-01-21 16:19:19 -05:00
  • 8ec9192f69 Common parent class Element for Paint and Mapping, with appropriate QProperties. Tats 2016-01-21 16:18:59 -05:00
  • c656f8246a Split the shapes in different files and made them all QObjects with QProperties. Tats 2016-01-21 16:18:19 -05:00
  • ba1af4b724 Added a MetaObjectRegistry class that allows the dynamic creation of new instances. Tats 2016-01-21 16:15:08 -05:00
  • efe5c8f02a Improvements of the menu elements baydam 2016-01-20 18:56:39 +00:00
  • a7a56e6e92 Improvements of the menu elements baydam 2016-01-20 16:35:36 +00:00
  • 835d27b7bf Merge branch 'feature-zoom-control' into develop baydam 2016-01-18 15:04:46 +00:00
  • e53ca4581f zoom toolbar margin enhancements baydam 2016-01-18 15:02:50 +00:00
  • d289851890 Merge branch 'feature-zoom-control' into develop baydam 2016-01-15 16:05:25 +00:00
  • ffd9d8aadd Add dropdown menu to show or set zoom level baydam 2016-01-15 16:03:13 +00:00
  • 045c8a1055 Merge branch 'feature-zoom-control' into develop baydam 2016-01-13 20:45:36 +00:00
  • 4e3ccf45d4 Add "zoom in/out/reset and fit to content" buttons baydam 2016-01-13 20:38:43 +00:00
  • b29207ccd7 Fix bug when display undo stack is unchecked baydam 2016-01-12 18:28:24 +00:00
  • d23bc9b826 Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop st-luc-test-3 st-luc-good baydam 2016-01-07 18:42:42 +00:00
  • 5afc6b3cb5 Fix: #181 Image glitch when undo stack not displayed baydam 2016-01-07 18:42:26 +00:00
  • 82faf0e3c8 Added exclusions for moc_ qrc_ and .txt files. Tats 2016-01-07 11:44:26 -05:00
  • f03be893a3 Fix: #159 Handle corrupted files baydam 2016-01-05 18:45:54 +00:00
  • 03a66c5000 Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop baydam 2016-01-05 12:19:38 +00:00
  • 093fb3cd9d Fix: #179 Paints and mappings renamings are now saved in file baydam 2016-01-05 12:10:54 +00:00
  • 99b19dfcc6 First step in refactoring: brought both Paint and Mapping under the common umbrella class Element and implemented basic QProperties. Tats 2016-01-04 00:19:34 -06:00
  • 1b7df1ce3d Cosmetic change. Tats 2015-12-31 16:32:50 -06:00
  • 066337472c Fixed bug related to width and height of videos being 0 (using meta-data collection) (closes #154). Tats 2015-12-31 16:31:19 -06:00
  • c3b57dcfe7 Fixed potentially unfreed QMenu. Tats 2015-12-31 16:01:42 -06:00
  • 6af8c396a2 Cleanup in files and gitignore. Tats 2015-12-31 14:32:43 -06:00
  • 0bd893ee6a Bugfix: Zooming in the destination canvas changes the size of controls in output window. Closes #162. Tats 2015-12-31 14:23:53 -06:00
  • 45a8b536d8 Exclude unused files from doxygen compil Tats 2015-12-31 12:04:46 -06:00
  • 73d87ed08c Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2015-12-31 11:31:33 -06:00
  • b39c91d37a Depth of quads for mesh editing/viewing adjustable. Tats 2015-12-31 11:19:23 -06:00
  • a20beba15b Manage show and hide of Undo Stack tab #145 baydam 2015-12-31 15:46:56 +00:00
  • a7ddd309fb Edit doxygen index file baydam 2015-12-31 13:17:25 +00:00
  • 91840fadec Update doxygen configuration files baydam 2015-12-31 13:04:23 +00:00
  • 61a530375f Be able to rename paints and mappings OSC #72 baydam 2015-12-29 16:44:31 +00:00
  • 73f28ae340 Can rename Paint with double click #174 baydam 2015-12-29 14:36:06 +00:00
  • b2e03da2f2 Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop baydam 2015-12-29 10:35:50 +00:00
  • a4384faf78 Center the test signal #97 baydam 2015-12-29 10:34:52 +00:00
  • 41b1c87283 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2015-12-28 16:25:20 -06:00
  • 442aa6469b Delete unused fonction baydam 2015-12-28 13:28:47 +00:00
  • e0c53be751 Imperfect fix of ellipse conical projection (works better but still perspectively incorrect) (enhancement #177). Tats 2015-12-28 16:20:03 -06:00
  • 4aa674847c Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2015-12-28 16:20:11 -06:00
  • 1b582f2f58 Imperfect fix of ellipse conical projection (works better but still perspectively incorrect) (enhancement #117). Tats 2015-12-28 16:20:03 -06:00
  • 60ca853956 Cleanup in Shape.h. Tats 2015-12-28 15:28:32 -06:00
  • 00523e15e3 Documentation of MeshTextureGraphicsItem Tats 2015-12-28 15:28:19 -06:00
  • 23847b86ed Delete unused fonction baydam 2015-12-28 13:28:47 +00:00
  • b30d2fac05 Fix merge conflict baydam 2015-12-28 13:24:56 +00:00
  • 390d4c49ec Small fix: all meshes were getting rebuilt after any one of them was being dropped somewhere. Tats 2015-12-26 23:38:41 -05:00
  • fc627b2306 Compilation errors fix in MainWindow. Tats 2015-12-26 19:25:37 -05:00
  • 02f411bc0e Further improvements on mesh drawing performance: resolution is heightened on mouse release while during edit resolution is kept lower (closes #161). Tats 2015-12-26 19:25:16 -05:00
  • 9235ec1874 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2015-12-26 02:52:20 -05:00
  • c67b4d3160 Improvements on the mesh drawing by caching the structure (bug #161). Tats 2015-12-26 02:52:06 -05:00
  • 61528b3701 Fix merge bugs baydam 2015-12-24 19:17:10 +00:00
  • 5854c2f5a3 Merge branch 'baydam-feature-osc-improve' into develop baydam 2015-12-24 18:52:32 +00:00
  • 038a705e5d Resolve merge conflicts baydam 2015-12-24 18:51:59 +00:00
  • eb9a024635 Merge branch 'refactor-mapper-mapping-gui' into develop Tats 2015-12-23 19:15:29 -05:00
  • e3cdf4f464 Moved classes pertaining to ShapeGraphicsItem and ShapeControlPainter in separate files outside of MappingGui.{h,cpp}. refactor-mapper-mapping-gui Tats 2015-12-23 19:14:39 -05:00
  • 41036354b8 Able to rename mapping with double click baydam 2015-12-18 12:54:36 +00:00
  • 13a7eb01e3 Reduce default size for small screen baydam 2015-12-14 22:33:44 +00:00
  • 66fc373e7b Fixed bug #101 Sending OSC visible parameter to paint that doesn't exist will not crash the software anymore baydam 2015-12-14 15:14:05 +00:00
  • bafd700a1c Change shortcut for adding color paint #137 baydam 2015-12-11 23:32:10 +00:00
  • cf62a6cfc5 Handle fullscreen case for cinnamon(Linux Mint) baydam 2015-12-11 18:47:22 +00:00
  • 2db0d044a4 Reduce icon size for small screen baydam 2015-12-11 18:41:39 +00:00
  • 596e8d55ca Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop baydam 2015-12-11 11:27:06 +00:00
  • ae81c60ca0 Center the Test signal, fixed bug #155 and #97 baydam 2015-12-11 11:25:03 +00:00
  • e76bdf1d9f Renamed Mapper to MappingGui (to correspond to Paint -> PaintGui). Tats 2015-12-11 00:43:47 -05:00
  • cf310dd45c Added comments to PaintGui Tats 2015-12-10 16:54:53 -05:00
  • 3a4f80c49f Fixed bug #156 related the white rectangle around the fullscreen window baydam 2015-12-09 19:47:01 +00:00
  • 317d87b2dd Fixed bug #149 Deleting a mapping actually deletes a paint when the paint tab is chosen baydam 2015-12-09 18:30:39 +00:00
  • 4aa71c1fb3 Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop baydam 2015-12-08 16:00:05 +00:00
  • df6d56abd0 Fixed bug #152 that make the software frozen when we load a project and the video files are not found baydam 2015-12-08 15:44:52 +00:00
  • 23e85c1794 Fixed bug #154 that make the software frozen when we load a project and the video files are not found baydam 2015-12-08 15:44:52 +00:00
  • 59513455db Fixed a bug #153 and #140 related to crosshair ecole-st-luc baydam 2015-12-03 13:09:01 +00:00
  • cc7b6aef6f Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2015-12-02 21:29:56 -05:00
  • 1847881b04 Major cleanup and documenting of classes. Tats 2015-12-02 21:29:46 -05:00
  • 7b3084ed29 Major cleanup and documenting of Mapper.{h,cpp}. Tats 2015-12-02 10:24:01 -05:00
  • c216ed14f9 update NEWS Alexandre Quessy 2015-10-30 15:39:06 -04:00
  • a01aed4f7a post-release version bump Alexandre Quessy 2015-10-30 15:27:33 -04:00
  • 8e84b1dde6 Merge branch 'develop' 0.3.1 Alexandre Quessy 2015-10-30 15:25:17 -04:00
  • d9220c50d0 update NEWS Alexandre Quessy 2015-10-30 15:24:55 -04:00
  • 936161fc8c Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Alexandre Quessy 2015-10-30 15:22:25 -04:00
  • 8e51dfd3b5 less datasheet Alexandre Quessy 2015-10-30 15:22:07 -04:00
  • d660a94424 more TODO Alexandre Quessy 2015-10-30 15:21:51 -04:00
  • c7c537dbc0 some more comments Alexandre Quessy 2015-10-29 17:03:48 -04:00
  • bd47c8ac6c tell how to delete prefs on os x Alexandre Quessy 2015-10-29 17:03:34 -04:00
  • f3c24dbeb0 Fix typos in a print Alexandre Quessy 2015-10-29 17:03:19 -04:00
  • 3d1eb86405 ignore DMGVERSION.txt Alexandre Quessy 2015-10-29 14:11:42 -04:00
  • 7bd515c423 update INSTALL with newer GStreamer for OS X Alexandre Quessy 2015-10-29 13:39:51 -04:00
  • a0d8ddd504 update INSTALL Alexandre Quessy 2015-10-28 16:13:30 -04:00
  • 0313f5b1f7 Add OSC support on OS X Alexandre Quessy 2015-10-28 16:12:48 -04:00
  • e7a137f590 towards adding liblo on OS X Alexandre Quessy 2015-10-28 15:40:13 -04:00
  • 85b10d083a Fix video not playing + memleak in MediaImpl Alexandre Quessy 2015-10-27 11:19:02 -04:00
  • 7dd91defc3 update NEWS Alexandre Quessy 2015-10-27 10:32:12 -04:00
  • 3f9176974b Fix Stylesheet is not applied when the app is installed on Linux #139 Alexandre Quessy 2015-10-27 10:31:40 -04:00