eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-06-16 12:33:19 +02:00
Code Issues Packages Projects Releases Wiki Activity
556 Commits 62 Branches 10 Tags
6308aca59f49548713e424c8bbfeeb9a3e413c4b
Commit Graph

556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tats 6308aca59f Fixed bug #33: The --fullscreen option doesn't work. 2014-10-18 17:07:59 +00:00
Tats 1d152d487f Integrated latest changes from Dame wrt item selections (paint and mapping lists). 2014-10-18 13:40:42 +00:00
Tats d667313ce8 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 
Conflicts:
	MainWindow.cpp
	MediaImpl.cpp
 2014-10-18 13:22:36 +00:00
Alexandre Quessy 851aa5234b Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-18 12:18:44 -04:00
Alexandre Quessy 436dc9d5a0 Refactor the pipeline + fix merge shmsrc feature 2014-10-18 12:17:38 -04:00
Tats c9b0888231 Reenabled seeking when clip is over (loop) without having to reload the movie. 2014-10-18 13:11:21 +00:00
baydam d275cf065d Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-18 11:28:16 +00:00
baydam 103424ece7 Fix bugs when shape selected, select corresponding mapping 2014-10-18 11:18:20 +00:00
Tats 6f015b1cb8 Moved gst_init() in main application and added gst_deinit(). 2014-10-18 10:05:53 +00:00
Tats 80d0f73407 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-18 10:05:17 +00:00
Alexandre Quessy 2a66de38ff add --osc-port option 2014-10-17 13:57:13 -04:00
Alexandre Quessy c53cb753ef add scripts/replate-path-in-project.sh 2014-10-17 13:41:10 -04:00
Alexandre Quessy 63e01d5285 add --file option 2014-10-17 13:33:04 -04:00
Alexandre Quessy a0cea41fc5 Add --reset-settings option 2014-10-17 13:12:07 -04:00
Alexandre Quessy 54534c3cf7 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-17 11:59:23 -04:00
Alexandre Quessy a72f183d24 Try to make --fullscreen option work 2014-10-17 11:58:55 -04:00
baydam 3b4ca8653c Fixed bug #28 otherwise 2014-10-17 15:58:08 +00:00
baydam 332cea7030 Fix issues New paint item does not get selected in some circumstances #28 2014-10-17 15:45:39 +00:00
Tats 40c7dc039b Added logos as QRC (resources). 2014-10-17 12:30:27 +00:00
Tats eb42367bb4 Renamed logo file (big). 2014-10-17 12:30:17 +00:00
Tats 50a96dc254 Created QIcon for media files using QIconProvider. 2014-10-17 12:29:42 +00:00
Tats e3bfe310b3 Added Mapmap logo title to About. 2014-10-17 12:29:15 +00:00
Alexandre Quessy ecf0efe956 Port to Qt5 on GNU/Linux 2014-10-16 21:27:06 -04:00
Alexandre Quessy 7e89ee4ed7 OSC: fix check for a valid OSC server 2014-10-16 20:31:14 -04:00
Alexandre Quessy e31e412378 Do not store OSC port in settings (for now) 2014-10-16 20:30:45 -04:00
Alexandre Quessy 880cf70e93 Check if file exists before creating the pipeline 2014-10-16 20:30:20 -04:00
Tats d3c54a183f Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-16 21:47:31 +00:00
Tats bafff221bd Merge branch 'feature/shmsrcbin-rebase-oct2014' of https://github.com/vliaskov/libremapping into feature-merge-vliaskov-shmsrcbin 
Conflicts:
	MainWindow.cpp
	MainWindow.h
	MediaImpl.cpp
	ProjectReader.cpp
 2014-10-16 21:46:33 +00:00
Tats a7e1e61aca Merge branch 'feature-refactor-gui-organization' into develop 
Conflicts:
	MappingManager.h
 2014-10-16 20:58:40 +00:00
Tats abb62dc1f2 Integrated file choosing pop-up for images and media in property browser. 2014-10-16 20:56:02 +00:00
Tats 13ff156159 Made function _getBits() protected. 2014-10-16 18:28:20 +00:00
Tats a5255c2824 Cleanup and documentation in MappingManager.h. 2014-10-16 18:25:06 +00:00
Tats 96b55099de In MappingManager::reorderMapping added some extra check to make sure we're sending an appropriate QVector<uid> (no repetition in the uids). 2014-10-16 18:24:55 +00:00
Tats 2f75e4d2ca Adjustment to MappingManager::getVisibleLayers() so that solo-ed layers that are not-visible don't show. 2014-10-16 18:22:42 +00:00
Tats eef76173b6 Integrated paint guis while removing remains of oldPaint/double-click system. 2014-10-16 17:52:32 +00:00
Tats fc89b4fb11 Added PaintGui for textures. 2014-10-16 17:51:41 +00:00
Tats 948a68c8ee Removed commented out deleteAction (minor change). 2014-10-16 17:50:55 +00:00
Tats 4e8a2c19f1 Slightly better timer interval management (with global const variable). 2014-10-16 17:28:17 +00:00
Tats ac29ca5c1f Merged latest changes from develop 2014-10-15 13:42:32 +00:00
Alexandre Quessy bc456961a1 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-14 22:15:26 -04:00
Tats 55e909dc69 Introduced a property panel for paints and managed the case of color (disabling double-click feature in the process) 2014-10-14 22:36:54 +00:00
Tats 5640e5b471 Put some long method definitions in the .cpp 2014-10-14 22:36:03 +00:00
Alexandre Quessy f6644d2b15 Remove unused Facade.{h,cpp} and Controller 2014-10-14 18:11:50 -04:00
Alexandre Quessy 31896eb38b Write/read outputWindowFullscreen setting 2014-10-14 10:59:19 -04:00
Alexandre Quessy 695c0fe751 Do not display output window at startup 2014-10-14 10:54:01 -04:00
Alexandre Quessy f63885f4f0 Add missing MM.h to mapmap.pro 2014-10-14 10:52:10 -04:00
Alexandre Quessy bb1ac54c32 Fix: Press Esc: Do not close output window 2014-10-14 10:42:01 -04:00
Alexandre Quessy cbee34aabd Feature: Select a shape with a click 2014-10-14 07:40:17 -04:00
Alexandre Quessy 5e6e4909e1 Fix: radius for dragging vertices. Drag shape with left click. 2014-10-14 06:20:22 -04:00
Alexandre Quessy 1b73d45a89 New feature: menu option toggle sticky vertices 2014-10-14 01:48:00 -04:00