Commit Graph

Select branches

Hide Pull Requests

0.1

0.2

0.3

0.4

0.5

0.6

add-clang-format

bugfix-file-dialog

bugfix-refactor-mediaimpl

bugfix-video-memory-leaks

check-qt-5.4

check-qt-5.4-rebased

claude/fix-github-actions-g1BuZ

dev

develop-rebase-fix-osx-june-2014

ecole-st-luc

feat-scripts-build-macos

feature-merge-vliaskov-shmsrcbin

feature-opengl-transparency

feature-oscpack

feature-refactor-gui-organization

feature-zoom-and-scroll

feature-zoom-and-scroll-naive-implementation

feature/camera-support

feature/group-and-multiple-select

feature/qt-properties

feature/qtmultimedia

feature/qtmultimedia-spike-videoprobe

feature/syphon

feature/transform-shape-gui

feature/video-thumbnails

fix-video-not-displaying

fix_305_merge_menus

fullscreen

gst-osx

gui-controls-refactor

mac-bundle

macOS_ApplicationIcon

macos_gstreamer_326

master

menu-toolbar-qaction-different-qicon

mike-style-integration

mire

multi-image-loop-texture

osx-fix-june-2014

output-window

play-pause-rewind

port-opengles-odroid

raspbian

rc0.5

refactor-mapper-gl

refactor-mapper-mapping-gui

release-0.3.0

release-0.6.0

remove-paints-mappings

setup/dakar-bideew-show-2016

spike-qgraphicsview-zoom-and-scroll-merge-develop

spike-refactor-scene-vs-control-points

spike-video-drone

st-luc-good

st-luc-test-3

video

#116

#121

#175

#265

#360

#362

#363

#364

#390

#391

#392

#446

#463

#478

#488

#489

#491

#495

#496

#500

#501

#502

#517

#518

#519

#526

#553

#553

#573

#573

#574

#575

#576

#577

#578

#579

#580

#581

#583

#584

#588

#590

#590

#591

#592

#607

#608

#609

#610

#611

#612

#613

#615

#616

#616

0.1.0

0.1.1

0.2.0

0.3.0

0.3.1

0.4.0

0.5.0

0.6.0

0.6.1

0.6.2

Mono Color

• b21c46b3d2 Fixed bug wrt wheel event scrolling (contains a compat. fix for Qt5/Qt4.8) (closes #198). Tats 2016-02-11 14:26:01 -05:00
• acffd5f75a Add a macro to check for Qt >= 5.5 baydam 2016-02-09 12:04:21 +00:00
• 18e00e5cbe Add a macro to check for Qt >= 5.5 baydam 2016-02-09 12:01:40 +00:00
• b3065af6ba Add a macro to check for Qt >= 5.5 baydam 2016-02-09 11:52:16 +00:00
• 5c66fa1b8d User can show or hide toolbar baydam 2016-02-08 19:08:37 +00:00
• d1af8b4208 Now we are able to show and hide menubar with ALT key baydam 2016-02-08 16:20:45 +00:00
• 685e422ed2 Merge branch 'ux-document-implements' into develop baydam 2016-02-05 18:25:08 +00:00
• d889a6c616 Output window is fullscreen only if a video projector is connected or not visible baydam 2016-02-05 18:17:47 +00:00
• ce74dace68 Reorder the toolbar icons baydam 2016-02-04 20:45:31 +00:00
• f4d0e6bd6a Merge import media and image actions baydam 2016-02-04 18:28:08 +00:00
• 9fbb31d949 Switch between vertex to turn them active with Shift+Space shortcut baydam 2016-02-04 16:47:22 +00:00
• 03eec503fc Able to speed up shifting of active vertex with SHIFT+ArrowKey baydam 2016-02-04 14:02:08 +00:00
• 9c5deae1d7 Refresh View at startup baydam 2016-02-04 13:41:05 +00:00
• 35ab79eb57 Translate the view with arrows keys and increase moving speed baydam 2016-02-04 13:30:17 +00:00
• 3238efbdb4 Fix: #199 zoom toolbar moved into the visible area baydam 2016-02-03 13:14:25 +00:00
• e9a64540df Merge branch 'feature-zoom-control' into develop baydam 2016-02-03 00:41:01 +00:00
• 39ccd56eef Fix: #197 Put the zoom toolbar in the bottom-right corner baydam 2016-02-03 00:40:12 +00:00
• 1180c310a2 Merge branch 'feature-logging-output' into develop baydam 2016-02-02 18:50:32 +00:00
• 6c723fddd9 Make the console and the application more readable baydam 2016-02-02 18:35:47 +00:00
• cb07e630a2 Added CTRL+= for zoom-in (closes #192). Tats 2016-01-30 18:57:19 -05:00
• eeca30197a Fix zoom in key not working baydam 2016-01-30 23:30:11 +00:00
• 8dc7177ae9 Read/write of texture mappings for triangle and ellipses works. Tats 2016-01-28 21:52:47 -05:00
• 7c95971da0 Fixed error where coordinates were saved with a "," instead of a "." to represent fractions. Tats 2016-01-28 12:28:50 -05:00
• cf11335c1d Implemented parsing of mappings and shapes. Tats 2016-01-28 12:28:19 -05:00
• f6fc556b3e Generalized the constructors for Mapping to always allow input shape (making it more general). Tats 2016-01-28 12:27:45 -05:00
• c45a1179e5 Made Ellipse base constructor invokable to fix error when loading. Tats 2016-01-28 12:26:50 -05:00
• 7d9d1d3e16 Update list of copyright owners in MM.cpp Alexandre Quessy 2016-01-27 11:10:57 -05:00
• 9b528e6549 update credits in README Alexandre Quessy 2016-01-27 11:08:40 -05:00
• e52e929108 Add a macro to check for Qt >= 5.4 check-qt-5.4-rebased Alexandre Quessy 2016-01-26 23:54:47 -05:00
• 948c27e6bb Add more macros to check for Qt >= 5.4 check-qt-5.4 Alexandre Quessy 2016-01-27 10:33:18 -05:00
• 1708311fd8 Add a macro to check for Qt >= 5.4 Alexandre Quessy 2016-01-26 23:54:47 -05:00
• 6c9ab74b05 Update NEWS Bay Dam 2016-01-26 16:35:24 +00:00
• a98193c116 Close all top level window when the main window is closed baydam 2016-01-25 19:53:47 +00:00
• dbaf77578d Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2016-01-23 14:52:50 -05:00
• fe848a6355 Added actions directly to the MainWindow to allow top-level use of hot keys (closes #40). Tats 2016-01-23 14:52:40 -05:00
• 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