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

• fc89b4fb11 Added PaintGui for textures. Tats 2014-10-16 17:51:41 +00:00
• 948a68c8ee Removed commented out deleteAction (minor change). Tats 2014-10-16 17:50:55 +00:00
• 4e8a2c19f1 Slightly better timer interval management (with global const variable). Tats 2014-10-16 17:28:17 +00:00
• ac29ca5c1f Merged latest changes from develop Tats 2014-10-15 13:42:32 +00:00
• bc456961a1 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Alexandre Quessy 2014-10-14 22:15:26 -04:00
• 55e909dc69 Introduced a property panel for paints and managed the case of color (disabling double-click feature in the process) Tats 2014-10-14 22:36:54 +00:00
• 5640e5b471 Put some long method definitions in the .cpp Tats 2014-10-14 22:36:03 +00:00
• f6644d2b15 Remove unused Facade.{h,cpp} and Controller Alexandre Quessy 2014-10-14 18:06:40 -04:00
• 31896eb38b Write/read outputWindowFullscreen setting Alexandre Quessy 2014-10-14 10:59:19 -04:00
• 695c0fe751 Do not display output window at startup Alexandre Quessy 2014-10-14 10:54:01 -04:00
• f63885f4f0 Add missing MM.h to mapmap.pro Alexandre Quessy 2014-10-14 10:52:10 -04:00
• bb1ac54c32 Fix: Press Esc: Do not close output window Alexandre Quessy 2014-10-14 10:42:01 -04:00
• cbee34aabd Feature: Select a shape with a click Alexandre Quessy 2014-10-14 07:40:17 -04:00
• 5e6e4909e1 Fix: radius for dragging vertices. Drag shape with left click. Alexandre Quessy 2014-10-14 06:20:22 -04:00
• 1b73d45a89 New feature: menu option toggle sticky vertices Alexandre Quessy 2014-10-14 01:48:00 -04:00
• 8f03e98010 Main splitter gets all the extra width when window is stretched Tats 2014-10-13 23:53:38 -04:00
• 8f1c1fb35f Fix main splitter proportion Tats 2014-10-13 23:51:54 -04:00
• 3a8824ec52 Small fixes Tats 2014-10-13 23:51:40 -04:00
• b941819051 When paint is changed, unselect any mappings Tats 2014-10-13 23:41:29 -04:00
• fe90060ba3 When mapping is changed, corresponding paint is changed Tats 2014-10-13 23:41:14 -04:00
• aac83a576a Switch to mapping tab when mapping is added. Tats 2014-10-13 23:29:40 -04:00
• b6292e5fa4 Switch to paint tab when new paint added Tats 2014-10-13 23:23:02 -04:00
• 9e2dcc21e8 Update read and write settings for new elements Tats 2014-10-13 23:22:24 -04:00
• 39ee4903c7 fix fullscreen on gnome Alexandre Quessy 2014-10-13 23:21:44 -04:00
• 0306a300f0 Reorganized elements in window Tats 2014-10-13 23:05:33 -04:00
• e9dc1a7686 Add .sock extension for live sources Vasilis Liaskovitis 2014-10-13 23:34:03 +02:00
• f3e94f743c Support shmsrc (live source) Vasilis Liaskovitis 2014-06-25 22:15:51 +02:00
• 2e7eb8d5b0 Major cleanup in MediaImpl mire Tats 2014-10-12 00:12:04 -05:00
• 4246c5a3b4 Bugfix: video size was not properly set for many videos. Tats 2014-09-16 20:54:40 -04:00
• 6adad6ac77 Video plays by default (at startup). Tats 2014-09-16 20:54:14 -04:00
• b8a3135169 post-release version bump Alexandre Quessy 2014-07-07 16:35:58 -04:00
• fe60dc678f update build.sh 0.1.1 0.1 Alexandre Quessy 2014-07-07 16:31:53 -04:00
• 6be2aa0057 also copy NEWS to dmg Alexandre Quessy 2014-07-07 16:29:12 -04:00
• 623498daf6 update NEWS Alexandre Quessy 2014-07-07 16:27:03 -04:00
• 91425ab014 improve release process on OS X Alexandre Quessy 2014-07-07 15:59:39 -04:00
• 42b0a6708f Merge branch 'develop' into osc-fix-july-2014 Alexandre Quessy 2014-07-07 15:30:37 -04:00
• 807765d874 do not copy gstreamer to the .app Alexandre Quessy 2014-07-07 15:15:32 -04:00
• c5b5a48d23 less prints Alexandre Quessy 2014-07-07 15:15:22 -04:00
• df3e12db04 Removed old remainder of singleton code Tats 2014-06-26 01:26:59 -04:00
• 03635c4904 Import video and image dialogs are now restrictive on definite file extensions (with option to select any) Tats 2014-06-26 00:56:53 -04:00
• e8f7f44493 Moved MAPMAP_VERSION and MAPMAP_EXTENSION as part of static class MM Tats 2014-06-26 00:56:24 -04:00
• 2ede19425b Fixed bug in ellipse creation: two last points of input ellipse were wrong Tats 2014-06-26 00:27:15 -04:00
• 45535c80a1 Cleanup debug message Tats 2014-06-26 00:13:42 -04:00
• 054a6d2b37 Save and load image paints Tats 2014-06-26 00:13:12 -04:00
• 376c7e4983 Fixed major bug: all media shared the same opengl texture (!) Tats 2014-06-26 00:09:11 -04:00
• bbc0eeb6ae Added option to import image files using QImage Tats 2014-06-26 00:08:46 -04:00
• 2cbab1bf2d Some cleanup in MapperGLCanvas Tats 2014-06-25 23:00:39 -04:00
• bcdfed3aca Start timer after creating everything Tats 2014-06-25 23:00:24 -04:00
• c0683b9d98 More minimalist icon for control points Tats 2014-06-25 21:31:41 -04:00
• 8d8d29e045 Roll paint image for color adding Tats 2014-06-25 21:29:25 -04:00
• ab2df9a00f Make icons invisible in menus (not working on Ubuntu Unity but maybe somewhere else) Tats 2014-06-25 21:28:42 -04:00
• fd54928169 Renamed some images + added a new one Tats 2014-06-25 16:40:23 -04:00
• 5810736425 First step in trying to add feature of showing up different qicons in the menu and in the toolbars using proxy actions (still not working) menu-toolbar-qaction-different-qicon Tats 2014-06-25 16:37:57 -04:00
• 19de5e2355 Update icon base Tats 2014-06-25 14:22:04 -04:00
• a6868a2713 Added custom style (round edges, gradients) Tats 2014-06-24 00:43:40 -04:00
• 1e1b7ae221 Integrated new set of icons Tats 2014-06-24 00:43:00 -04:00
• 00a437864d Integration of toolbars in a single mainToolBar, with runToolBar at the top-right end Tats 2014-06-24 00:39:38 -04:00
• f5c05a2e15 Play button replaces pause, pause replaces play Tats 2014-06-24 00:38:02 -04:00
• ad96d87cf0 Removed useless waiting for splash screen Tats 2014-06-23 21:50:18 -04:00
• d9d42eb556 Deleted unused image Tats 2014-06-23 21:48:32 -04:00
• 7c37c0ede9 Added new toolbars and their appropriate placement Tats 2014-06-23 21:48:05 -04:00
• da07d1003d Minor adjustments to style sheet Tats 2014-06-23 21:47:41 -04:00
• 7fc4f711c5 Integration of new icons Tats 2014-06-23 21:47:29 -04:00
• 670a686c37 Merge branch 'mike-style-integration' into develop Tats 2014-06-23 18:37:07 -04:00
• 4a4b1f05b2 Cosmetic refactoring and variable inits Tats 2014-06-23 18:30:49 -04:00
• 0748eda051 Added output window actions to toolbar + dummy buttons Tats 2014-06-23 17:26:20 -04:00
• 96ae61cea8 Play disables pause and vice-versa play-pause-rewind Tats 2014-06-23 17:09:29 -04:00
• cb0deae5f1 Base implementation of play/pause/rewind (working, still adjustments to do in the GUI) Tats 2014-06-23 16:54:44 -04:00
• b02dc5e622 Bug fix: in Qt5 the layoutChanged() did not work anymore for the layer reordering Tats 2014-06-23 16:20:52 -04:00
• 64889af9a9 Fixed OSX-related runtime errors that were making the application crash develop-rebase-fix-osx-june-2014 Alexandre Quessy 2014-06-23 12:27:54 -04:00
• 0a14650d88 Reimplement most widgets in the GUI on OS X osx-fix-june-2014 Alexandre Quessy 2014-06-23 13:11:36 -04:00
• 0f40608562 Fixed basic problem with QGLFormat that was causing a crash; still re-building the application step by step Alexandre Quessy 2014-06-23 12:54:58 -04:00
• f08f25c7cb Stripped down layout so that it runs on OSX Alexandre Quessy 2014-06-23 12:35:37 -04:00
• 1018586265 Basic fixes in build files Alexandre Quessy 2014-06-23 12:27:54 -04:00
• a596f319fe Added some documentation comments Tats 2014-06-23 10:29:45 -04:00
• fae18b4606 Save display output window state in settings to preserve preference / last saved state of the user Tats 2014-06-11 14:42:34 -04:00
• aa39752b98 Some cleanup / reorganization of code Tats 2014-06-10 22:27:12 -04:00
• 66dc735861 Added _preDraw() and _postDraw() methods to avoid repetition of code in TextureMapper Tats 2014-06-10 22:26:41 -04:00
• 011790372b Comments added Tats 2014-06-10 22:24:54 -04:00
• 20c0ca4cd1 Remove unused glPopMatrix() (had no corresponding glPushMatrix()). Tats 2014-06-10 22:24:05 -04:00
• fe91045741 Removed unused file Defs.h Tats 2014-06-10 16:55:16 -04:00
• 9dedaea443 Small potential problem fix in OscReceiver.cpp (potential mem issue detected using valgrind). Tats 2014-06-08 22:55:54 -04:00
• aa2b0847a7 Correct listing of gstreamer1.0 packages to install under Ubuntu Tats 2014-06-08 22:54:58 -04:00
• acba98a9cf Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Alexandre Quessy 2014-05-28 15:38:23 -04:00
• 1aace8a578 Change the uri of existing media or color paint with double-click Vasilis Liaskovitis 2014-05-22 11:30:25 +02:00
• 33f0625005 update build.sh to use macdeployqt Alexandre Quessy 2014-05-21 16:06:57 -04:00
• 0d51f784e4 update packaging for OS X Alexandre Quessy 2014-05-21 14:34:06 -04:00
• 1da6d0479a Add arabic translation file Alexandre Quessy 2014-05-15 19:16:31 -04:00
• 78d8f88e52 MediaImpl: Do buffer pull in "new-sample" gstreamer callback Vasilis Liaskovitis 2014-05-10 16:26:37 +02:00
• e3da235a82 add AsyncQueue (needed for VIdeoImpl) Vasilis Liaskovitis 2014-04-30 01:41:38 +02:00
• 4c80d2c543 MediaImpl: ALways do memcpy, no conversion needed Vasilis Liaskovitis 2014-05-10 15:44:08 +02:00
• dc25c2a874 Merge branch 'gst-1.0' into develop Alexandre Quessy 2014-05-09 20:24:35 -04:00
• 4776dd2717 fix Alexandre Quessy 2014-05-09 20:20:43 -04:00
• 7177796844 MediaImpl: always set bitsChanged to true to avoid texture "flickering" Vasilis Liaskovitis 2014-05-09 01:11:08 +02:00
• f914b84be6 MediaImpl: remove gst_sample_ref to avoid leak Vasilis Liaskovitis 2014-05-09 01:01:02 +02:00
• b818fd3926 "new-sample" callback should return GstFlowReturn Vasilis Liaskovitis 2014-05-09 00:54:57 +02:00
• f4ecddd664 we can assume depth and bpp of 32 Alexandre Quessy 2014-05-08 16:38:18 -04:00
• f23fa9cb9d add a FIXME Alexandre Quessy 2014-05-08 16:14:02 -04:00
• 7177d62f90 remove useless endl in prints Alexandre Quessy 2014-05-08 16:06:31 -04:00
• 4426142f80 fix pixel format bug - but playback still doesn't Alexandre Quessy 2014-05-08 16:03:15 -04:00