Commit Graph

824 Commits

Author SHA1 Message Date
baydam 61528b3701 Fix merge bugs 2015-12-24 19:17:10 +00:00
baydam 5854c2f5a3 Merge branch 'baydam-feature-osc-improve' into develop 2015-12-24 18:52:32 +00:00
baydam 038a705e5d Resolve merge conflicts 2015-12-24 18:51:59 +00:00
Tats eb9a024635 Merge branch 'refactor-mapper-mapping-gui' into develop 2015-12-23 19:15:29 -05:00
Tats e3cdf4f464 Moved classes pertaining to ShapeGraphicsItem and ShapeControlPainter in separate files outside of MappingGui.{h,cpp}. 2015-12-23 19:14:39 -05:00
baydam 41036354b8 Able to rename mapping with double click 2015-12-18 12:54:36 +00:00
baydam 13a7eb01e3 Reduce default size for small screen 2015-12-14 22:33:44 +00:00
baydam 66fc373e7b Fixed bug #101 Sending OSC visible parameter to paint that doesn't exist will not crash the software anymore 2015-12-14 15:14:05 +00:00
baydam bafd700a1c Change shortcut for adding color paint #137 2015-12-11 23:32:10 +00:00
baydam cf62a6cfc5 Handle fullscreen case for cinnamon(Linux Mint) 2015-12-11 18:47:22 +00:00
baydam 2db0d044a4 Reduce icon size for small screen 2015-12-11 18:41:39 +00:00
baydam 596e8d55ca Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop 2015-12-11 11:27:06 +00:00
baydam ae81c60ca0 Center the Test signal, fixed bug #155 and #97 2015-12-11 11:25:03 +00:00
Tats e76bdf1d9f Renamed Mapper to MappingGui (to correspond to Paint -> PaintGui). 2015-12-11 00:43:47 -05:00
Tats cf310dd45c Added comments to PaintGui 2015-12-10 16:54:53 -05:00
baydam 3a4f80c49f Fixed bug #156 related the white rectangle around the fullscreen window 2015-12-09 19:47:01 +00:00
baydam 317d87b2dd Fixed bug #149 Deleting a mapping actually deletes a paint when the paint tab is chosen 2015-12-09 18:30:39 +00:00
baydam 4aa71c1fb3 Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop 2015-12-08 16:00:05 +00:00
baydam df6d56abd0 Fixed bug #152 that make the software frozen when we load a project and the video files are not found 2015-12-08 15:58:25 +00:00
baydam 23e85c1794 Fixed bug #154 that make the software frozen when we load a project and the video files are not found 2015-12-08 15:44:52 +00:00
baydam 59513455db Fixed a bug #153 and #140 related to crosshair 2015-12-03 13:09:01 +00:00
Tats cc7b6aef6f Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2015-12-02 21:29:56 -05:00
Tats 1847881b04 Major cleanup and documenting of classes. 2015-12-02 21:29:46 -05:00
Tats 7b3084ed29 Major cleanup and documenting of Mapper.{h,cpp}. 2015-12-02 10:24:01 -05:00
Alexandre Quessy c216ed14f9 update NEWS 2015-10-30 15:39:06 -04:00
Alexandre Quessy a01aed4f7a post-release version bump 2015-10-30 15:27:33 -04:00
Alexandre Quessy 8e84b1dde6 Merge branch 'develop' 0.3.1 2015-10-30 15:25:17 -04:00
Alexandre Quessy d9220c50d0 update NEWS 2015-10-30 15:24:55 -04:00
Alexandre Quessy 936161fc8c Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2015-10-30 15:22:25 -04:00
Alexandre Quessy 8e51dfd3b5 less datasheet 2015-10-30 15:22:07 -04:00
Alexandre Quessy d660a94424 more TODO 2015-10-30 15:21:51 -04:00
Alexandre Quessy c7c537dbc0 some more comments 2015-10-29 17:03:48 -04:00
Alexandre Quessy bd47c8ac6c tell how to delete prefs on os x 2015-10-29 17:03:34 -04:00
Alexandre Quessy f3c24dbeb0 Fix typos in a print 2015-10-29 17:03:19 -04:00
Alexandre Quessy 3d1eb86405 ignore DMGVERSION.txt 2015-10-29 14:11:42 -04:00
Alexandre Quessy 7bd515c423 update INSTALL with newer GStreamer for OS X 2015-10-29 13:39:51 -04:00
Alexandre Quessy a0d8ddd504 update INSTALL 2015-10-28 16:13:30 -04:00
Alexandre Quessy 0313f5b1f7 Add OSC support on OS X 2015-10-28 16:12:48 -04:00
Alexandre Quessy e7a137f590 towards adding liblo on OS X 2015-10-28 15:40:13 -04:00
Alexandre Quessy 85b10d083a Fix video not playing + memleak in MediaImpl 2015-10-27 11:19:02 -04:00
Alexandre Quessy 7dd91defc3 update NEWS 2015-10-27 10:32:12 -04:00
Alexandre Quessy 3f9176974b Fix Stylesheet is not applied when the app is installed on Linux #139 2015-10-27 10:31:40 -04:00
Alexandre Quessy 9dd39b5d40 update NEWS 2015-10-27 10:08:59 -04:00
Tats 5e935b6ec5 Added latest changes (0.3) to the news 2015-10-27 10:07:39 -04:00
Alexandre Quessy 97d56c472a Make sure the splash screen image is packaged 2015-10-27 10:02:22 -04:00
Alexandre Quessy eed38f8d0b update HACKING 2015-10-27 10:02:12 -04:00
Alexandre Quessy 5760b20b15 We don't need libglew anymore 2015-10-27 10:00:24 -04:00
Tats fd77c9b06c Declare callback before changin URI 2015-09-17 19:07:09 -04:00
Tats cd4274a503 Removed link between uridecodebin and queue (this is performed during callback) 2015-09-17 19:06:38 -04:00
Tats dffdfa3da6 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2015-09-17 09:14:13 -04:00