eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-04 06:29:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 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
  • 17132df803 Reduce the size of the zoom tool bars baydam 2017-08-06 15:45:59 +00:00
  • 5e3f39491b Add some radio button & cosmetic changes baydam 2017-08-02 23:53:13 +00:00
  • 71f55bcc1c Improve check boxes baydam 2017-08-02 22:09:14 +00:00
  • d3c795abf9 Improve scroll bar style baydam 2017-08-02 18:57:36 +00:00
  • ac2bd731a0 Add shape zoom option in menubar baydam 2017-08-02 04:19:11 +00:00
  • d569a5d0ce Add shape zoom option in menubar baydam 2017-08-02 03:33:10 +00:00
  • f7f20ccb77 Add drag and drop feature for media file and project baydam 2017-08-02 02:12:27 +00:00
  • 43bb28fd8f Fix sticky vertices preferences setting baydam 2017-08-01 23:17:24 +00:00
  • b9f6fcaf8c Update build script and instructions baydam 2017-08-01 23:15:26 +00:00
  • d820c69aa8 Add missing images when switch from a branch to a another baydam 2017-08-01 03:18:45 +00:00
  • c1bf5c5ad2 Prevent resource images to be ignored baydam 2017-08-01 03:17:27 +00:00
  • 028ae36781 Merge branch 'refactor-subdirs' into develop baydam 2017-08-01 03:02:03 +00:00
  • f8e6d17330 Some changes in pro/pri files baydam 2017-08-01 02:33:40 +00:00
  • d53ed07344 Move unit test to the top level baydam 2017-08-01 02:33:01 +00:00
  • d9ec392282 reorder translation files baydam 2017-08-01 02:32:27 +00:00
  • 36fc426ed5 some changes from the beginning about third part baydam 2017-08-01 02:31:29 +00:00
  • 3ce5c88487 Move the resource file to the top level baydam 2017-08-01 02:30:33 +00:00
  • a8171f0127 Reorganise shapes source files baydam 2017-08-01 02:29:42 +00:00
  • 499b730905 Third part of Gui rearranged baydam 2017-08-01 02:28:52 +00:00
  • 8d72b2117e Reorganisation of Gui source files baydam 2017-08-01 02:27:28 +00:00
  • a7ce024842 The core of the app reorganized baydam 2017-08-01 02:26:43 +00:00
  • 7dadf5954c Move osc files to scr/control in case we have more controls like Midi baydam 2017-08-01 02:26:05 +00:00
  • 49997db0b1 Add Main to src/app folder baydam 2017-08-01 02:25:12 +00:00
  • 810566e73f Move all bash scripts to the script folder baydam 2017-08-01 02:24:14 +00:00
  • 562c33e25d Reorganise documentation files baydam 2017-08-01 02:23:02 +00:00
  • f2783a7257 Ignore mocs, objs and qrc directory baydam 2017-08-01 02:22:18 +00:00
  • bee80fbd6c Move resource directory to the top level baydam 2017-08-01 02:21:26 +00:00
  • e328d4e1b4 Ignore mocs, obj and qrc directory (reverted from commit 58ae7b474d) baydam 2017-08-01 02:14:54 +00:00
  • 58ae7b474d Ignore mocs, obj and qrc directory baydam 2017-08-01 01:45:13 +00:00
  • 4194ad5a3b Fix compilation errors Alexandre Quessy 2017-06-01 01:21:18 -04:00
  • bbdb002af2 Move files to src/mapmap Alexandre Quessy 2017-04-16 20:50:36 -04:00
  • 8514766eb8 Mouse wheel: press control to zoom. WIP: scroll Alexandre Quessy 2017-04-16 20:05:51 -04:00
  • d194c401a2 always show scroll bars in mapping canvas Alexandre Quessy 2017-04-16 17:13:17 -04:00
  • e520082cac Add "liblo-tools" to packages list Bay Dam 2017-02-07 15:28:03 +00:00
  • 2fc6f582c2 use icns mac icon file 0.5 Alexandre Quessy 2017-02-01 17:51:55 -05:00