Commit Graph

10 Commits

Author SHA1 Message Date
Tats
559a7ebf90 Merge branch 'develop' into statesaving
Conflicts:
	DestinationGLCanvas.cpp
	MainWindow.cpp
	MainWindow.h
	Mapper.h
	MappingManager.cpp
	MappingManager.h
	Paint.h
	Shape.h
	SourceGLCanvas.cpp
	Util.cpp
	libremapping.pro
	main.cpp
2014-01-05 18:06:41 -05:00
Alexandre Quessy
8c2b7fddd6 Load: 50% done. Fix shortcuts. 2013-12-09 17:33:35 -05:00
Alexandre Quessy
b0763be6a0 paint have ids 2013-12-09 16:06:01 -05:00
Alexandre Quessy
dce8f0b35d Saves an XML file. 2013-12-09 15:20:33 -05:00
Tats
50649d2a40 Reordering of layers with drag and drop 2013-12-05 02:16:55 -05:00
Tats
dd3189e847 Checkbox for toggling visibility of layers (+ some cleanup) 2013-12-05 01:38:03 -05:00
Tats
71ad58787f Added Layers (model side) 2013-12-05 00:51:33 -05:00
Tats
80f2d92eab Added unique ids to Mapping and Paint 2013-12-05 00:16:37 -05:00
Tats
8b205526fe Completed integration of one source -> many quads (everything working) 2013-11-30 21:48:01 -05:00
Tats
5a999f1983 - Put all mappings and paints in a single MappingManager class
- Basic compiling / running program (no quads for now)
2013-11-30 19:19:29 -05:00