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

dev

develop-rebase-fix-osx-june-2014

ecole-st-luc

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

#588

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

• 2c7dd61048 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Alexandre Quessy 2016-04-19 11:42:32 -04:00
• f5c0c8a221 Mention of removing unused fonctions in TODO entries baydam 2016-04-19 15:42:18 +00:00
• c08733df8e reduce the size of the splash screen image baydam 2016-04-19 12:56:25 +00:00
• f4f5f14c3f The menu bar is not become visible when the main windows receive focus (untesting on Ubuntu) baydam 2016-04-19 11:55:15 +00:00
• 1b09dd08d8 Can undo or redo Add/Remove paint baydam 2016-04-15 13:05:34 +00:00
• a3355d86be Fix: #240 Allow easy switch between destination+source, destination-only and source-only views baydam 2016-04-14 17:27:01 +00:00
• 4481ed4be5 update blackmagic prototype Alexandre Quessy 2016-04-13 14:48:25 -04:00
• af917de543 Fix style issues on some plateforme baydam 2016-04-13 18:26:26 +00:00
• 8c3b2dc47a Fix build script for cairo overlay prototype Alexandre Quessy 2016-04-13 13:15:26 -04:00
• 8548ee3b67 add a blackmagic prototype Alexandre Quessy 2016-04-13 12:57:23 -04:00
• 72472239f1 add a basic cairo overlay prototype Alexandre Quessy 2016-04-13 12:53:08 -04:00
• cdae273873 update splash.png Alexandre Quessy 2016-04-11 17:05:33 -04:00
• b393b1d556 Update gitignore file baydam 2016-04-05 12:37:25 +00:00
• 9a4110dec1 Update INSTALL file for Archlinux specification baydam 2016-03-31 13:28:50 +00:00
• edb80d8edf Cosmetic changes. Tats 2016-03-26 19:47:33 -04:00
• 61dcef5db1 Automatically move output screen to secondary screen (untested). Tats 2016-03-26 19:47:05 -04:00
• 6d7d5c8b55 Removed unused close event management. Tats 2016-03-26 19:41:26 -04:00
• 6f9fde311f Fixed bug: ESC key would not work properly to exit full screen. Tats 2016-03-26 19:40:51 -04:00
• 512f30d1a6 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2016-03-26 18:20:08 -04:00
• 14fd387c68 Bug fix: display test signal was wrongly managed in settings readings. Tats 2016-03-26 18:19:31 -04:00
• efea658001 Manage properly the state saving/reloading of display output, test and controls. Tats 2016-03-26 18:19:06 -04:00
• eca2e881d9 Manage properly fullscreen in OutputGLWindow: it was possible to have the window without the fullscreen, which caused issues in some circumstances. Tats 2016-03-26 18:17:57 -04:00
• 4c5e104b46 Removed implicit shortcuts for menus (they were conflicting with other ALT+ based shortcuts). Tats 2016-03-26 18:15:47 -04:00
• fcf4c51193 Moved crosshair check into OutputGLWindow. Tats 2016-03-26 18:15:18 -04:00
• 2bb758b4c6 Moved display of test signal into OutputGLCanvas where it belongs. Tats 2016-03-26 18:13:06 -04:00
• 94211340b5 Preparing for windows package Bay Dam 2016-03-26 18:34:22 +01:00
• 5f2157f0c2 Fixed: Destination zoom toolbar was left unactivated. Tats 2016-03-26 13:27:42 -04:00
• d82cd5152f Fixed: The position of the mappings from a loaded project is never right (closes #194). Tats 2016-03-26 13:27:18 -04:00
• 0726edbfa1 Cleanup. Tats 2016-03-26 13:21:40 -04:00
• 0ed995e6a9 Fixed: It should be possible to have an output window when using a single screen (closes #209). Tats 2016-03-26 12:58:19 -04:00
• 86a5ef7cbe Create LICENSE Bay Dam 2016-03-25 18:31:10 +01:00
• 34bb866a98 Mapping list context menu improvements baydam 2016-03-25 17:02:05 +00:00
• 69d1b7840a Set application icon baydam 2016-03-24 21:22:39 +00:00
• 37ce6e6cee remove MainWindow event filter baydam 2016-03-22 23:02:42 +00:00
• aadbcb42ce Can reorder mapping by drag & drop baydam 2016-03-22 22:24:57 +00:00
• 5a83f15c9e Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2016-03-17 16:05:11 -04:00
• 345643bad1 Fixed: Flickering video images when loading from the commandline (closes #218). Tats 2016-03-17 16:05:03 -04:00
• 64c3d92705 Able to show or hide canvases zoom toolbars baydam 2016-03-17 13:59:22 +00:00
• 3e04d19797 Fixed: Introduction of namespace had broken compatibility with file format. Tats 2016-03-16 20:15:49 -04:00
• f02933d9a4 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2016-03-16 17:28:45 -04:00
• 8421c87cd4 Added OSC support for play, pause, and rewind. Tats 2016-03-16 17:28:33 -04:00
• ae88f9d8fb Fix some name space conflicts Bay Dam 2016-03-16 22:18:57 +01:00
• b375367811 Integrate all code inside a namespace baydam 2016-03-16 18:05:47 +00:00
• 4564c269b0 Fixed: On Ubuntu 15.10 : window geometry not preserved after quit (closes #227). Tats 2016-03-16 13:55:47 -04:00
• ae06d62e13 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2016-03-16 11:35:08 -04:00
• bd2aba7075 Update INSTALL building instructions for Mac OSX. Tats 2016-03-16 11:34:49 -04:00
• c9ff73a744 Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop Tats 2016-03-16 11:16:50 -04:00
• 7fd3d70092 Fixed the building script for generating bundled MapMap.app Tats 2016-03-16 11:14:04 -04:00
• a4e4d282ea Passing files to new version 0.4.0 Tats 2016-03-16 11:13:39 -04:00
• 470b360d14 Reverts commit afb771ba22 which has been fixed by adb076ab12. Tats 2016-03-16 11:03:26 -04:00
• 7b7f0639b0 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2016-03-16 10:57:14 -04:00
• adb076ab12 Integrated the lrelease process of *.ts to *.qm to avoid "RCC: Error in 'mapmap.qrc': Cannot find file 'mapmap_fr.qm'" errors. Tats 2016-03-16 10:56:46 -04:00
• afb771ba22 Fix compilation error baydam 2016-03-16 10:41:28 +00:00
• c708fc24e4 Preparing for Windows operating system Bay Dam 2016-03-16 11:08:34 +01:00
• 0836e904a3 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2016-03-16 01:12:37 -04:00
• 448d9e877c Made source and destination panel QWidgets part of the MainWindow class. Tats 2016-03-16 01:12:21 -04:00
• 296772d34c Some cleanup in mapmap.qrc. Tats 2016-03-16 01:11:50 -04:00
• a98b164aee Added option on the commandline to force language. Tats 2016-03-16 01:11:38 -04:00
• 12a46018fe Fixed error in mapmap.pro related to translations. Tats 2016-03-16 01:11:14 -04:00
• 0dd48c3ccb Fixed blocking bug on OSX: program was freezing when move was loaded Tats 2016-03-15 19:19:20 -04:00
• 20839efc05 Implemented new feature: holding the shift key while moving a vertex temporarily inverts sticky vertex condition (closes #226). Tats 2016-03-11 10:21:33 -05:00
• 7b5fe0c7e9 Fix compilation error Bay Dam 2016-03-10 17:41:05 +01:00
• 0c093eefe3 Update Linux spec in pro file baydam 2016-03-10 16:12:32 +00:00
• 706f40309a Fix circular dependencies on Windows Bay Dam 2016-03-10 17:09:12 +01:00
• df5cf42fdc Revert: circular dependencies of header files on Windows baydam 2016-03-08 17:44:35 +00:00
• 41264505eb Fix circular dependencies of header files on Windows Bay Dam 2016-03-08 17:57:47 +01:00
• fce79952c1 Add check state indicator on mapping layers baydam 2016-03-07 18:18:27 +00:00
• 92edc569bf Remove margin from source ans destination panel baydam 2016-03-07 13:05:24 +00:00
• 4c71e0a707 Fixed bug: paint names were not preserved on filesave. Tats 2016-03-06 12:24:12 -05:00
• 7896c24bf5 Fixed problem wrt reordering of layers. refactor-mapper-gl Tats 2016-03-06 04:15:06 -05:00
• 84ebb9d3ad Moved the zoom toolbar into a separate widget class, added them in the right spots and made them correctly interoperate with the canvases. Tats 2016-03-06 01:22:34 -05:00
• 28261033c6 Removed DestinationGLCanvas and SourceGLCanvas which were not doing much: integrated them directly in MapperGLCanvas. Tats 2016-03-06 00:43:01 -05:00
• 35cbe281c0 Fixed segfault when loading a file: trying to call setLocked() on a non-existing shape. Tats 2016-03-06 00:24:43 -05:00
• 64f2874a14 Found a temporary workaround to support reordering of mappings. Tats 2016-03-06 00:23:58 -05:00
• 689dc0b306 Rename MM::MuteColunm to MM::HideColumn. Tats 2016-03-06 00:23:29 -05:00
• 038a0e7e55 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2016-03-05 22:47:33 -05:00
• 3d58c92e97 Merge branch 'feature-advanced-mapping-list' into develop-try-to-merge-with-adv Tats 2016-03-05 22:41:41 -05:00
• ab9478c4c2 The fullscreen button is activated only in dual screen mode baydam 2016-03-06 03:04:11 +00:00
• 9644b636be Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2016-03-05 21:47:39 -05:00
• fd92154e95 Small cleanup. Tats 2016-03-05 21:42:00 -05:00
• bddcf15c0b Cleanup (including passing gstreamer and std::cout printouts to QDebug). Tats 2016-03-05 21:41:45 -05:00
• afaccacd26 Fix shortcut propagation baydam 2016-03-06 02:41:22 +00:00
• 30db5dcc72 Fix: #143 "The output window should provide the same menus and shortcuts as the main window" baydam 2016-03-06 01:35:55 +00:00
• 17e4353b4f Fix: #143 "The output window should provide the same menus and shortcuts as the main window" baydam 2016-03-06 01:34:41 +00:00
• 61de7911b7 Decrease verbosity in VideoImpl.cpp Alexandre Quessy 2016-03-05 20:04:34 -05:00
• e7b95cd8f4 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2016-03-05 19:46:04 -05:00
• 0c2de092bd Fixed compilation error wrt shortcuts. Tats 2016-03-05 19:45:58 -05:00
• aec2dba6b8 use qDebug for logging Alexandre Quessy 2016-03-05 19:36:05 -05:00
• 5a56e1bba6 fix a syntax error Alexandre Quessy 2016-03-05 19:32:28 -05:00
• fa6a88e87f Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Alexandre Quessy 2016-03-05 19:12:36 -05:00
• bf256e60e6 remove translate shortcuts - See issue #200 Alexandre Quessy 2016-03-05 19:12:16 -05:00
• 2429728e49 Removed drawControls*() methods in Utils.h which are not used anymore. Tats 2016-03-05 18:16:49 -05:00
• e5f73277b2 Removed unused items to prevent compilation warnings. Tats 2016-03-05 18:15:57 -05:00
• 97ff5ff47d Fixed: Paint and mapping renamings are not saved in file (closes #179). Tats 2016-03-05 17:07:46 -05:00
• fcbc1b3aef Arranged name properties in Element.cpp. Tats 2016-03-05 16:56:31 -05:00
• f6ec081334 Save id in attributes in state saving. Tats 2016-03-05 15:12:46 -05:00
• 35b74c8d1f Renamed source and destination tags to appropriate names. Tats 2016-03-05 15:09:56 -05:00
• a41b05693a Compilation error fix. Tats 2016-03-05 14:12:12 -05:00
• ee5133a48a Fixed bug: when reloading video it was badly positioned. Tats 2016-03-05 14:11:56 -05:00
• 218de01f6e Some cleanup performed related to reverse playback #216. Tats 2016-03-05 13:45:51 -05:00