eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-03 22:19:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
617 Commits 60 Branches 10 Tags
3bcbbc769782ddb5b5fed3bc13f3b60b7b302ec1
Commit Graph

198 Commits

Author SHA1 Message Date
Alexandre Quessy
3bcbbc7697 Display test signal 2014-10-27 06:04:12 -04:00
baydam
d3b676f01c Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-22 10:15:16 +00:00
baydam
427d3e52c7 Merge branch 'features-options' into develop 2014-10-21 18:20:56 +00:00
Tats
c8e0c23858 Allow for live changing of video rate with osc. 2014-10-21 17:47:43 +00:00
Tats
82aad45a97 Fixed support for read/write of mapping visibility (solo and locked are still incomplete). 2014-10-21 17:18:25 +00:00
baydam
01ad2f9f41 Merge branch 'develop' of github.com:mapmapteam/mapmap into features-options 2014-10-21 13:15:33 +00:00
baydam
ffb27c7af2 File chooser maynow remember the last directory 2014-10-21 12:45:44 +00:00
Alexandre Quessy
afc84bb692 Fix logic in setCursorVisible + make it visible if controls are 2014-10-21 01:52:03 -04:00
Alexandre Quessy
af84795c78 Try to hide cursor in output window, when desired 2014-10-20 17:13:37 -04:00
Alexandre Quessy
363b5795ba Fix delete menu option 2014-10-20 13:54:06 -04:00
baydam
aa926ee850 Add Menu listing recents import video 2014-10-20 17:13:14 +00:00
baydam
f2e69b17a2 Open recents file menu finally working well 2014-10-20 10:53:01 +00:00
Alexandre Quessy
6c95c8f11a Add Dame Diongue to the list of developers 2014-10-18 21:02:42 -04:00
baydam
20d930fa99 Starting to add Recent File action, but not working yet 2014-10-18 18:45:51 +00:00
Tats
c309219cea Fixed bug #33: The --fullscreen option doesn't work. 2014-10-18 14:28:22 +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
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
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
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
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
e31e412378 Do not store OSC port in settings (for now) 2014-10-16 20:30:45 -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
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
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
1b73d45a89 New feature: menu option toggle sticky vertices 2014-10-14 01:48:00 -04:00
Tats
8f03e98010 Main splitter gets all the extra width when window is stretched 2014-10-13 23:53:38 -04:00
Tats
8f1c1fb35f Fix main splitter proportion 2014-10-13 23:51:54 -04:00
Tats
3a8824ec52 Small fixes 2014-10-13 23:51:40 -04:00
Tats
b941819051 When paint is changed, unselect any mappings 2014-10-13 23:41:29 -04:00
Tats
fe90060ba3 When mapping is changed, corresponding paint is changed 2014-10-13 23:41:14 -04:00
Tats
aac83a576a Switch to mapping tab when mapping is added. 2014-10-13 23:29:40 -04:00
Tats
b6292e5fa4 Switch to paint tab when new paint added 2014-10-13 23:23:02 -04:00