github.com/mapmapteam/mapmap commits | Ecosyste.ms: OpenCollective

Removed drawControls*() methods in Utils.h which are not used anymore.

2429728e497a5f0ac638ccc71fe6e6d9528f3f39 authored almost 9 years ago

Removed unused items to prevent compilation warnings.

e5f73277b25410d1ff9299381702cc3a77561aba authored almost 9 years ago

Fixed: Paint and mapping renamings are not saved in file (closes #179).

97ff5ff47deee034e7b01935f6864a235388a44d authored almost 9 years ago

Arranged name properties in Element.cpp.

fcbc1b3aefa7d31722cccb85cd1e4b91a094f9ce authored almost 9 years ago

Save id in attributes in state saving.

f6ec081334a3bd82160b802047bfb429e12eec21 authored almost 9 years ago

Renamed source and destination tags to appropriate names.

35b74c8d1f5163b2a01146375ff796689de9ae46 authored almost 9 years ago

Compilation error fix.

a41b05693a858807c6ef04dc74f4c9181822519e authored almost 9 years ago

Fixed bug: when reloading video it was badly positioned.

ee5133a48a0e198e97ade7abea420adc89b20f7a authored almost 9 years ago

Some cleanup performed related to reverse playback #216.

218de01f6e34072806091609c1acbe0532a10cde authored almost 9 years ago

Replace "mute" by "hide".

59e95e4c0277d207d5081354b80e83e963bbbd9a authored almost 9 years ago

Cosmetic change.

5c29f54a66ceee7f090a3d6ec7a34269fcef8f65 authored almost 9 years ago

Changing mapping solo/visible/locked state changes the corresponding QActions in the main window.

22acf3c21542a386dc74502a44f28ccb4a507e0c authored almost 9 years ago

Cosmetic change.

f97e4920edd733659255661ba0b3d3c49964e295 authored almost 9 years ago

Uids now start at 1 instead of 0.

49b46290bbe133318268cb26e28e31815ac84beb authored almost 9 years ago

Made use of _seekEnabled in a more useful/stable way.

14be9bedbf4f36b881f32e0692eb993a89a7f44b authored almost 9 years ago

Removed all references to audio in VideoImpl for now.

39970eb81e84d5268b5f9f290b98d8fd9feaecdf authored almost 9 years ago

Fixed bug introduced with latest changes: movie was not properly reloaded resulting in hanging.

e4ed0e939cff1ef43c2f62f82aeed631c3800434 authored almost 9 years ago

Fix broken Undo/Redo for Delete command

7cc10433680859fd963731cfead41cd5c2fb1106 authored almost 9 years ago

Save/load x,y in Texture but not considered a settable property (for example osc should not be able to change it).

fc0f8f528c752492b7607894aaa6d6456a6c7eeb authored almost 9 years ago

Cosmetic change.

e93d1123c3de26afd2096795632db2a4500aa0ef authored almost 9 years ago

Fixed signal/slot loop: on property changes model emits signals that are collected by the MainWindow and sent back to the PaintGui/MappingGui (this fixes OSC changes of model objects).

e87de3d3e95cc3962fa9cbc0079eb469141ec375 authored almost 9 years ago

Cosmetic changes.

7a9457d26db9e4720644eb2074a8f84b78805596 authored almost 9 years ago

Add buttons on mapping layers

23331abf57a2969c883ec5a5d2c4aec336a8f4f8 authored almost 9 years ago

Add buttons on mapping layers

d3975c841faf7fc3019b54e75f849f0997d05849 authored almost 9 years ago

Work In Progress (reverted from commit 17a64fdade83f237aefc394ef6f103ab4e697eb9)

fde91140096898911f950665a9b203b85115fc9c authored almost 9 years ago

Work In Progress

17a64fdade83f237aefc394ef6f103ab4e697eb9 authored almost 9 years ago

Cosmetic changes.

5fe89ab9ac98031d57f037333fb208883408c0f6 authored almost 9 years ago

Wrong approach of mapping layers buttons (reverted from commit 51b09764875332ee09009551ad4087d692a02045)

38db95ffd406de516780fbee5dc92f40ab00811e authored almost 9 years ago

Merge branch 'develop' of github.com:mapmapteam/mapmap into develop

# Conflicts:
# VideoImpl.cpp
# VideoImpl.h

Signed-off-by: Tats <[email protected]>

1002d9d824c4150e535d067a9468ebc654956d03 authored almost 9 years ago

Renamed Media* to Video* to avoid confusion.

8b48b6dc8b2705498fa494172fecddcfd408d42b authored almost 9 years ago

Renamed Media* to Video* to avoid confusion.

f998ba64e1471f14b59194ab1a0206578bcbfecd authored almost 9 years ago

Wrong approach of mapping layers buttons

51b09764875332ee09009551ad4087d692a02045 authored almost 9 years ago

Wrong approach of mapping layers buttons

35c9f7b7f81bf38c428dd1beb44eafa628d2753a authored almost 9 years ago

Update gitignore file

f175559012221d3dd69c924244b68c32fbe4afa9 authored almost 9 years ago

Cosmetic change.

21f124684a45e5abab51db0b5bea0cc377d9c12d authored almost 9 years ago

Fixed bug: thumbnail had wrong colors due to bad conversion from RGBA to ARGB

1a368a7cd9d4b4a1a8a46923eb0293f091086b6f authored almost 9 years ago

Merge branch 'feature/video-thumbnails' of github.com:mapmapteam/mapmap into feature/video-thumbnails

1b449e078707407650d012d1c6f02639d07f65aa authored almost 9 years ago

Fixed potential error in return policy of Media::setUri().

c4df418f7b190d98eabc81faff7698c2eec0262d authored almost 9 years ago

Cleanup.

c8074e8e3aea50c10c04718f4301977494effb6a authored almost 9 years ago

Cleanup.

93a60ff3b13290692e3075735ae48834c6ce23ce authored almost 9 years ago

Defined constant to control thumbnail generation timeout.

5600d5a13728fdc5e32a4ebd53af6cef8ab5a1ab authored almost 9 years ago

Cosmetic change.

890e4043bc7cb701ff7fe2a105f6cf85a04101ac authored almost 9 years ago

Cleanup.

fb8ae149b6136ec2d7764c0fa53c9f258d632857 authored almost 9 years ago

Fixes in the seekTo() method.

a86e38b2e4b25d7ab2567456d04eec6712e6ee1d authored almost 9 years ago

Use new methods in MediaImpl to appropriately gather a thumbnail for the video.

8d780aeb61c5d96722be482462c3136be75aa5a2 authored almost 9 years ago

Added a blocking method to wait for available new bits.

51f5d7f9fb76e637ecc207b8f8f49f22645dec81 authored almost 9 years ago

Create a hasBits() method that tells whether there's currently bits available or not.

d62343ee95c5ad42c61794ab8aeb44b8b03d911d authored almost 9 years ago

Removed struct pad handler data from MediaImpl.

0e2baa4d76f3e907ea17aed651e3a543d29edaca authored almost 9 years ago

Fix shape lock check in MapperGLCanvas.h.

aaef36b1ab4c6139188c364a04a34ebcdc1a75af authored almost 9 years ago

Provide default icon from system if problem seeking thumbnail.

34abb070bb5b7ce8a6e73d8f5bffa4fd91562345 authored almost 9 years ago

Generate thumbnails for videos (closes #178).

3df0f7a955064e13b221f7368d8f039358b93ffe authored almost 9 years ago

Merge branch 'feature/qt-properties' into feature/video-thumbnails

52dd188afeb4c3e1c605d05355fa345664fbbee4 authored almost 9 years ago

Removed AsyncQueue (unused).

c2ff8acc7e8be1c309fa76254c5813b0d2789985 authored almost 9 years ago

Merge branch 'develop' into feature/qt-properties

# Conflicts:
# Mapping.h
# OscInterface.cpp
# ProjectReader.cpp
# ProjectWriter.cpp
# Shape.h
# ...

1146a6408e12a21c7f852d2346eaa63220595250 authored almost 9 years ago

Merge branch 'feature/qt-properties' of github.com:mapmapteam/mapmap into feature/qt-properties

# Conflicts:
# OscInterface.cpp

445cf7550b411659daa59a1c8672e01082a0b243 authored almost 9 years ago

Integrated QProperty system into OSC support.

f656b73880ad518598fe765a225bb883e3bc8a56 authored almost 9 years ago

Integrated QProperty system into OSC support.

c4762375c508ce11814dbc683343e5f300719ad0 authored almost 9 years ago

Added ptr typedef for Element.

44e3f853c2de48840d369f1fb3054cdc490f0b44 authored almost 9 years ago

Renamed concurrentqueue.h -> ConcurrentQueue.h.

89f95d9d4650acdb17267967481555d934766625 authored almost 9 years ago

Show and hide menu bar option not available on Mac & Ubuntu

8281f7dfef10a980cd5bcc36d1098dafdc387a49 authored almost 9 years ago

UX Design document: status bar

420e30b187b68fd152cc646bbf784849caebef83 authored almost 9 years ago

Merge branch 'develop' of github.com:mapmapteam/mapmap into develop

18ff7e2dcaaa365a68da00221c04c5a5e732e521 authored almost 9 years ago

update NEWS

6a0b3afdebf9f3b4bd6d40b308e5c611eac5838f authored almost 9 years ago

Fix bug: solo was not working.

ed859fadf5b33606d5253ec8118f2cd46492d198 authored almost 9 years ago

Cleanup.

8de0b3c7d6e0fa5a60c4f05798ed61933d3525cf authored almost 9 years ago

Rate (speed) and volume both reset to be in 0..1 instead of 0..100.

e1270cd17a02b7544ecfa8b5df5edf77742f0ba7 authored almost 9 years ago

Fixed bug: volume was not loaded.

e07bb6324faa7b3581c608272a5357416fb0702b authored almost 9 years ago

Fixed loading of video paints and mappings.

42de64ff9f9b9230ba028defd0a2f6c8f3d7abc3 authored almost 9 years ago

update NEWS

f837b80c20528f7fead4fa547ffa3d2da0bbb56e authored almost 9 years ago

Fixed segfault when loading meshes with images.

b32b88221032931055984cf9329cb860ad8e9bbb authored almost 9 years ago

Used ProjectLabels in Mappings (was missing).

8fff8735b8e9849bdd80371c5c62d8158bdac24e authored almost 9 years ago

Replaced ProjectAttributes with ProjectLabels.

1caff94ebabc97094e09a72c2bfc4af9bd363f32 authored almost 9 years ago

Display lock/mute/solo options in the context menu

21c91295d160bd604492b5f536a0550e34b5ef34 authored almost 9 years ago

Bug fix: when moving vertex pressing any key (eg. CTRL) added an extra command into the undo stack thus forcing the user who wanted to undo to press CTRL-Z twice.

1309305614bd339b40ba2389a514616523329293 authored almost 9 years ago

Fixed bug wrt wheel event scrolling (contains a compat. fix for Qt5/Qt4.8) (closes #198).

b21c46b3d29497034a2e899725f345391afe7fbd authored almost 9 years ago

Add a macro to check for Qt >= 5.5

acffd5f75a5a67f6d768c21fa9283bcc13b0c4de authored almost 9 years ago

Add a macro to check for Qt >= 5.5

18e00e5cbe1305fc767ee451a884b3e5e151eab2 authored almost 9 years ago

Add a macro to check for Qt >= 5.5

b3065af6ba3a1c45730557c77c3c57cf39f84dff authored almost 9 years ago

User can show or hide toolbar

5c66fa1b8d6fac9d2310d6787e8c39fc78e07ecf authored almost 9 years ago

Now we are able to show and hide menubar with ALT key

d1af8b42087b365f67f25bb1bd87da49384e37c1 authored almost 9 years ago

Merge branch 'ux-document-implements' into develop

685e422ed29186b50c4b217612730e87038fc505 authored almost 9 years ago

Output window is fullscreen only if a video projector is connected or not visible

d889a6c616d9aa3a0bda765e3dfb53398744b8be authored almost 9 years ago

Reorder the toolbar icons

ce74dace6845fcb9e9cc22f2e42dc266fa730250 authored almost 9 years ago

Merge import media and image actions

f4d0e6bd6a80f8c2be05654838cfa1750321db7e authored almost 9 years ago

Switch between vertex to turn them active with Shift+Space shortcut

9fbb31d9493266db5c58a15aa15eb71988c056ea authored almost 9 years ago

Able to speed up shifting of active vertex with SHIFT+ArrowKey

03eec503fc23a935f9898bc1341d23f7a7a7ec0c authored almost 9 years ago

Refresh View at startup

9c5deae1d73f0119322012b6faf1bb3075969b58 authored almost 9 years ago

Translate the view with arrows keys and increase moving speed

35ab79eb575e99736b9d524bf4a0e61d5150a6bd authored almost 9 years ago

Fix: #199 zoom toolbar moved into the visible area

3238efbdb482f89f4672289d4af1b3f70a39cbcf authored almost 9 years ago

Merge branch 'feature-zoom-control' into develop

e9a64540df9d1f63dfddb2690470782f2953d146 authored almost 9 years ago

Fix: #197 Put the zoom toolbar in the bottom-right corner

39ccd56eef53a4c42badf47909ab31c94ef7f633 authored almost 9 years ago

Merge branch 'feature-logging-output' into develop

1180c310a2ca0d64e23b6a708975cb0c24a480ef authored almost 9 years ago

Make the console and the application more readable

6c723fddd9d11598805359310dcd28c169eac167 authored almost 9 years ago

Added CTRL+= for zoom-in (closes #192).

cb07e630a2f36c3266f74ae295f755ca2556bd6b authored almost 9 years ago

Fix zoom in key not working

eeca30197ab2f353a0dfa8c125f4ea454c8b3ab6 authored almost 9 years ago

Read/write of texture mappings for triangle and ellipses works.

8dc7177ae90a5c8233ba3ea6da8994c79adbdc2e authored almost 9 years ago

Fixed error where coordinates were saved with a "," instead of a "." to represent fractions.

7c95971da0a93180be127fd02bd31bafc5345b68 authored almost 9 years ago

Implemented parsing of mappings and shapes.

cf11335c1d2e0f6f0d602fac903a881097e30abe authored almost 9 years ago

Generalized the constructors for Mapping to always allow input shape (making it more general).

f6fc556b3ed41a30790111f2c3288563146b67a5 authored almost 9 years ago

Made Ellipse base constructor invokable to fix error when loading.

c45a1179e5ae98219635da86dbbe52391fd9005c authored almost 9 years ago