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

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

• ed57b7039d Update GitHub Sponsors usernames in FUNDING.yml dev Alexandre Quessy 2026-01-09 16:46:31 -05:00
• 21304c3e2a Update GitHub Sponsors username in FUNDING.yml Alexandre Quessy 2026-01-09 16:34:12 -05:00
• d1e063449e Update README, CONTRIBUTING and CI for Linux Alexandre Quessy 2026-01-09 15:04:39 -05:00
• dde2acf4eb Warning message wrt MapMap not maintained anymore. add-clang-format Sofian Audry 2022-10-06 12:24:34 -04:00
• 2099ce0663 Update fileedit.cpp Michaël Creusy 2020-12-26 10:50:10 -03:00
• 801b00918b Fix build on GCC 10 Desone Burns II 2020-10-02 16:45:29 -07:00
• eeb07756d3 Install message handler after instanciating MainApplication Peter Urban 2020-10-20 17:34:04 +02:00
• fac1cbd6e7 Update README with Github Action badges Alexandre Quessy 2020-05-16 06:40:46 -04:00
• 0571a1dc71 fix branch name in github workflows Alexandre Quessy 2020-05-16 06:36:23 -04:00
• 089c7f9133 Create qt-windows.yml Alexandre Quessy 2020-05-16 06:33:58 -04:00
• 6dce0f4072 Create qt-linux.yml Alexandre Quessy 2020-05-16 06:33:09 -04:00
• c01a7668a4 Create qt-macos.yml Alexandre Quessy 2020-05-16 06:32:11 -04:00
• 057c9ba1f1 Fix spelling and trailing white spaces (#502) Antonio 2020-04-29 14:18:29 +01:00
• 774022b336 Update INSTALL.md Bay Dam 2020-04-16 12:12:33 +00:00
• 8ab1780501 Improve loading speed of the keyboard shortcut baydam 2020-04-15 20:36:01 +00:00
• 280f3c5cf7 Update Windows 10 build instructions baydam 2020-04-15 18:14:03 +00:00
• f77c52aee6 Reorganized order of action items and added new operation items to edit menu. Sofian Audry 2020-04-15 12:37:48 -04:00
• 4e0e84f597 Cleanup. Sofian Audry 2020-04-15 12:25:28 -04:00
• 3c665be8e7 Update appveyor.yml Bay Dam 2020-04-15 14:10:27 +00:00
• 23887dc0e5 Update appveyor.yml Bay Dam 2020-04-15 14:09:30 +00:00
• 2e57df54b3 Update appveyor.yml Bay Dam 2020-04-15 14:01:48 +00:00
• 5cf9ea6983 Update appveyor.yml Bay Dam 2020-04-15 14:00:57 +00:00
• 0fe4f2b33f Update .travis.yml Bay Dam 2020-04-15 13:48:35 +00:00
• 33396a0f33 Update appveyor.yml Bay Dam 2020-04-15 13:34:39 +00:00
• 58c10fd356 Update .travis.yml Bay Dam 2020-04-15 13:23:49 +00:00
• 35cfc11ef5 Update .travis.yml Bay Dam 2020-04-15 13:07:18 +00:00
• 6d880745b9 Update appveyor.yml Bay Dam 2020-04-15 12:58:40 +00:00
• b739af6b26 Update .travis.yml Bay Dam 2020-04-15 12:55:15 +00:00
• 94f5bbf54b Update .travis.yml Bay Dam 2020-04-15 12:37:51 +00:00
• 2f6f99e6e4 Update .travis.yml Bay Dam 2020-04-15 12:23:41 +00:00
• a31b6726fc Update .travis.yml Bay Dam 2020-04-15 12:13:33 +00:00
• 42b57fc0e4 Update .travis.yml Bay Dam 2020-04-15 12:08:21 +00:00
• b2bcfa533b Fixed: Selecting a shape adds a move action to the undo stack (closes #497). Sofian Audry 2020-04-14 13:38:04 -04:00
• 49e90ca2b3 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Sofian Audry 2020-04-10 12:37:45 -04:00
• 579698d34a Fix issue #499 related to Qt version check Bay Dam 2020-04-08 18:49:59 +00:00
• 67ab751b6e Fixed bug: click was privileging shapes that were under (lower/deeper). Sofian Audry 2020-04-08 14:02:27 -04:00
• 469b35a0a9 Removed useless debug message Sofian Audry 2020-04-08 13:46:58 -04:00
• afc166107d Update instruction that help to fix issue #498 Bay Dam 2020-04-08 15:08:55 +00:00
• 5fe638b11a Merge remote-tracking branch 'origin/develop' into develop Sofian Audry 2020-04-08 10:10:46 -04:00
• d89b617ddd Added contextual menus for reorder actions: raise, lower, etc. (closes # #296). Sofian Audry 2020-04-08 10:10:25 -04:00
• cedc9dda81 Merge pull request #496 from baydam/develop Bay Dam 2020-04-06 21:00:31 +00:00
• e2d18c4e59 Improve Qt version check baydam 2020-04-06 20:51:43 +00:00
• 2e719cc221 Merge pull request #495 from baydam/develop Bay Dam 2020-04-06 20:22:31 +00:00
• a12de1b3cb Update .travis.yml Bay Dam 2020-04-06 17:29:29 +00:00
• c8efa43718 Update .travis.yml Bay Dam 2020-04-06 17:17:56 +00:00
• 0ae2147607 Update .travis.yml Bay Dam 2020-04-06 17:12:10 +00:00
• e856179f59 Attempted fix of Linux travis build check Bay Dam 2020-04-06 17:08:24 +00:00
• 567cf68c07 Add Qt version check in About dialog baydam 2020-04-06 20:18:49 +00:00
• 77fce4a445 Update .travis.yml Bay Dam 2020-04-06 17:29:29 +00:00
• 45b6d3d51a Update .travis.yml Bay Dam 2020-04-06 17:17:56 +00:00
• 391785fe23 Update .travis.yml Bay Dam 2020-04-06 17:12:10 +00:00
• e591da84c7 Attempted fix of Linux travis build check Bay Dam 2020-04-06 17:08:24 +00:00
• e2ef8a5e48 Fix Merge conflict branch 'develop' of https://github.com/mapmapteam/mapmap into develop baydam 2020-04-03 17:31:26 +00:00
• e17fa5158c Add keyboard shortcut window in the help menu baydam 2020-04-03 17:26:38 +00:00
• 656d4c825f Merge pull request #491 from mapmapteam/feature-oscpack Sofian Audry 2020-04-02 10:20:22 -04:00
• 2af0c5e555 Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop baydam 2020-04-02 12:07:48 +00:00
• b5b751faa3 Merge branch 'feature-oscpack' of github.com:mapmapteam/mapmap into develop Sofian Audry 2020-04-01 21:04:08 -04:00
• 213786465a Implement OSC with oscpack feature-oscpack Alexandre Quessy 2020-04-01 16:29:56 -04:00
• da08f11751 Load markdown file directly instead of convert them to html first baydam 2020-04-02 00:05:19 +00:00
• 58e85f7afa Fixed problem: shortcut was not working for vertical flips. Sofian Audry 2020-04-01 19:03:23 -04:00
• dda4ab026d Merge remote-tracking branch 'origin/develop' into develop Sofian Audry 2020-04-01 18:56:36 -04:00
• f1b42e9010 Changed hotkeys to add webcam (was confusing because CTRL-C is usually for copying an item). Sofian Audry 2020-04-01 18:56:26 -04:00
• ef3025e794 Integrated support for predefined rotations (closes #293). Sofian Audry 2020-04-01 18:55:49 -04:00
• 0618fa04ff Removed unused variable. Sofian Audry 2020-04-01 18:54:10 -04:00
• 2d68e443f7 Changed text for flip command. Sofian Audry 2020-04-01 18:48:21 -04:00
• 8f238e31c0 Feature osc doc fix (#478) Michaël Creusy 2020-04-01 19:05:43 -03:00
• 7cf29d9ae0 Merge pull request #488 from baydam/develop Sofian Audry 2020-04-01 18:02:09 -04:00
• e65a9d82fe Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop baydam 2020-04-01 20:39:23 +00:00
• 1d9e4bde6b Fix bug #402 related to preferred language (Downside: create alias every time a new language is added) baydam 2020-04-01 20:27:40 +00:00
• 469339b716 Fixed link to mapmap website in About dialog (closes #429). Sofian Audry 2020-04-01 15:22:57 -04:00
• 43e03e6aed Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop baydam 2020-04-01 15:06:46 +00:00
• d4dc4e381d Use clone to duplicate mapping in duplicateMapping(uid). Sofian Audry 2020-03-23 15:23:25 -04:00
• 5b40bfbc3c Resolved conflicts. Sofian Audry 2020-03-23 15:18:40 -04:00
• 94a7dbe9d3 Fix merge issue (but camera recent implement not working anymore) baydam 2020-03-12 18:28:47 +00:00
• aa9e0179a2 Merge feature/camera-support into develop baydam 2020-02-21 14:17:15 +00:00
• 60896c4e1e Layer list cosmetic changes baydam 2019-10-19 19:03:25 +00:00
• f37d83a3dd Camera implement improvements baydam 2019-10-18 18:01:59 +00:00
• 0664032b27 Explicit call of paint destructor in order add Camera more than once baydam 2019-10-18 17:04:33 +00:00
• cc289ae416 Progressivly using C++11 litteral pointer nullptr baydam 2019-10-18 17:04:02 +00:00
• 48b4a748a9 Remove Camera directory from recents videos baydam 2019-10-18 17:01:29 +00:00
• f0a1dd86b5 Use enumeration instead of string to safely define constant Shape type baydam 2019-10-18 14:06:53 +00:00
• 256591d4e4 Use enumeration instead of string to define constant source type baydam 2019-10-18 13:09:01 +00:00
• c7123960e5 Extend camera support for Windows and OSX (base on Sofian's work) baydam 2019-10-17 15:49:09 +00:00
• 178f26bcaa Cosmetic changes on console window + Add message log context baydam 2019-10-14 19:59:18 +00:00
• c7afaaf8c7 Minor changes (code optimization) baydam 2020-01-31 14:58:08 +00:00
• 2fc9d62480 Improve library link baydam 2019-11-08 12:15:08 +00:00
• 29c0e6eaa4 Necessary changes to make camera work on Windows 10 baydam 2019-11-07 15:55:37 +00:00
• 600db0eb9e Camera implement improvements baydam 2019-10-18 18:01:59 +00:00
• ba858ba68c Explicit call of paint destructor in order add Camera more than once baydam 2019-10-18 17:04:33 +00:00
• 037f0cc7aa Progressivly using C++11 litteral pointer nullptr baydam 2019-10-18 17:04:02 +00:00
• e4a170c564 Remove Camera directory from recents videos baydam 2019-10-18 17:01:29 +00:00
• 17ed8783a9 Use enumeration instead of string to safely define constant Shape type baydam 2019-10-18 14:06:53 +00:00
• e594581f00 Use enumeration instead of string to define constant source type baydam 2019-10-18 13:09:01 +00:00
• 915033df07 Extend camera support for Windows and OSX (base on Sofian's work) baydam 2019-10-17 15:49:09 +00:00
• 701d6bd042 Cosmetic changes on console window + Add message log context baydam 2019-10-14 19:59:18 +00:00
• 6d443750d7 Minor changes (code optimization) feature/camera-support baydam 2020-01-31 14:58:08 +00:00
• fb6e52ea05 Simplified duplication by using clone() method. Sofian Audry 2020-01-12 14:01:34 -05:00
• 9ab5cb2e6e Allow OSC messages to change name (closes #472). Sofian Audry 2020-01-05 22:04:35 -05:00
• 7056d3a5d3 Remove debug messages from OscInterface. Sofian Audry 2020-01-05 19:07:55 -06:00
• 63baaec65d Minor fix in tooltip. Sofian Audry 2020-01-05 19:07:34 -06:00