Commit Graph

11 Commits

Author SHA1 Message Date
9720613543 Merge branch 'Team_CMU_MergeBase' of https://github.com/MMRVZ2017/MPK.Puzzle into Team_CMU_MergeBase 2017-12-20 23:03:49 +01:00
37eed7ef88 edited destructionLayer, changed includes 2017-12-20 23:01:04 +01:00
60e57b9ae0 Added forward declarations to avoid ring compiler errors 2017-12-20 22:58:00 +01:00
b0aaeb84b2 added DestructionLayer, fixed minor problems 2017-12-20 22:10:08 +01:00
23d97293a3 Merge branch 'Team_CMU_MergeBase' of https://github.com/MMRVZ2017/MPK.Puzzle into Team_CMU_MergeBase 2017-12-20 22:05:30 +01:00
058a96ab08 added destructionPower as abstractionLayer 2017-12-20 22:05:04 +01:00
1fabe84848 Fixed compiler errors with ring initialisation and qVector + MakeFile included 2017-12-20 22:02:09 +01:00
ce5e007bc7 Removed lots of slack, edited map functions into dispatcher, puzzleMat missing
Removed overconstructed logic, changed vector to map. PuzzleMat object not defined yet, for implementation, make the functions that have already been called through it.
2017-12-20 18:23:39 +01:00
c885e472fb implemented #1 layer
everything with the excemtion of image recogniation in preprocessing should be fully implemented. Can now begin deleting all legacy  code.
2017-12-20 17:35:52 +01:00
507533531c unfinished merge, problems with randomgenerator
random generator in class needs to return a randomized puzzlebox
2017-12-18 22:50:03 +01:00
90e31ddba6 Merge branch 'TeamCGPU_TestWithBaseLayer' into Team_CMU_MergeBase 2017-12-18 21:24:21 +01:00