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

• d6a3686861 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Alexandre Quessy 2016-10-10 00:49:49 -04:00
• d0e3f8b8ca minor coding style changes Alexandre Quessy 2016-10-10 00:49:26 -04:00
• fbee418df5 About Dialog Improvements baydam 2016-10-07 15:17:00 +00:00
• 96dc19a0fa Add about projection mapping resource baydam 2016-10-07 15:14:51 +00:00
• e7484044bc Make release notes accesible for users baydam 2016-10-07 15:14:17 +00:00
• d837ef61e6 Make LICENSE available as resource baydam 2016-10-07 15:13:36 +00:00
• b19eb078ac Make a script to generate contributors from the git logs baydam 2016-10-07 15:12:28 +00:00
• e601a831da Install markdown package for convert .md to .html baydam 2016-10-07 15:11:22 +00:00
• 4d96e760eb Add Gui class forwarding file baydam 2016-10-07 15:10:43 +00:00
• a12528c36b Change mapmap resource file name and add new documentation resource file baydam 2016-10-07 15:09:10 +00:00
• cbc1a2b4ec Removed old useless code from ancient OSC-support system. Tats 2016-10-05 00:38:04 -04:00
• 5e96d23255 Fixed bug: Hiding a solo-ed mapping was stopping playback. Tats 2016-10-05 00:37:21 -04:00
• 410578d062 Reintegrated audio support (works on Linux). Tats 2016-10-05 00:36:52 -04:00
• ce1cd6deb1 Fixed bug: New paints were automatically started (play()) when added, thus invalidating the feature that non-visible paints do not play. Tats 2016-10-05 00:20:27 -04:00
• 99607ad355 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2016-10-04 01:53:54 -04:00
• 6031b57cdd Add "Send feedback" to help menu baydam 2016-09-10 22:41:54 +00:00
• e841358fe7 Update "Undo stack" to "Undo history" baydam 2016-09-10 21:03:22 +00:00
• 1cc8c69594 Improve vertices movement shortcuts baydam 2016-09-07 16:35:53 +00:00
• 513f395312 Update mapmap_fr.ts Christophe Gesché 2016-08-30 10:51:17 +02:00
• 1eea2eaeb2 confusion sur la traduction de paint Christophe Gesché 2016-08-21 21:15:19 +02:00
• 1f4257f130 update lot of translation Christophe Gesché 2016-08-20 23:58:48 +02:00
• 06e38ef21b Cosmetic changes baydam 2016-08-17 09:49:05 +00:00
• c441bdd5fc Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2016-08-14 12:50:50 -04:00
• b0cb24fa87 Always align mapping layers buttons on the right side baydam 2016-08-13 13:39:52 +00:00
• ae1205206a Cosmetic changes in duplicate mapping function baydam 2016-08-11 15:01:11 +00:00
• 8c3cf48e0b Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2016-07-27 10:28:41 -04:00
• 20da2b173e Bug Fix: Clicking the zoom toolbars button of the output panel while there is no mesh present will crash the software. baydam 2016-07-07 23:06:55 +00:00
• 17779a4256 Bug Fix: Crash when try to duplicate color mapping baydam 2016-07-07 22:32:40 +00:00
• 4f2fe41699 Update INSTALL Bay Dam 2016-06-22 16:06:38 +00:00
• 8b17c78dcb prepare 0.5.0 release candidate baydam 2016-06-22 02:06:22 +01:00
• 05193dcf11 Fix some bugs about Windows release baydam 2016-06-22 01:14:45 +01:00
• 852d720b1b Update INSTALL file baydam 2016-06-22 00:47:45 +01:00
• c2919a8d80 Merge branch 'improvement-preferences-dialog' into develop baydam 2016-06-21 00:13:31 +00:00
• 6ca3c2a995 Cosmetic changes baydam 2016-06-18 00:21:02 +00:00
• 10c75764e1 Add test signals resources baydam 2016-06-21 00:12:57 +00:00
• 6b9536272a Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop Tats 2016-06-17 16:45:49 -04:00
• 87bfcfadf5 Merge branch '0.4' of https://github.com/mapmapteam/mapmap into 0.4 0.4 Tats 2016-06-17 16:33:46 -04:00
• 1cd37c457f Merge branch 'improvement-preferences-dialog' into develop baydam 2016-06-17 18:01:36 +00:00
• 2aecb8281f improve preferences system baydam 2016-06-17 17:58:12 +00:00
• c9b2e6df0c Store settings in INI file instead system registry on Windows baydam 2016-06-17 15:43:48 +01:00
• 5e13b2e783 Merge branch 'bugfix-port-windows' into develop baydam 2016-06-13 18:23:55 +01:00
• 05e2629316 Merge branch 'bugfix-port-windows' into 0.4 baydam 2016-06-13 18:22:22 +01:00
• 5c64652c74 Changes for Windows packaging baydam 2016-06-13 18:13:58 +01:00
• c1df7a2c11 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2016-05-26 11:11:27 +08:00
• f6543ae142 Merge branch 'setup/dakar-bideew-show-2016' into develop setup/dakar-bideew-show-2016 baydam 2016-05-23 13:04:45 +00:00
• 89b2caebfa Implement camera on user interface baydam 2016-05-20 16:47:21 +00:00
• 32a14901ad add color-balance.sh prototype Alexandre Quessy 2016-05-16 08:18:26 +00:00
• 015b4f40d6 Bug fix: when loading project solo/visible/locked were not activated in the mapping list widgets. Tats 2016-05-14 15:41:23 +00:00
• d162c19c69 Bug fix: when moving layers around video would pause. Tats 2016-05-13 18:02:06 +00:00
• 7f0018d493 Cleanup in code related to display of paint icons in list widgets. Tats 2016-05-13 16:16:12 +00:00
• 689231d441 Adjustments in paint icons (make sure they are always square with the right dimensions). Tats 2016-05-13 16:15:49 +00:00
• 11ce1fd28f Fixed bug: main pause button was not working anymore. Tats 2016-05-13 16:13:34 +00:00
• 4d2c1e490d Merge branch 'setup/dakar-bideew-show-2016' of github.com:mapmapteam/mapmap into setup/dakar-bideew-show-2016 Tats 2016-05-13 15:32:09 +00:00
• 3a83366164 New feature: Paints that are currently not visible are shown in interface with a red bar on them. Tats 2016-05-13 15:31:18 +00:00
• 3759184588 Small fix: Switch between vertex with Shift+Space keys baydam 2016-05-13 13:08:01 +00:00
• 75c6a25dbf Fixed bug: OSC messages that change solo, visible, locked status of mappings were not changed in the GUI. Tats 2016-05-13 02:59:55 +00:00
• 982dc6950e Small fix: path is valid for regexp if at least one element was valid Tats 2016-05-13 02:08:36 +00:00
• f9633b0065 Allow OSC message addressing of paints and mappings by names through regular expressions. Tats 2016-05-13 01:31:53 +00:00
• 1d6be291f2 encode4mmp: more doc + fix shebang syntax Alexandre Quessy 2016-05-13 00:54:51 +00:00
• 7ac70e7cf7 Added support for OSC message: rewind individual paint. Tats 2016-05-13 00:19:09 +00:00
• 81ed463c6d Fixed problem with OSC port being overriden by default settings even after changing it in preferences. Tats 2016-05-13 00:18:55 +00:00
• 4554a593c3 Integrated true FPS in the status bar. Tats 2016-05-12 23:40:56 +00:00
• c9afeaf47b Fix bug: vertices were not sticking correctly on source. Tats 2016-05-12 18:44:50 +00:00
• c598c2c896 Cleanup in main.cpp options. Tats 2016-05-12 17:39:27 +00:00
• 9f8a967af1 Some cleanup related to OSC. Tats 2016-05-12 17:39:18 +00:00
• 5e6179fbae Frame rate is now an option that can be specified on the commandline. Tats 2016-05-12 17:38:58 +00:00
• c92eb78963 Pause paints that are not visible anyway. Tats 2016-05-12 16:27:55 +00:00
• 065a561df6 Create meshes instead of quads for color mappings (closes #150). Tats 2016-05-12 15:19:41 +00:00
• 892a2c1869 Write log on file baydam 2016-05-12 11:22:51 +00:00
• 6650078ff5 Fixed bug introduced by paint control option (segfaulted with color paints). Tats 2016-05-12 10:28:28 +00:00
• c562dc1d56 Increased the sticky radius a bit. Tats 2016-05-12 10:28:46 +00:00
• 2734624f61 Fixed bug introduced by paint control option (segfaulted with color paints). Tats 2016-05-12 10:28:28 +00:00
• 9cf56ad962 Merge branch 'videoimpl-refactor' into setup/dakar-bideew-show-2016 Tats 2016-05-12 10:27:59 +00:00
• bee45a3491 Enable display of controls of mappings related to current paint (closes #142). Tats 2016-05-12 00:42:44 +00:00
• e44ad38cc3 Improved look of locked color. Tats 2016-05-12 00:42:01 +00:00
• 91882b3378 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2016-05-11 22:56:55 +00:00
• 37771654c9 Added script to automatically convert videos to PhotoJPEG (a good format for MapMap). Tats 2016-05-11 22:56:39 +00:00
• 8258684a58 Resolved conflicts of cherry-pick of Mac OSX fix. Tats 2016-05-11 17:23:40 +00:00
• d756106398 Fixed bug on Mac OSX: crosshair did not appear on the right spot with 2nd screen. Tats 2016-05-11 17:23:40 +00:00
• ed5e6e843b Disable right click on context menu actions baydam 2016-05-11 14:25:11 +00:00
• 807a81f2f4 Removed unused bundling commands for OSX Tats 2016-05-07 08:56:54 -04:00
• 0acb957bab Removed unused bundling commands for OSX Tats 2016-05-07 08:56:54 -04:00
• 73159789c7 Reconfigured build script for deploying on Mac (still not working) mac-bundle Tats 2016-05-07 08:45:50 -04:00
• e9bf69017a Use $$QMAKE_RELEASE instead of release to get full path Tats 2016-05-07 08:44:15 -04:00
• b353a76c2c Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2016-05-06 15:45:28 +00:00
• 84c915e88b Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Alexandre Quessy 2016-05-06 15:26:40 +00:00
• dd76c248a8 more decklink prototypes Alexandre Quessy 2016-05-06 15:23:49 +00:00
• b1f8d4c39f Don't need screen actions on single screen mode baydam 2016-05-05 12:09:35 +00:00
• de2ff27c51 Merged MapperGLCanvas.cpp Tats 2016-05-05 11:28:41 +00:00
• 5d37219833 Refactoring VideoImpl Vasilis Liaskovitis 2016-04-26 18:32:03 +02:00
• d01dd4d356 Allow to finely choose on which display to output baydam 2016-04-22 17:00:55 +00:00
• d8d9671b6c improving the menu and adding some useful link baydam 2016-04-20 17:25:31 +00:00
• 225163fd94 Make the duplication of mapping {Undo, Redo}able baydam 2016-04-20 11:18:49 +00:00
• 7369a9cdd2 Merge branch 'release-0.4.0' into develop Alexandre Quessy 2016-04-19 15:24:40 -04:00
• 02bf122500 post-release version bump Alexandre Quessy 2016-04-19 15:24:21 -04:00
• 915a0c4fad prepare 0.4.0 0.4.0 Alexandre Quessy 2016-04-19 15:19:23 -04:00
• 19eefde166 update solo icon Alexandre Quessy 2016-04-19 15:08:04 -04:00
• 5a83ad3a4a update coding style + add a todo: tooltips for solo/lock buttons Alexandre Quessy 2016-04-19 14:40:11 -04:00
• 0ec61b193f Hide cursor when canvas controls are not shown Alexandre Quessy 2016-04-19 12:23:46 -04:00
• ff93b46660 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Alexandre Quessy 2016-04-19 11:46:23 -04:00