9409f7932f
Add OSC file - with the OSC API
2014-04-26 19:58:40 +01:00
348ffcb37e
Implement OSC callback to set video URI
2014-04-26 19:20:21 +01:00
5a2a1c3ce6
Cosmetic change
2014-04-26 13:32:37 +01:00
ca9ba38682
Performance improvement: copy texture bits to video card only if they have changed
2014-04-26 13:32:27 +01:00
ce305140a8
Allow media filenames (URI) with accents (ie. utf8)
2014-04-26 12:38:28 +01:00
0295d50779
Removed unused.h
2014-04-26 12:38:11 +01:00
d276c6a126
Changed extension for mapmap
2014-04-26 12:37:51 +01:00
430b0f223a
Refactor Video -> Media
2014-04-26 12:22:33 +01:00
26e709c5c6
Replaced updateAll() by updateCanvases()
2014-04-26 12:08:00 +01:00
e4f8568b34
Merge branch 'gst-osx' into develop
...
Conflicts:
mapmap.pro
2014-04-26 12:04:16 +01:00
e2b7f9b982
Compilation fixes
2014-04-26 11:27:59 +01:00
322da96ed2
more fixes for gst on os x
2014-04-25 22:02:49 -04:00
0e3ba9ee14
Added pkgconfig in .pro file (includes gstreamer in prevision of future dev.)
2014-04-26 02:17:49 +01:00
d2f43049a6
fixes to the packaging for gst for os x
2014-04-25 21:08:40 -04:00
e91496b96a
Merge branch 'spike-video-drone' into gst-osx
2014-04-25 20:52:49 -04:00
f731d6459e
link against gst on mac
2014-04-25 20:24:00 -04:00
f9ac582804
Loop movie
2014-04-26 01:02:06 +01:00
6e58f94a48
Simple "hack" with a QTimer to time the video
2014-04-26 01:01:44 +01:00
ada827de41
Replaced images by videos + implemented hack on update() / runVideo() to quickly test gstreamer (works!)
2014-04-26 00:07:25 +01:00
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
4d3694fe28
Added an option to toggle the display of shape control points
2014-04-10 18:27:40 -04:00
a02bb298c3
Forgot to remove unused.h from .pro file
2014-04-10 18:27:09 -04:00
695c351400
Removed useless comment
2014-04-10 17:39:48 -04:00
419834b0ee
Removed MainWindow singleton, replacing it with much more appropriate member pointers in custom widgets
2014-04-10 17:39:37 -04:00
4e4483c56c
Replaced UNUSED(x) by Q_UNUSED(x).
2014-04-10 01:07:24 -04:00
d0f5241fa2
git ignore .app
2014-04-09 19:30:17 -04:00
ad7bc89f28
thank you La Francophonie
2014-04-09 19:29:46 -04:00
ab0ccb7e49
Mac OS X: build using Qt 5
2014-04-09 19:28:11 -04:00
93afd7f2df
git ignore more files for Mac OS X
2014-04-04 10:27:06 -04:00
14d1768fe4
more to do
2014-04-04 10:26:05 -04:00
b02cdc5f35
Merge branch 'master' of github.com:mapmapteam/mapmap
2014-04-04 00:58:06 -04:00
6c1227f4d1
much more to do
2014-04-04 00:55:31 -04:00
3c7407901a
Merge branch 'master' of github.com:mapmapteam/mapmap
2014-04-04 00:55:05 -04:00
eded602ef9
Fixed bug: texture meshes points were not loaded in the right order
2014-04-04 00:54:17 -04:00
069e5a5e6f
update INSTALL with infos for Mac OS X
2014-04-04 00:36:35 -04:00
74efb0dada
fix crash on Mac OS X
2014-04-04 00:29:41 -04:00
cfb88e6863
Fixes for when we don't have liblo on mac os x
2014-04-03 23:30:51 -04:00
0f3af44953
Merge branch 'master' of github.com:mapmapteam/mapmap
2014-03-31 15:16:14 -04:00
003469dbab
Fixed Maxime's name
2014-03-31 15:16:06 -04:00
a7608e5413
mv Math.h Maths.h, caused problems on Mac
2014-03-30 11:50:04 -04:00
56147e265b
Merge branch 'master' of github.com:mapmapteam/mapmap
2014-03-22 16:08:04 -04:00
c54432694e
fix build.sh for some proto
2014-03-22 15:53:37 -04:00
edc5f90a79
Merge branch 'master' of github.com:mapmapteam/mapmap
2014-03-22 02:03:25 -04:00
13364f98c7
Bug fix: triangles setVertex() did nothing
2014-03-22 01:53:51 -04:00
7f10566ede
Update todo
2014-03-22 01:49:56 -04:00
f7bfeb415d
Use major.minor.micro for version number.
2014-03-21 22:34:20 -04:00
e6ad73d527
fix build.sh for GNU/Linux
2014-03-21 22:24:13 -04:00
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
c496cc9d29
Revert "Removed wxWidget prototypes"
...
This reverts commit 3fd1754776
2014-03-21 21:57:16 -04:00
2507489e97
Merge branch 'master' of github.com:mapmapteam/mapmap
2014-03-21 21:53:00 -04:00
Alexandre Quessy