diff --git a/Common.h b/Common.h index a557131..a762fe7 100644 --- a/Common.h +++ b/Common.h @@ -27,8 +27,6 @@ #include "Shape.h" #include "Mapper.h" -#define LIBREMAPPING_VERSION "0.1" - /** * The main MapMap engine that deals with video mapping projects. */ diff --git a/HACKING b/HACKING index be45c93..1b50596 100644 --- a/HACKING +++ b/HACKING @@ -3,7 +3,6 @@ Contribute to MapMap Coding style ------------ - * indent with 2 spaces * opening curly braces on a new line * function and method names camelCase, with lowercase first letter @@ -12,3 +11,22 @@ Coding style * file names all lowercase * always add spaces between operators such as +, -, /, * casts, etc. (except pointers and references) +Version numbers +--------------- +We use Semantic Versioning 2.0.0. Given a version number MAJOR.MINOR.PATCH, increment the: +* MAJOR version when you make incompatible API changes, +* MINOR version when you add functionality in a backwards-compatible manner, and +* PATCH version when you make backwards-compatible bug fixes. +See http://semver.org/ + +Files +----- +* BUGS: List of bugs to fix. (or, again, use github for these) +* HACKING: What to know to contribute to the project. +* INSTALL: Instructions to build and install the software. +* NEWS: Release notes for each tag. +* README: The short documentation at the root of the project +* TODO: You can put things to do there, or use https://github.com/mapmapteam/mapmap, or https://www.pivotaltracker.com/s/projects/954570/ +* images/: Images part of the GUI. +* prototypes/ : Contains prototypes. Please ask the project maintainer before removing some of these. + diff --git a/MainWindow.cpp b/MainWindow.cpp index 9125124..52160a8 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -345,11 +345,10 @@ void MainWindow::about() // Pop-up about dialog. QMessageBox::about(this, tr("About MapMap"), tr("

MapMap " - LIBREMAPPING_VERSION + MAPMAP_VERSION "

" - "

Copyright © 2013 Sofian Audry" - "

Copyright © 2013 Alexandre Quessy" - "

Copyright © 2013 Vasilis Liaskovitis" + "

Copyright © 2013 Sofian Audry, Alexandre Quessy, Julien Keable, " + "Mike Latona and Vasilis Liaskovitis." "

MapMap is a free software for video mapping. " "

Projection mapping, also known as video mapping and spatial augmented reality, " "is a projection technology used to turn objects, often irregularly shaped, into " diff --git a/MainWindow.h b/MainWindow.h index 6333c7d..a0370bc 100644 --- a/MainWindow.h +++ b/MainWindow.h @@ -40,7 +40,7 @@ #include "qttreepropertybrowser.h" #include "qtgroupboxpropertybrowser.h" -#define LIBREMAPPING_VERSION "0.1" +#define MAPMAP_VERSION "0.0.9" /** * This is the main window of MapMap. It acts as both a view and a controller interface.