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
73f77d342d
update INSTALL
2014-03-21 16:06:22 -04:00
e00ecddde2
Fix some env var in build.sh
2014-03-21 09:06:43 -04:00
48723aa9dd
Try to build it on Mac OS X 10.9.1
2014-03-21 01:27:59 -04:00
f2a7e93b36
Prevents quad / polygon vertices to cross a segment (ie. makes sure they stay simple polygons).
2014-03-19 22:35:22 -04:00
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
7602a77166
Allow reordering of sources in list
2014-03-19 15:01:18 -04:00
aa0dce3831
Cosmetic change.
2014-03-18 23:27:06 -04:00
08da5d4fa6
Properly manage the windowModified() calls to let the software know something has changed.
2014-03-18 23:26:58 -04:00
ff1d98e1a8
Created a method addPaintId similar to the addMappingId to reuse some code.
2014-03-18 23:26:17 -04:00
9c85eb17fc
Bug fix: once all mappings were destroyed, current ids were not reset (removed).
2014-03-18 23:03:08 -04:00
7425d65832
Methods removeCurrent*() reset uids to NULL_UID.
2014-03-18 23:02:10 -04:00
d511243618
Bug fix in the iteration over ids (was iterating over vector index, not item uids).
2014-03-18 23:01:45 -04:00
c58fc54e67
Small change (cosmetic / performance)
2014-03-18 23:01:01 -04:00
2da3f4a5a1
Added dialog when deleting paint.
2014-03-18 23:00:24 -04:00
63f59b4486
Enable/disable creation of mappings depending on whether a paint is selected.
2014-03-16 19:36:36 -04:00
540ae8a983
Allow the seamless removal of both paint and mappings.
2014-03-16 19:31:20 -04:00
7c52f13f16
Major cleanup in MainWindow
2014-03-16 15:47:14 -04:00
712ec8cfbc
Added some shortcuts to add shapes
2014-03-16 12:36:35 -04:00
164023f1e9
Use CTRL-DEL instead of just DEL for deleting stuff
2014-03-16 12:34:03 -04:00
338a32af60
Cleanup of comments
2014-03-16 01:12:43 -04:00
20c603b995
Implement working mapping removal
2014-03-16 01:12:32 -04:00
3910302f80
Replaced STL vectors and maps by Qt-style
2014-03-16 01:11:38 -04:00
f0ca7124db
Small comment
2014-03-16 00:04:29 -04:00
dc202e1461
Reset focus on main window
2014-03-16 00:04:22 -04:00
3a2033a4e1
Save and restore geometry of output window
2014-03-16 00:03:19 -04:00
b313edc553
Manage close event (unchecks the menu item in main window)
2014-03-15 23:55:29 -04:00
392869f56f
Manage appropriate layout and resizing of output GL canvas
2014-03-15 23:37:54 -04:00
14f35c640c
Synchronization of GL in destination and ouptut window
2014-03-15 23:37:36 -04:00
81e519d366
Added an output GL window that reproduces the destination (refresh still not working).
...
Window can be toggled on/off.
2014-03-15 23:01:37 -04:00
70f6b1356e
Removed wrong ProjectReader.h in SOURCES
2014-03-15 23:00:49 -04:00
8965090dfa
Merge branch 'master' into develop
2014-03-15 22:21:02 -04:00
3fd1754776
Removed wxWidget prototypes
2014-03-15 22:05:51 -04:00
e6dfbf176d
Removed wxWidget prototypes
2014-03-15 22:02:13 -04:00
c20b47aaf4
more fixes
2014-03-14 11:54:54 -04:00
d11bc93496
re-implement and fix osc receiver
2014-03-14 11:51:52 -04:00
8652e9555e
get rid of warnings
2014-03-14 11:47:58 -04:00
0cf4a5086c
Rename project to MapMap
2014-03-04 11:35:12 -05:00
Tats