aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* merge MergeOp into masterRenaud G2016-01-1016-116/+112
|\
| * fix cppcheck errorsRenaud G2016-01-0811-65/+32
| |
| * -Fix cppcheck errors.Renaud G2016-01-085-9/+9
| |
* | add mergenode to pri.Renaud G2015-12-281-0/+2
| |
* | add color managementRenaud2015-12-281-0/+1
| |
* | manage homogeneousRenaud2015-12-281-1/+5
| |
* | manage homogeneousRenaud2015-12-281-0/+2
| |
* | manage homogeneousRenaud2015-12-281-0/+1
| |
* | manage homogeneousRenaud2015-12-281-5/+3
| |
* | Adding new status "isHomogeneous" for diceresult.Renaud G2015-12-242-0/+19
| |
* | -Add MergeOp and homogeneous status for result.Renaud G2015-12-242-3/+18
| |
* | Start modification for the display function when displaying result.Renaud G2015-12-241-40/+88
| |
* | -Adding rules to compile new file.Renaud G2015-12-241-0/+1
| |
* | -Adding mergenode to the project.Renaud G2015-12-242-0/+121
| |
| * add constRenaud G2015-11-211-1/+1
| |
| * Merge branch 'newBranch'Renaud G2015-11-201-2/+9
| |\ | | | | | | | | | | | | | | | Conflicts: dicealias.cpp dicealias.h
| | * Add enable management of aliasRenaud G2015-11-122-3/+25
| | |
| * | Optimization about screenRenaud G2015-10-284-37/+37
| | |
| * | Merge branch 'master' of github.com:obiwankennedy/DiceParserRenaud G2015-10-1153-223/+812
| |\ \ | |/ / |/| |
* | | Fix init orderRenaud G2015-10-111-1/+1
| | |
* | | Add virtual destructor.Renaud G2015-10-112-0/+8
| | |
* | | -set message if Too many dice error is trigged.Renaud G2015-10-111-0/+4
| | |
* | | -Add Too Many Dice error type.Renaud G2015-10-111-1/+1
| | |
* | | -add error while no dice.Renaud G2015-10-111-0/+5
| | |
* | | -Add Node Error : No dice to rollRenaud G2015-10-111-1/+1
| | |
* | | Merge branch 'master' of github.com:Rolisteam/DiceParserRenaud G2015-10-111-0/+2
|\ \ \
* | | | -Fix issue while no validatorRenaud G2015-10-111-5/+11
| | | |
| * | | add new files into pri fileRenaud G2015-10-111-0/+2
|/ / /
* | | fix indentationRenaud G2015-10-111-1/+1
| | |
* | | -fix compil errorRenaud G2015-10-111-2/+2
| | |
* | | Merge branch 'rangeInList'Renaud G2015-10-1150-217/+781
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts and merge rangeInList in master. Conflicts: HelpMe.md diceparser.cpp parsingtoolbox.cpp result/result.cpp result/stringresult.h
| * \ \ Merge branch 'rangeInList' of github.com:Rolisteam/DiceParser into rangeInListRenaud G2015-10-111-1/+10
| |\ \ \
* | \ \ \ Merge branch 'master' of github.com:Rolisteam/DiceParserRenaud G2015-10-1118-36/+191
|\ \ \ \ \
* | | | | | remove useless lineRenaud G2015-10-111-1/+0
| | | | | |
| | | | * | Add way to disable alias.Renaud G2015-10-103-4/+27
| | | | |/
| * | | | Update HelpMe.mdRenaud G.2015-09-231-1/+1
| | | | | | | | | | | | | | | spelling
| * | | | Merge branch 'master' of github.com:obiwankennedy/DiceParserRenaud G2015-09-076-8/+125
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Change path to parsingtoolbox.hRenaud G2015-09-071-1/+1
| | | | |
| | * | | add getAllDiceResult function and hasSeparatorRenaud G2015-09-012-6/+48
| | | | |
| | * | | add gpl headerRenaud G2015-09-012-0/+38
| | | | |
| | * | | add gpl headerRenaud G2015-09-012-2/+39
| | | | |
| | * | | fix warning in qmake .pri file.Renaud G2015-08-301-1/+1
| | | | |
| * | | | Merge branch 'master' of github.com:obiwankennedy/DiceParserRenaud G2015-08-301-5/+1
| |\| | |
| | * | | fix compilation.Renaud G2015-08-291-5/+1
| | | | |
| * | | | Merge branch 'master' of github.com:obiwankennedy/DiceParserRenaud G2015-08-298-21/+18
| |\| | |
| | * | | fix cppcheck issueRenaud G2015-08-288-21/+18
| | | | |
| * | | | Merge branch 'master' of github.com:obiwankennedy/DiceParserRenaud G2015-08-286-0/+44
| |\| | |
| | * | | Merge branch 'doneWork'Renaud G2015-08-276-0/+44
| |/| | | |/| | | |
| | * | | add highlight managementRenaud G2015-08-272-0/+14
| | | | |
| | * | | disable the highlightRenaud G2015-08-272-0/+2
| | | | |