Commit Graph

323 Commits

Author SHA1 Message Date
Alexandre Quessy f870641aab remove useless flags in .pro file for os x 2014-04-26 06:21:58 -04:00
Alexandre Quessy 322da96ed2 more fixes for gst on os x 2014-04-25 22:02:49 -04:00
Alexandre Quessy d2f43049a6 fixes to the packaging for gst for os x 2014-04-25 21:08:40 -04:00
Alexandre Quessy e91496b96a Merge branch 'spike-video-drone' into gst-osx 2014-04-25 20:52:49 -04:00
Alexandre Quessy f731d6459e link against gst on mac 2014-04-25 20:24:00 -04:00
Tats f9ac582804 Loop movie 2014-04-26 01:02:06 +01:00
Tats 6e58f94a48 Simple "hack" with a QTimer to time the video 2014-04-26 01:01:44 +01:00
Tats ada827de41 Replaced images by videos + implemented hack on update() / runVideo() to quickly test gstreamer (works!) 2014-04-26 00:07:25 +01:00
Tats ed3f476d6b Brutal port of Drone code to try to make video work using gstreamer 0.10 using appsink 2014-04-25 23:38:46 +01:00
Tats 4d3694fe28 Added an option to toggle the display of shape control points 2014-04-10 18:27:40 -04:00
Tats a02bb298c3 Forgot to remove unused.h from .pro file 2014-04-10 18:27:09 -04:00
Tats 695c351400 Removed useless comment 2014-04-10 17:39:48 -04:00
Tats 419834b0ee Removed MainWindow singleton, replacing it with much more appropriate member pointers in custom widgets 2014-04-10 17:39:37 -04:00
Tats 4e4483c56c Replaced UNUSED(x) by Q_UNUSED(x). 2014-04-10 01:07:24 -04:00
Alexandre Quessy d0f5241fa2 git ignore .app 2014-04-09 19:30:17 -04:00
Alexandre Quessy ad7bc89f28 thank you La Francophonie 2014-04-09 19:29:46 -04:00
Alexandre Quessy ab0ccb7e49 Mac OS X: build using Qt 5 2014-04-09 19:28:11 -04:00
Alexandre Quessy 93afd7f2df git ignore more files for Mac OS X 2014-04-04 10:27:06 -04:00
Alexandre Quessy 14d1768fe4 more to do 2014-04-04 10:26:05 -04:00
Tats b02cdc5f35 Merge branch 'master' of github.com:mapmapteam/mapmap 2014-04-04 00:58:06 -04:00
Alexandre Quessy 6c1227f4d1 much more to do 2014-04-04 00:55:31 -04:00
Tats 3c7407901a Merge branch 'master' of github.com:mapmapteam/mapmap 2014-04-04 00:55:05 -04:00
Tats eded602ef9 Fixed bug: texture meshes points were not loaded in the right order 2014-04-04 00:54:17 -04:00
Alexandre Quessy 069e5a5e6f update INSTALL with infos for Mac OS X 2014-04-04 00:36:35 -04:00
Alexandre Quessy 74efb0dada fix crash on Mac OS X 2014-04-04 00:29:41 -04:00
Alexandre Quessy cfb88e6863 Fixes for when we don't have liblo on mac os x 2014-04-03 23:30:51 -04:00
Tats 0f3af44953 Merge branch 'master' of github.com:mapmapteam/mapmap 2014-03-31 15:16:14 -04:00
Tats 003469dbab Fixed Maxime's name 2014-03-31 15:16:06 -04:00
Alexandre Quessy a7608e5413 mv Math.h Maths.h, caused problems on Mac 2014-03-30 11:50:04 -04:00
Alexandre Quessy 56147e265b Merge branch 'master' of github.com:mapmapteam/mapmap 2014-03-22 16:08:04 -04:00
Alexandre Quessy c54432694e fix build.sh for some proto 2014-03-22 15:53:37 -04:00
Tats edc5f90a79 Merge branch 'master' of github.com:mapmapteam/mapmap 2014-03-22 02:03:25 -04:00
Tats 13364f98c7 Bug fix: triangles setVertex() did nothing 2014-03-22 01:53:51 -04:00
Tats 7f10566ede Update todo 2014-03-22 01:49:56 -04:00
Alexandre Quessy f7bfeb415d Use major.minor.micro for version number. 2014-03-21 22:34:20 -04:00
Alexandre Quessy e6ad73d527 fix build.sh for GNU/Linux 2014-03-21 22:24:13 -04:00
Alexandre Quessy 3ad38c7775 Move wx prototypes to prototypes/wx
Please do not remove prototypes, unless it's to another Git repositoty
Some of the prototypes that were removed contained interesting ideas.
Thank you.
2014-03-21 21:58:19 -04:00
Alexandre Quessy c496cc9d29 Revert "Removed wxWidget prototypes"
This reverts commit 3fd1754776.
2014-03-21 21:57:16 -04:00
Alexandre Quessy 2507489e97 Merge branch 'master' of github.com:mapmapteam/mapmap 2014-03-21 21:53:00 -04:00
Alexandre Quessy 73f77d342d update INSTALL 2014-03-21 16:06:22 -04:00
Alexandre Quessy e00ecddde2 Fix some env var in build.sh 2014-03-21 09:06:43 -04:00
Alexandre Quessy 48723aa9dd Try to build it on Mac OS X 10.9.1 2014-03-21 01:27:59 -04:00
Tats f2a7e93b36 Prevents quad / polygon vertices to cross a segment (ie. makes sure they stay simple polygons). 2014-03-19 22:35:22 -04:00
Tats 441664e6f0 Added a Polygon shape and corresponding mappers (just used as a superclass of Quad and Triangle for now). 2014-03-19 22:34:34 -04:00
Tats 7602a77166 Allow reordering of sources in list 2014-03-19 15:01:18 -04:00
Tats aa0dce3831 Cosmetic change. 2014-03-18 23:27:06 -04:00
Tats 08da5d4fa6 Properly manage the windowModified() calls to let the software know something has changed. 2014-03-18 23:26:58 -04:00
Tats ff1d98e1a8 Created a method addPaintId similar to the addMappingId to reuse some code. 2014-03-18 23:26:17 -04:00
Tats 9c85eb17fc Bug fix: once all mappings were destroyed, current ids were not reset (removed). 2014-03-18 23:03:08 -04:00
Tats 7425d65832 Methods removeCurrent*() reset uids to NULL_UID. 2014-03-18 23:02:10 -04:00