 Bay Dam
|
391785fe23
|
Update .travis.yml
|
2020-04-06 17:12:10 +00:00 |
|
|
Bay Dam
|
e591da84c7
|
Attempted fix of Linux travis build check
|
2020-04-06 17:08:24 +00:00 |
|
|
baydam
|
e2ef8a5e48
|
Fix Merge conflict branch 'develop' of https://github.com/mapmapteam/mapmap into develop
|
2020-04-03 17:31:26 +00:00 |
|
|
baydam
|
e17fa5158c
|
Add keyboard shortcut window in the help menu
|
2020-04-03 17:26:38 +00:00 |
|
|
Sofian Audry
|
656d4c825f
|
Merge pull request #491 from mapmapteam/feature-oscpack
Implement OSC with oscpack
|
2020-04-02 10:20:22 -04:00 |
|
|
baydam
|
2af0c5e555
|
Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop
|
2020-04-02 12:07:48 +00:00 |
|
|
Alexandre Quessy
|
213786465a
|
Implement OSC with oscpack
- Use oscpack
- small cleanup in mapmap.pro
- try to troubleshoot the set color paint bug
|
2020-04-01 20:46:08 -04:00 |
|
|
baydam
|
da08f11751
|
Load markdown file directly instead of convert them to html first
|
2020-04-02 00:05:19 +00:00 |
|
|
Sofian Audry
|
dda4ab026d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-04-01 18:56:36 -04:00 |
|
|
Sofian Audry
|
f1b42e9010
|
Changed hotkeys to add webcam (was confusing because CTRL-C is usually for copying an item).
|
2020-04-01 18:56:26 -04:00 |
|
|
Sofian Audry
|
ef3025e794
|
Integrated support for predefined rotations (closes #293).
|
2020-04-01 18:55:49 -04:00 |
|
|
Sofian Audry
|
0618fa04ff
|
Removed unused variable.
|
2020-04-01 18:54:10 -04:00 |
|
|
Sofian Audry
|
2d68e443f7
|
Changed text for flip command.
|
2020-04-01 18:48:21 -04:00 |
|
|
Michaël Creusy
|
8f238e31c0
|
Feature osc doc fix (#478)
* Update osc.md
little fix
* Update osc.html
little fix
|
2020-04-01 18:05:43 -04:00 |
|
|
Sofian Audry
|
7cf29d9ae0
|
Merge pull request #488 from baydam/develop
Develop
|
2020-04-01 18:02:09 -04:00 |
|
|
baydam
|
e65a9d82fe
|
Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop
|
2020-04-01 20:39:23 +00:00 |
|
|
baydam
|
1d9e4bde6b
|
Fix bug #402 related to preferred language (Downside: create alias every time a new language is added)
|
2020-04-01 20:27:40 +00:00 |
|
|
Sofian Audry
|
469339b716
|
Fixed link to mapmap website in About dialog (closes #429).
|
2020-04-01 15:22:57 -04:00 |
|
|
baydam
|
43e03e6aed
|
Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop
|
2020-04-01 15:06:46 +00:00 |
|
|
Sofian Audry
|
d4dc4e381d
|
Use clone to duplicate mapping in duplicateMapping(uid).
|
2020-03-23 15:23:25 -04:00 |
|
|
Sofian Audry
|
5b40bfbc3c
|
Resolved conflicts.
|
2020-03-23 15:18:40 -04:00 |
|
|
baydam
|
94a7dbe9d3
|
Fix merge issue (but camera recent implement not working anymore)
|
2020-03-12 18:28:47 +00:00 |
|
|
baydam
|
aa9e0179a2
|
Merge feature/camera-support into develop
|
2020-02-21 14:17:15 +00:00 |
|
|
baydam
|
60896c4e1e
|
Layer list cosmetic changes
|
2020-02-20 14:04:30 +00:00 |
|
|
baydam
|
f37d83a3dd
|
Camera implement improvements
|
2020-02-20 14:04:30 +00:00 |
|
|
baydam
|
0664032b27
|
Explicit call of paint destructor in order add Camera more than once
|
2020-02-20 14:04:30 +00:00 |
|
|
baydam
|
cc289ae416
|
Progressivly using C++11 litteral pointer nullptr
|
2020-02-20 14:04:30 +00:00 |
|
|
baydam
|
48b4a748a9
|
Remove Camera directory from recents videos
|
2020-02-20 14:04:30 +00:00 |
|
|
baydam
|
f0a1dd86b5
|
Use enumeration instead of string to safely define constant Shape type
|
2020-02-20 14:03:24 +00:00 |
|
|
baydam
|
256591d4e4
|
Use enumeration instead of string to define constant source type
|
2020-02-20 14:03:24 +00:00 |
|
|
baydam
|
c7123960e5
|
Extend camera support for Windows and OSX (base on Sofian's work)
|
2020-02-20 14:03:24 +00:00 |
|
|
baydam
|
178f26bcaa
|
Cosmetic changes on console window + Add message log context
|
2020-02-20 14:01:49 +00:00 |
|
|
baydam
|
c7afaaf8c7
|
Minor changes (code optimization)
|
2020-02-20 13:58:11 +00:00 |
|
|
baydam
|
2fc9d62480
|
Improve library link
|
2020-02-20 13:58:11 +00:00 |
|
|
baydam
|
29c0e6eaa4
|
Necessary changes to make camera work on Windows 10
|
2020-02-20 13:58:11 +00:00 |
|
|
baydam
|
600db0eb9e
|
Camera implement improvements
|
2020-02-20 13:58:11 +00:00 |
|
|
baydam
|
ba858ba68c
|
Explicit call of paint destructor in order add Camera more than once
|
2020-02-20 13:58:11 +00:00 |
|
|
baydam
|
037f0cc7aa
|
Progressivly using C++11 litteral pointer nullptr
|
2020-02-20 13:58:11 +00:00 |
|
|
baydam
|
e4a170c564
|
Remove Camera directory from recents videos
|
2020-02-20 13:58:11 +00:00 |
|
|
baydam
|
17ed8783a9
|
Use enumeration instead of string to safely define constant Shape type
|
2020-02-20 13:56:15 +00:00 |
|
|
baydam
|
e594581f00
|
Use enumeration instead of string to define constant source type
|
2020-02-20 13:56:15 +00:00 |
|
|
baydam
|
915033df07
|
Extend camera support for Windows and OSX (base on Sofian's work)
|
2020-02-20 13:56:15 +00:00 |
|
|
baydam
|
701d6bd042
|
Cosmetic changes on console window + Add message log context
|
2020-02-20 13:53:05 +00:00 |
|
|
Sofian Audry
|
fb6e52ea05
|
Simplified duplication by using clone() method.
|
2020-01-12 14:01:34 -05:00 |
|
|
Sofian Audry
|
9ab5cb2e6e
|
Allow OSC messages to change name (closes #472).
|
2020-01-05 22:04:35 -05:00 |
|
|
Sofian Audry
|
7056d3a5d3
|
Remove debug messages from OscInterface.
|
2020-01-05 19:07:55 -06:00 |
|
|
Sofian Audry
|
63baaec65d
|
Minor fix in tooltip.
|
2020-01-05 19:07:34 -06:00 |
|
|
Sofian Audry
|
36f173067d
|
Make sure to update model whenever list item is changed to update solo and locked when sending OSC (closes #471).
|
2020-01-05 19:07:15 -06:00 |
|
|
Sofian Audry
|
4dd2fbc048
|
Set appropriate default icon size for color paints (prevents different icon size for visible vs invisible paints).
|
2020-01-04 09:30:52 -06:00 |
|
|
Sofian Audry
|
50c2bb62ef
|
Set default icon if system provider cannot find any (fixes the fact that import camera never displays icon).
|
2020-01-04 07:36:03 -06:00 |
|