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

• 7e85ab493c Merge branch 'spike-qgraphicsview-zoom-and-scroll' into spike-qgraphicsview-zoom-and-scroll-merge-develop Tats 2015-07-06 20:38:51 -06:00
• dc1d144cf1 Commented out faulty lines that broke the video output under Linux (issue #124) Tats 2015-07-06 20:02:28 -06:00
• b6b3863eb2 Minor documentation added. Tats 2015-07-06 17:57:08 -06:00
• d1b1d00e10 Integrated ellipse texture mapping. Tats 2015-07-06 17:53:37 -06:00
• 28d353d99a Bug fix: meshes did not handle well vertex displacement (adjusted tolerance when constraining a vertex to a polygon). Tats 2015-07-06 16:59:29 -06:00
• f23ce800fc Support for mesh textures. Tats 2015-07-06 16:58:29 -06:00
• a98577de44 Generalization of the texture input drawing. Tats 2015-07-06 16:58:01 -06:00
• 52ebee732f Added a method to reset (clear + recreate) all vertices. Tats 2015-07-06 16:56:42 -06:00
• b9177b9418 Fixed a number of problems related to shape selection and display in input and output. Tats 2015-07-04 11:35:48 -06:00
• b206a432a7 Prevent default actions on graphics items when mappings not visible. Tats 2015-07-03 22:18:07 -06:00
• 082bf2d009 Removed rubberband selection (for now). Tats 2015-07-03 21:51:58 -06:00
• 67628915a3 Handle mapping selection change on pressing mouse on a shape. Tats 2015-07-03 21:51:38 -06:00
• 522ecac194 Cosmetic change. Tats 2015-07-03 21:51:01 -06:00
• 93edb4e41a Bug fix: tried to addItem() twice on outputwindow scene. Tats 2015-07-03 19:04:52 -06:00
• 9ba817847f Bugfix: Infinite call loop created by shared scene in destination and outputwindow canvases and the updateCanvas() slot. Tats 2015-07-03 19:01:51 -06:00
• f0c4bb1fa9 Allow display of controls only in currently selected mapping. Tats 2015-07-03 17:21:11 -06:00
• 36c2c2b539 Implemented MainWindow singleton pattern. Tats 2015-07-03 17:20:42 -06:00
• f9fce75135 Issue #123 : Enable GL_BLEND Vasilis Liaskovitis 2015-06-03 14:21:20 +02:00
• 6577add891 Merge pull request #121 from baydam/feature-context-menu Bay Dam 2015-05-02 11:54:56 +00:00
• 0c7f186bfc Merge branches 'develop' and 'develop' of https://github.com/mapmapteam/mapmap into develop Mapmap 2015-04-05 11:57:40 +00:00
• 36b89fa60a Bug #99 fix and improvements baydam 2015-04-02 17:11:58 +00:00
• 8300c10599 Add context menu for duplicate, delete and rename mapping baydam 2015-03-30 20:54:15 +00:00
• b71db2874c Add OSC command to set volume level and play state baydam 2015-03-05 21:37:13 +00:00
• a39fa73118 Resolved conflict about last merge baydam 2015-03-03 11:52:44 +00:00
• 8842064af9 Merge branch 'feature-undo-commands' into 'develop' baydam 2015-03-02 10:40:49 +00:00
• 1dce1ebc57 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Alexandre Quessy 2015-02-15 18:46:32 -05:00
• 35855907a8 update Qt version on OS X Alexandre Quessy 2015-02-15 18:45:53 -05:00
• e22075d6ad Base working integration of destination and output window (with crosshair working in fullscreen). Tats 2015-02-15 17:46:54 -05:00
• d1f63b8501 Fix issue #114: Audio playback of the video files played Vasilis Liaskovitis 2015-02-09 21:44:47 +01:00
• 6a3545ff47 Segmentation fault fixed baydam 2015-01-29 20:39:49 +00:00
• dd1e2d7e9c Rough changes to build it on ODROID with OpenGL ES port-opengles-odroid Alexandre Quessy 2015-01-30 04:29:38 +10:30
• e0a3c35877 Update INSTALL Bay Dam 2015-01-29 14:48:56 +00:00
• 4bd5e456e0 Fixed bug #99 about exiting fullscreen baydam 2015-01-24 13:43:09 +00:00
• 584f71e997 Fixed bug #99 about exiting fullscreen origin/develop baydam 2015-01-23 22:36:25 +00:00
• 1a5497d245 Disable Test signal when add Shapes baydam 2015-01-23 21:02:29 +00:00
• c79e873fd3 Clear UndoStack when select a new file or project baydam 2015-01-23 20:45:12 +00:00
• 4d6caf2cfb Optimization of Undo Command baydam 2015-01-23 20:36:30 +00:00
• f335127369 Can restore last position of moved shapes origin/feature-undo-commands baydam 2015-01-21 12:47:17 +00:00
• e4ce6eab42 Command to restore deleted mapping baydam 2015-01-19 21:08:02 +00:00
• 078a27f8ce Undo Command to restore position of vertices moved by mouse or arrow key baydam 2015-01-19 14:35:19 +00:00
• 146a7e4a43 Add Undo and Redo Command to Mesh, Triangle and Ellipse baydam 2015-01-16 17:39:38 +00:00
• 9878e8a878 OSC: implement fullscreen and quit Alexandre Quessy 2015-01-11 19:16:59 -05:00
• 5141672ffc Disable installation of MIME type. Remove useless dep Alexandre Quessy 2014-12-31 13:52:36 -05:00
• 608d216eaa use native color dialog Alexandre Quessy 2014-12-31 13:34:52 -05:00
• b18b2af45a use green as default color + remember last choice Alexandre Quessy 2014-12-31 13:32:30 -05:00
• 3ce7fd3b92 Merge branch 'master' of github.com:mapmapteam/mapmap Alexandre Quessy 2014-12-30 18:44:07 -05:00
• 067a84cf12 Changing the ordering of mappings now changes the order in which they are actually displayed (layers). Tats 2014-12-28 22:29:47 -05:00
• 7c642e8570 Commented out remaining Mapper code from old approach. Tats 2014-12-28 22:28:08 -05:00
• 57c6ca0a14 updated doc for Gnu/Linux Marc Lavallée 2014-12-28 22:16:45 -05:00
• 8bd61f889e updated INSTALL Marc Lavallée 2014-12-28 22:12:01 -05:00
• 8019f35c96 simplified compilation of translations Marc Lavallée 2014-12-28 22:00:41 -05:00
• c6a3de501f Added comment for zoom level. Tats 2014-12-28 21:51:44 -05:00
• 3e7fd351cf Bug fix: once we reach max or min zoom we still record the scroll events which results in a weird behavior. Tats 2014-12-28 21:51:34 -05:00
• aa7e5d2e21 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Marc Lavallée 2014-12-28 21:07:12 -05:00
• 174ec7a90a simplified inclusion of translations Marc Lavallée 2014-12-28 21:07:09 -05:00
• c0b6bee45b Implemented working zoom with wheel mouse. Tats 2014-12-28 21:05:49 -05:00
• 191f0f9aba Fixed wrongful use of static const floats in class MM. Tats 2014-12-28 21:05:28 -05:00
• a84888467b Fixed drawing of texture in input mapping. Tats 2014-12-28 20:50:17 -05:00
• 3b5188b585 Merge branch 'release-0.2.0' into develop Alexandre Quessy 2014-12-28 20:05:13 -05:00
• df8e41a36a post-release version bump Alexandre Quessy 2014-12-28 20:04:45 -05:00
• 2b7a6e82a5 Fixed translation and display of controls of triangle texture. Tats 2014-12-28 19:53:36 -05:00
• 961f7e608e update version number in Doxyfile 0.2.0 0.2 Alexandre Quessy 2014-12-28 19:51:59 -05:00
• f5144d7fd2 Merge branch 'develop' into release-0.2.0 Alexandre Quessy 2014-12-28 19:50:03 -05:00
• 78294f2ef0 Fixed correct translation of color shapes. Tats 2014-12-28 19:44:46 -05:00
• d7185009d2 added mimetype support, deleted arabic translation file Marc Lavallée 2014-12-28 19:31:44 -05:00
• b35ce293bf Sync of vertices control points retroactive (to make ellipse works) (not fully working yet). Tats 2014-12-28 18:01:39 -05:00
• 31e315363e Major refactoring: moved too long methods from Mapper.h to Mapper.cpp and removed unused drawing code from Mapper classes. Tats 2014-12-28 18:01:02 -05:00
• 218694b285 Add positional option for the project file name Alexandre Quessy 2014-12-28 17:42:46 -05:00
• e6faa69c16 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Alexandre Quessy 2014-12-28 17:24:08 -05:00
• 5cf9294dc7 Only update vertex coordinates when control point is actually moved (as opposed to on any event). Tats 2014-12-28 16:16:21 -05:00
• 20053bd6f3 update version number in .pro file Alexandre Quessy 2014-12-28 16:09:19 -05:00
• d0199deee9 update version number Alexandre Quessy 2014-12-28 16:06:50 -05:00
• 82e0337ed7 update NEWS Alexandre Quessy 2014-12-28 16:01:27 -05:00
• 965a26edd6 Extremely rough patch for manipulating mapping texture shapes (works only for triangles). Tats 2014-12-28 15:58:06 -05:00
• e7253a4850 fixed desktop icon Marc Lavallée 2014-12-28 15:23:20 -05:00
• 4d91d6031f update README Alexandre Quessy 2014-12-28 15:15:10 -05:00
• c1e2d6b5c8 add mapmap.desktop Alexandre Quessy 2014-12-28 15:04:13 -05:00
• 49f7790f1d Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Alexandre Quessy 2014-12-28 14:37:29 -05:00
• 9a37e1cd1c add mapmap.svg icon Alexandre Quessy 2014-12-28 14:37:12 -05:00
• dd92ab9317 mapmap.pro now install the software, and a desktop file Marc Lavallée 2014-12-28 14:35:19 -05:00
• 9091ec00ea Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Alexandre Quessy 2014-12-28 14:24:51 -05:00
• b695dab206 add mapmap-fullname.svg icon Alexandre Quessy 2014-12-28 14:24:27 -05:00
• a152ef4fd9 maintenance: remove useless file Marc Lavallée 2014-12-28 14:01:13 -05:00
• 00fc5539a0 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2014-11-22 02:15:08 -05:00
• 7bd51320ba Modifications to diagram Tats 2014-11-20 16:15:03 -05:00
• c0fe3ac95a Reorganization of INSTALL script Tats 2014-11-22 02:12:21 -05:00
• 75f6ad9f29 Modifications to diagram Tats 2014-11-20 16:15:03 -05:00
• cd9092b2b7 Reorganization of INSTALL script Tats 2014-11-20 16:14:52 -05:00
• 0d279a6fdf fix version number in MM.cpp and update HACKING Alexandre Quessy 2014-11-06 11:05:27 -05:00
• 539d189f9d Fixed issue Adjust position of vertices using arrow keys not working on output display #77 baydam 2014-11-05 17:17:37 +00:00
• f6711ed7a8 Control mapping visibility from OSC (bug #43) Vasilis Liaskovitis 2014-11-01 02:44:58 +02:00
• 6843ecd882 Integrated view items for selecing and dragging shapes in the QGraphicsView; not completely tied to model yet. Tats 2014-10-31 17:05:32 -04:00
• cbfe3981c0 Started using QGraphicsView in canvases instead of QGLWidget. Tats 2014-10-31 17:04:28 -04:00
• e8870db92a Replaced Shape by MShape to avoid name conflicts. Tats 2014-10-31 17:03:18 -04:00
• 9636ece1c9 Disable Test signal when start mapping baydam 2014-10-29 21:25:06 +00:00
• ed9cca4ded Definitively resolve the bug with ESC baydam 2014-10-29 21:06:58 +00:00
• 9143e309f7 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Alexandre Quessy 2014-10-27 19:53:27 -04:00
• aab266b843 Can change OSC port via preferences dialog Alexandre Quessy 2014-10-27 15:25:41 -04:00
• 248cc8494c All menubar shortcut work when output window is displayed baydam 2014-10-27 19:15:39 +00:00
• be0053764d add PreferencesDialog - not yet effective Alexandre Quessy 2014-10-27 14:05:36 -04:00