eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-01 04:59:45 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,095 Commits 60 Branches 10 Tags
mac-bundle
Commit Graph

181 Commits

Author SHA1 Message Date
baydam
d01dd4d356 Allow to finely choose on which display to output 2016-04-22 17:00:55 +00:00
baydam
d8d9671b6c improving the menu and adding some useful link 2016-04-20 17:25:31 +00:00
baydam
f5c0c8a221 Mention of removing unused fonctions in TODO entries 2016-04-19 15:42:18 +00:00
baydam
1b09dd08d8 Can undo or redo Add/Remove paint 2016-04-15 13:05:34 +00:00
baydam
a3355d86be Fix: #240 Allow easy switch between destination+source, destination-only and source-only views 2016-04-14 17:27:01 +00:00
Tats
6f9fde311f Fixed bug: ESC key would not work properly to exit full screen. 2016-03-26 19:40:51 -04:00
Tats
2bb758b4c6 Moved display of test signal into OutputGLCanvas where it belongs. 2016-03-26 18:13:06 -04:00
baydam
34bb866a98 Mapping list context menu improvements 2016-03-25 17:02:05 +00:00
baydam
37ce6e6cee remove MainWindow event filter 2016-03-22 23:02:42 +00:00
Tats
f02933d9a4 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2016-03-16 17:28:45 -04:00
Tats
8421c87cd4 Added OSC support for play, pause, and rewind. 2016-03-16 17:28:33 -04:00
baydam
b375367811 Integrate all code inside a namespace 2016-03-16 18:05:47 +00:00
Tats
448d9e877c Made source and destination panel QWidgets part of the MainWindow class. 2016-03-16 01:12:21 -04:00
Tats
84ebb9d3ad Moved the zoom toolbar into a separate widget class, added them in the right spots and made them correctly interoperate with the canvases. 2016-03-06 01:22:34 -05:00
Tats
28261033c6 Removed DestinationGLCanvas and SourceGLCanvas which were not doing much: integrated them directly in MapperGLCanvas. 2016-03-06 00:43:01 -05:00
Tats
038a0e7e55 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 
# Conflicts:
#	MainWindow.h
 2016-03-05 22:47:33 -05:00
Tats
3d58c92e97 Merge branch 'feature-advanced-mapping-list' into develop-try-to-merge-with-adv 
# Conflicts:
#	MainWindow.cpp
 2016-03-05 22:41:41 -05:00
baydam
ab9478c4c2 The fullscreen button is activated only in dual screen mode 2016-03-06 03:11:13 +00:00
baydam
30db5dcc72 Fix: #143 "The output window should provide the same menus and shortcuts as the main window" 2016-03-06 01:36:14 +00:00
Tats
59e95e4c02 Replace "mute" by "hide". 2016-03-04 18:46:54 -05:00
baydam
7cc1043368 Fix broken Undo/Redo for Delete command 2016-03-04 12:10:08 +00:00
Tats
e93d1123c3 Cosmetic change. 2016-03-03 22:25:07 -05:00
Tats
e87de3d3e9 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). 2016-03-03 22:25:00 -05:00
baydam
23331abf57 Add buttons on mapping layers 2016-03-03 10:18:54 +00:00
baydam
d3975c841f Add buttons on mapping layers 2016-03-03 10:15:24 +00:00
baydam
fde9114009 Work In Progress (reverted from commit 17a64fdade) 2016-02-29 16:46:07 +00:00
baydam
17a64fdade Work In Progress 2016-02-29 16:44:26 +00:00
baydam
38db95ffd4 Wrong approach of mapping layers buttons (reverted from commit 51b0976487) 2016-02-23 18:54:30 +00:00
baydam
35c9f7b7f8 Wrong approach of mapping layers buttons 2016-02-19 13:38:11 +00:00
Tats
1146a6408e Merge branch 'develop' into feature/qt-properties 
# Conflicts:
#	Mapping.h
#	OscInterface.cpp
#	ProjectReader.cpp
#	ProjectWriter.cpp
#	Shape.h
#	main.cpp
 2016-02-15 13:16:04 -05:00
baydam
8281f7dfef Show and hide menu bar option not available on Mac & Ubuntu 2016-02-14 22:14:02 +00:00
baydam
420e30b187 UX Design document: status bar 2016-02-14 17:05:03 +00:00
Tats
e1270cd17a Rate (speed) and volume both reset to be in 0..1 instead of 0..100. 2016-02-12 11:59:37 -05:00
baydam
21c91295d1 Display lock/mute/solo options in the context menu 2016-02-11 21:24:08 +00:00
baydam
5c66fa1b8d User can show or hide toolbar 2016-02-08 19:08:37 +00:00
baydam
d1af8b4208 Now we are able to show and hide menubar with ALT key 2016-02-08 16:20:45 +00:00
baydam
d889a6c616 Output window is fullscreen only if a video projector is connected or not visible 2016-02-05 18:17:47 +00:00
baydam
f4d0e6bd6a Merge import media and image actions 2016-02-04 18:28:08 +00:00
baydam
eb38336e16 Insert header may fix compilation error 2016-01-22 09:26:44 +00:00
baydam
156e74acd5 Fix:#183 "Display logging output in a console and able to show and hide" 2016-01-21 21:54:34 +00:00
baydam
a7a56e6e92 Improvements of the menu elements 2016-01-20 16:35:36 +00:00
baydam
4e3ccf45d4 Add "zoom in/out/reset and fit to content" buttons 2016-01-13 20:38:43 +00:00
baydam
f03be893a3 Fix: #159 Handle corrupted files 2016-01-05 18:45:54 +00:00
baydam
093fb3cd9d Fix: #179 Paints and mappings renamings are now saved in file 2016-01-05 12:10:54 +00:00
baydam
a20beba15b Manage show and hide of Undo Stack tab #145 2015-12-31 15:46:56 +00:00
baydam
61a530375f Be able to rename paints and mappings OSC #72 2015-12-29 16:44:31 +00:00
baydam
73f28ae340 Can rename Paint with double click #174 2015-12-29 14:36:06 +00:00
baydam
a4384faf78 Center the test signal #97 2015-12-29 10:34:52 +00:00
baydam
23847b86ed Delete unused fonction 2015-12-28 13:28:47 +00:00
Tats
fc627b2306 Compilation errors fix in MainWindow. 2015-12-26 19:25:37 -05:00