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

• 8278285087 Update appveyor config file baydam 2018-03-22 23:38:21 +00:00
• 6220a4f1b4 Update README.md Bay Dam 2018-03-22 23:33:05 +00:00
• 47326e18d4 Update README.md Bay Dam 2018-03-22 23:21:11 +00:00
• b106289b3e Update README.md Bay Dam 2018-03-22 23:18:16 +00:00
• 42ea90ae62 Update README.md Bay Dam 2018-03-22 23:15:59 +00:00
• 2b02710a33 Update appveyor config file baydam 2018-03-22 22:38:33 +00:00
• bd00d0aa42 Update Windows build on mapmap.pro baydam 2018-03-22 22:30:24 +00:00
• 239c0a7b34 Update appveyor config file baydam 2018-03-22 22:16:38 +00:00
• ff46b152e1 Update appveyor config file baydam 2018-03-22 22:08:16 +00:00
• 1e2bb259e3 Update appveyor config file baydam 2018-03-22 21:53:58 +00:00
• 06850d8f48 Update appveyor config file baydam 2018-03-22 21:51:47 +00:00
• c18fcdc224 Update appveyor config file baydam 2018-03-22 21:21:40 +00:00
• 43145a6a63 Add appveyor Windows build configuration file baydam 2018-03-22 21:17:11 +00:00
• 253a5a12b6 Update README.md Bay Dam 2018-03-22 19:56:53 +00:00
• 7c8de69ce7 fix gstreamer package installer baydam 2018-03-22 19:12:10 +00:00
• 057d3f3770 remove wget from package baydam 2018-03-22 18:49:27 +00:00
• 9ffca18a1c Change the way to install gstreamer on travis file config baydam 2018-03-22 18:16:49 +00:00
• 01cedd07b6 Force gstreamer link on travis build config baydam 2018-03-22 17:22:11 +00:00
• 34567e183e Another try to fix travis build baydam 2018-03-22 16:52:58 +00:00
• cc6863d323 Try to fix OSX travis build - gstreamer link baydam 2018-03-22 16:22:56 +00:00
• 126f167fe7 Try to fix OSX travis build baydam 2018-03-22 15:49:08 +00:00
• a10626131b Merge branch 'develop' into feature/qtmultimedia Sofian Audry 2018-03-22 09:41:46 -04:00
• c667d03587 Update VideoImplQtMultiMedia.cpp Bay Dam 2018-03-22 13:35:37 +00:00
• 6846ecf238 Fixed linker problem on Ubuntu 17.10 (closes #382) Sofian Audry 2018-03-22 09:35:30 -04:00
• 5277245325 Another fix (travis.yml) baydam 2018-03-22 12:48:58 +00:00
• 1349290c8a Fix missing semicolomn on travis config file baydam 2018-03-22 12:33:56 +00:00
• 8c2a7d0b58 Update travis config file baydam 2018-03-22 12:24:52 +00:00
• 249259e864 Add OSX build support on Travis baydam 2018-03-22 11:10:38 +00:00
• 35c47106c2 Improved project inclusions baydam 2018-03-22 10:07:44 +00:00
• 60fbb34abf Update ignored file type baydam 2018-03-22 09:55:35 +00:00
• 98f24a76d4 Fix (workaround) the loop playback issue (improved) baydam 2018-03-21 15:22:17 +00:00
• 9e84440fde Fix (workaround) the loop playback issue baydam 2018-03-21 15:07:07 +00:00
• febefd5cc7 Fixed all compile errors on Raspbian (runs and can add colors but images not working yet). Sofian Audry 2018-02-14 05:40:49 +00:00
• c83320a9f2 Merge remote-tracking branch 'origin/raspbian' into raspbian Sofian Audry 2018-02-13 00:18:01 -05:00
• 855f62058b Integrated texture shape drawing GLES code (untested). Sofian Audry 2018-02-13 00:17:54 -05:00
• 8c201d78f2 Made TextureGraphicsItem::_doDrawInput() GLES-compliant. Sofian Audry 2018-02-08 22:45:57 -05:00
• 4c8358c186 Integrated includes to GLES3 instead of GL when needed Sofian Audry 2018-02-09 03:29:21 +00:00
• 96b03c5d82 glPush/PopMatrix is not GLES Sofian Audry 2018-02-09 03:21:50 +00:00
• 335a92b6d4 Changed compile flags to run on RPi (otherwise it was too slow to compile) Sofian Audry 2018-02-09 03:19:56 +00:00
• bccdb5ddfb Update README.md Bay Dam 2018-02-06 19:21:11 +00:00
• 51d9e9583c Update README.md Bay Dam 2018-02-06 19:19:59 +00:00
• e8dc128220 Add travis build status on README file Bay Dam 2018-02-06 19:18:13 +00:00
• 373ae3ecbd Update README.md Bay Dam 2018-02-06 19:02:56 +00:00
• 556f543541 Merge remote-tracking branch 'origin/develop' into develop baydam 2018-02-04 14:26:10 +00:00
• 43d0b4468a Fix media player loop (Workaround) baydam 2018-01-19 01:07:40 +00:00
• 12a77e1e9f Reimplement another function in case we need it baydam 2018-01-19 01:06:45 +00:00
• 942ae466f8 Multiple tests w/ videoprobe (it's a mess) feature/qtmultimedia-spike-videoprobe Sofian Audry 2017-12-27 22:50:10 -05:00
• 1e6b8d854f Fix in mapmap.pro: commented line about linux-specific stuff. Sofian Audry 2017-12-27 15:58:48 -05:00
• a36d5da135 Fix format problems by copying frame into QImage. Sofian Audry 2017-12-27 15:57:50 -05:00
• d7c7e44e2a First working implementation (still contains bugs but video/audio work). Sofian Audry 2017-12-27 14:04:54 -05:00
• 1d9009e4a2 Fix compilation error on Mac OSX #368 baydam 2017-11-29 21:20:42 +00:00
• dfdd4fe769 Clean Up baydam 2017-11-29 19:19:14 +00:00
• eee5e64100 Added instruction on troubleshooting gst.h missing on OSX Sofian Audry 2017-11-27 16:18:41 -05:00
• f96ed36b12 Finished implementing markdown transition Sofian Audry 2017-11-20 17:50:31 -05:00
• 9a3b09f924 Made some progress in updating the file to mardown format Sofian Audry 2017-11-18 18:55:18 -05:00
• 3467de59e8 Renamed INSTALL to INSTALL.md Tats 2017-11-18 18:48:16 -05:00
• 16bb470a75 Renamed README to README.md Tats 2017-11-18 18:47:05 -05:00
• 07570339df Keep paint at the top in properties editor. Tats 2017-11-16 20:40:42 -05:00
• 2cfeb3522d Removed unused texture item in mapping gui. Tats 2017-11-16 20:40:20 -05:00
• ea739def64 Renamed Paints -> Paint in property browser. Tats 2017-11-16 20:39:58 -05:00
• 3284ee8e2c Prevent changing paint for mapping if not compatible. Tats 2017-11-16 18:42:24 -05:00
• 9d19a52640 Fixed allows change of paint id on mapping using OSC (closes #302). Tats 2017-11-16 18:36:42 -05:00
• beb1266eea Added paintId as property + preserved backwards compatibility for files. Tats 2017-11-16 18:36:11 -05:00
• 2025996370 Allows possibility of changing paint of a mapping from the interface (related to #302). Tats 2017-11-16 18:12:55 -05:00
• 4acb4ccd12 Removed possibility of infinite recursion in VideoImpl (closes #351). Tats 2017-11-13 16:28:22 -05:00
• 0e758b3c52 Merge branch 'develop' into feature/syphon feature/syphon Tats 2017-11-10 13:43:43 -05:00
• 6d27f24209 Added item ID as part of properties. Tats 2017-11-10 13:40:08 -05:00
• 43da058b53 Simplified property browser interface by removing useless top-item property. Tats 2017-11-10 13:39:55 -05:00
• 4779dcd740 Added tooltips specifying the ID of each element. Tats 2017-11-10 13:39:07 -05:00
• 04c1f2151e Bugfix: let mappings names adjust size (closes #365). Tats 2017-11-10 12:40:34 -05:00
• d4e56983f0 Fixed error which caused problem with OSC messages (unset names in mappings were left empty). Tats 2017-11-10 12:38:49 -05:00
• 21b5fba285 Cosmetic change. Tats 2017-11-09 17:58:44 -05:00
• faf21b5531 Reconfigured Texture class hierarchy to make place for Syphon. Tats 2017-11-09 17:58:37 -05:00
• a2c4df4b60 Integrated transform function Tats 2017-11-09 16:32:45 -05:00
• c1e9de4854 improve some icons, zoom, solo mode, prefs,test signal edu 2017-10-17 20:08:47 +02:00
• 109c5572fb Loading Mapping --> setPaint was commented. Seems to be necesary. Also added related Label for paintId just including ProjectLabels.h carlesgutierrez 2017-10-17 16:47:34 +02:00
• eac130221c Fixed the play/pause button when adding media or color paints ferhoyo 2017-10-17 14:07:53 +02:00
• 6e3d61b5ca Merge pull request #360 from AVFLOSS/bug-enable_paint_context_menu Bay Dam 2017-10-16 19:06:43 +02:00
• a9543c83f9 Enabled paint context menu ferhoyo 2017-10-16 19:00:45 +02:00
• 7170e11e99 Update mapmap_es.ts Bay Dam 2017-10-16 13:17:50 +02:00
• c4163902fe Add Spanish translation baydam 2017-10-16 13:09:15 +02:00
• cfd0f863e2 Create CONTRIBUTING.md Bay Dam 2017-10-15 23:56:57 +02:00
• 389bdd5e5d Fixed some indentation + warnings Tats 2017-09-25 13:33:21 -04:00
• ad7ea1c95c Merge branch 'release-0.6.0' of github.com:mapmapteam/mapmap into release-0.6.0 release-0.6.0 Alexandre Quessy 2017-09-24 21:36:41 -04:00
• 72b3a9dc52 Update version to 0.6.0 Alexandre Quessy 2017-09-24 21:36:24 -04:00
• e751a1fbba Fix paths in HACKING documentation file Alexandre Quessy 2017-09-24 21:35:46 -04:00
• e62f34b06c update NEWS Alexandre Quessy 2017-09-24 21:22:38 -04:00
• b8bf59a67e Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Tats 2017-09-22 17:12:52 -04:00
• 16972d8b8b Fix reorder warning on build Bay Dam 2017-09-21 01:07:31 +02:00
• 044d43e608 Reorder vertices after copyFrom() mesh just to be sure. Tats 2017-09-19 11:58:43 -04:00
• 364cb582a7 Integrate/fix rotation/scale for all shapes (tested). Tats 2017-09-19 10:54:48 -04:00
• 44edf83ab8 Implemented basic rotation/scaling of polygons. Tats 2017-09-19 07:57:07 -04:00
• 3dd3e2fc5d Fixed error in the Mesh::toPolygon() (wrong number of vertices). Tats 2017-09-19 07:55:17 -04:00
• 4110613505 Cosmetic change. Tats 2017-09-19 07:51:07 -04:00
• 391d24d9a5 Update CODE_OF_CONDUCT.md Bay Dam 2017-09-17 18:06:36 +02:00
• 2e79ef7137 Create CODE_OF_CONDUCT.md Bay Dam 2017-09-17 17:37:05 +02:00
• 1a51c677de Fit all shapes to view canvas instead current shape baydam 2017-08-11 22:34:14 +00:00
• 055c6bdfec Cosmetic changes baydam 2017-08-11 19:43:32 +00:00
• 9beaf8bb07 .travis.yml for automated builds on travis-ci.org Alexandre Quessy 2017-08-08 19:58:25 -04:00
• 683b862987 Fix build Alexandre Quessy 2017-08-08 19:07:34 +00:00