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

• d49133b7f2 Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop Alexandre Quessy 2018-04-07 19:05:38 -04:00
• 64aafc5bdf Fix video rate bug (Closes #369) Alexandre Quessy 2018-04-07 18:54:57 -04:00
• 50f9c8f686 Cosmetic change baydam 2018-04-07 22:11:06 +00:00
• df0ac22de4 Change the default test card baydam 2018-04-07 22:04:23 +00:00
• 4ff3476dd3 Add the user choice to show control only on mouse over in preferences baydam 2018-04-07 22:03:38 +00:00
• 3b46691753 Run lupdate Alexandre Quessy 2018-04-07 17:57:12 -04:00
• d0885de599 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop Sofian Audry 2018-04-07 17:52:59 -04:00
• 1e894074b2 Update hard-coded list of languages Sofian Audry 2018-04-07 17:51:59 -04:00
• 0c09e5e9a6 Update mapmap_zh_TW and zh_CN translations Alexandre Quessy 2018-04-07 17:43:39 -04:00
• c19f97629f By default show controls on output on if it is hovered by mouse baydam 2018-04-07 20:50:46 +00:00
• 1563bbf53f Update mapmap_zh_TW translation Alexandre Quessy 2018-04-07 16:41:55 -04:00
• 4bf00091a0 Merge remote-tracking branch 'origin/develop' into develop Sofian Audry 2018-04-07 16:15:13 -04:00
• edda969c74 Renamed "Mesh subdivisions" to "Subdivisions" to shorten name. Sofian Audry 2018-04-07 16:14:24 -04:00
• fb14d0d38d Changed width/height to horizontal/vertical for mesh subdivision naming. Sofian Audry 2018-04-07 16:14:07 -04:00
• a0f9a98dcd Small fix. Sofian Audry 2018-04-07 16:13:35 -04:00
• c28ef880a1 Little fix baydam 2018-04-07 20:12:02 +00:00
• 18a7a6c6b6 Merge branch 'feature/rename-gui-elements' into develop baydam 2018-04-07 20:02:01 +00:00
• 1a5fd794a0 Rename the gui elements based on the discussion baydam 2018-04-07 20:00:38 +00:00
• c8cd949ab4 Use zh translation files. Alexandre Quessy 2018-04-07 13:25:12 -04:00
• de83f40c5b Add zh_TW and zh_CN translation files to translate Alexandre Quessy 2018-04-07 13:17:29 -04:00
• b8b7f9a6b9 Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop Alexandre Quessy 2018-04-07 13:08:06 -04:00
• ce8debf5b1 Update scripts/build.sh script for macOS Alexandre Quessy 2018-04-07 13:07:47 -04:00
• 84a98c69fc Bugfix: Cursor no longer displays in fullscreen without controls (closes #387) ltsAdair 2018-04-07 12:55:18 -04:00
• 9dd6f855b3 update gitignore baydam 2018-04-07 15:50:58 +00:00
• 1ec86c568b Add icons files baydam 2018-04-04 01:50:16 +00:00
• 48e65c28a0 Fix build error on other OS baydam 2018-04-04 01:01:06 +00:00
• 4cf953762a Change source of the current layer in context menu. Request #377 baydam 2018-04-02 23:29:07 +00:00
• d953422dc0 Implement scale/rotate icons and minor fix baydam 2018-04-01 00:24:41 +00:00
• d31f4dfc7d Replace CTRL-click for free-hand transforms with re-click baydam 2018-03-27 23:05:40 +00:00
• d150a01d4e Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop Sofian Audry 2018-03-25 16:19:34 -04:00
• 773de95d83 Prevent adding camera action in OSX and WINDOWS where it is not created (closes #366). IMRC112-4 2018-03-25 16:17:01 -04:00
• 26cc8e3bee temporary fix of crash when opening a 2nd movie in QtMultimedia baydam 2018-03-25 17:35:09 +00:00
• 12f22ca9fd Change the way to put environnement variable on Windows baydam 2018-03-23 00:35:13 +00:00
• adae1e3699 Update appveyor config file baydam 2018-03-22 23:58:03 +00:00
• da84310b2e Update appveyor config file baydam 2018-03-22 23:52:04 +00:00
• b489d4343e Update appveyor config file baydam 2018-03-22 23:38:21 +00:00
• 54b7d6be7f Update README.md Bay Dam 2018-03-22 23:33:05 +00:00
• c375a89b55 Update README.md Bay Dam 2018-03-22 23:21:11 +00:00
• b4cc186267 Update README.md Bay Dam 2018-03-22 23:18:16 +00:00
• 77b0fb7674 Update README.md Bay Dam 2018-03-22 23:15:59 +00:00
• e8d5819572 Update appveyor config file baydam 2018-03-22 22:38:33 +00:00
• 5bf1fa8bba Update Windows build on mapmap.pro baydam 2018-03-22 22:30:24 +00:00
• 2ce2f230c3 Update appveyor config file baydam 2018-03-22 22:16:38 +00:00
• 1e26d2e1c2 Update appveyor config file baydam 2018-03-22 22:08:16 +00:00
• 3ff0af3da4 Update appveyor config file baydam 2018-03-22 21:53:58 +00:00
• 03723dc988 Update appveyor config file baydam 2018-03-22 21:51:47 +00:00
• b290510b82 Update appveyor config file baydam 2018-03-22 21:21:40 +00:00
• 2281a2d355 Add appveyor Windows build configuration file baydam 2018-03-22 21:17:11 +00:00
• e994d2f635 Update README.md Bay Dam 2018-03-22 19:56:53 +00:00
• 607b826fc4 fix gstreamer package installer baydam 2018-03-22 19:12:10 +00:00
• 0696263ef3 remove wget from package baydam 2018-03-22 18:49:27 +00:00
• c5b79501ed Change the way to install gstreamer on travis file config baydam 2018-03-22 18:16:49 +00:00
• c37b0f870f Force gstreamer link on travis build config baydam 2018-03-22 17:22:11 +00:00
• 0c0b4c3bbe Another try to fix travis build baydam 2018-03-22 16:52:58 +00:00
• 27c5770953 Try to fix OSX travis build - gstreamer link baydam 2018-03-22 16:22:56 +00:00
• 71f123754d Try to fix OSX travis build baydam 2018-03-22 15:49:08 +00:00
• 95fec7f71e Prevent calls to endOfMedia which was causing crash on 2nd import (closes #385). Sofian Audry 2018-03-25 12:21:21 -04:00
• 8866d2021f Fixed memory management possible issue in VideoImplQtMultimedia. Sofian Audry 2018-03-25 12:17:04 -04:00
• 4108cc87be Add -Wno-expansion-to-defined to prevent warnings Sofian Audry 2018-03-25 11:51:50 -04:00
• 4f44f0aa8b Add -Wno-expansion-to-defined to prevent warnings Sofian Audry 2018-03-25 11:51:50 -04:00
• 00e9bd866e Some progress in trying to integrate GLES (not working). raspbian Sofian Audry 2018-03-25 10:12:36 -04:00
• 73cdecbbe7 Rename in the GUI paint, mapping, source, destination, dimension baydam 2018-03-24 20:21:30 +00:00
• e741d10e87 Change the way to put environnement variable on Windows baydam 2018-03-23 00:35:13 +00:00
• cf5c86aa20 Update appveyor config file baydam 2018-03-22 23:58:03 +00:00
• b2ac33bb7f Update appveyor config file baydam 2018-03-22 23:52:04 +00:00
• 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