Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 37eed7ef88 edited destructionLayer, changed includes Raphael Maenle 2017-12-20 23:01:04 +01:00
• 60e57b9ae0 Added forward declarations to avoid ring compiler errors TabDragon 2017-12-20 22:58:00 +01:00
• e641199ce4 Merge branch 'Team_CMU_MergeBase' of https://github.com/MMRVZ2017/MPK.Puzzle into Team_CMU_MergeBase Raphael Maenle 2017-12-20 22:11:49 +01:00
• b0aaeb84b2 added DestructionLayer, fixed minor problems Raphael Maenle 2017-12-20 22:10:08 +01:00
• 7ba76b4881 Fixed error in AbstractionLayer + redefine of solve.h TabDragon 2017-12-20 22:09:41 +01:00
• 23d97293a3 Merge branch 'Team_CMU_MergeBase' of https://github.com/MMRVZ2017/MPK.Puzzle into Team_CMU_MergeBase Raphael Maenle 2017-12-20 22:05:30 +01:00
• 058a96ab08 added destructionPower as abstractionLayer Raphael Maenle 2017-12-20 22:05:04 +01:00
• 1fabe84848 Fixed compiler errors with ring initialisation and qVector + MakeFile included TabDragon 2017-12-20 22:02:09 +01:00
• ce5e007bc7 Removed lots of slack, edited map functions into dispatcher, puzzleMat missing Raphael Maenle 2017-12-20 18:23:39 +01:00
• c885e472fb implemented #1 layer Raphael Maenle 2017-12-20 17:35:52 +01:00
• 507533531c unfinished merge, problems with randomgenerator Raphael Maenle 2017-12-18 22:50:03 +01:00
• 90e31ddba6 Merge branch 'TeamCGPU_TestWithBaseLayer' into Team_CMU_MergeBase Raphael Maenle 2017-12-18 21:24:21 +01:00
• 0048f5b42d removed comments form non working Raphael Maenle 2017-12-18 13:37:31 +01:00
• ffac7fbcb9 removed todo Raphael Maenle 2017-12-16 22:01:18 +01:00
• ba4d757c5a minor code improvements g-spacewhale 2017-12-16 00:10:52 +01:00
• 2ef3f164c7 added basic dP calculation, removed deprication warnings Raphael Maenle 2017-12-13 10:47:15 +01:00
• ccf26f8d8a added empty functions for calls in structure.cpp Raphael Maenle 2017-12-12 11:42:31 +01:00
• bf3b103251 Added David Code, removed Clion Stuff g-spacewhale 2017-12-07 16:26:45 +01:00
• 26ce1477bd Merge Branch TeamCMU the last d-kaselautzke 2017-12-06 21:56:26 +01:00
• 0469915cd9 Merge branch TeamCMU the 2nd d-kaselautzke 2017-12-06 21:26:06 +01:00
• f0e287af20 Merge branch TeamCMU d-kaselautzke 2017-12-06 21:24:11 +01:00
• e66aa080bb changed m,n to Coor class d-kaselautzke 2017-12-06 20:56:01 +01:00
• 9b282e83ca generating "Random" Pieces from picture source now Raphael Maenle 2017-12-06 16:25:13 +01:00
• cd7bc1c42a removed legacy Raphael Maenle 2017-12-06 11:03:38 +01:00
• eb489a58c2 removed bulk project files Raphael Maenle 2017-12-06 11:02:19 +01:00
• 067f64c9ab Deleted Source/.idea c-weidinger 2017-12-05 19:52:54 +01:00
• bf521f741d Gitignore c-weidinger 2017-12-05 19:47:20 +01:00
• a78ec0c34e Changed Gitignore c-weidinger 2017-12-05 19:44:54 +01:00
• abb2126d61 updated readme to show todos Raphael Maenle 2017-12-03 20:35:35 +01:00
• 586f9d0d3e Merge c-weidinger 2017-12-03 20:18:52 +01:00
• 3ddb217f6d Merged First and NextCoor c-weidinger 2017-12-03 20:12:32 +01:00
• 8dd7f400f7 Deleted CLion Projekt Files TabDragon 2017-12-03 14:33:28 +01:00
• e12550274b Corrected Raphis destroyed Project c-weidinger 2017-12-03 11:02:59 +01:00
• e2d2e403f5 changed all uint to unsigned int Raphael Maenle 2017-12-02 17:03:12 +01:00
• b1b6d55fc6 removes previously tracked files from commit Raphael Maenle 2017-12-02 17:01:51 +01:00
• 2f91ceaccb edited .gitignore once more Raphael Maenle 2017-12-02 16:54:00 +01:00
• e303642409 edited gitignore to not sync .idea and cmap-build-debug Raphael Maenle 2017-12-02 16:52:32 +01:00
• 17c3841650 Clion Project created c-weidinger 2017-12-02 14:39:19 +01:00
• 51dd40961f added toto txt file g-spacewhale 2017-12-02 11:37:37 +01:00
• 92eb243268 minor edit in structure. cleanup g-spacewhale 2017-11-30 22:29:52 +01:00
• 82d0c740c3 added a simple converter from part to puzzlepiece called convertPart2PuzzlePiece. takes and gives vectors only g-spacewhale 2017-11-30 14:19:25 +01:00
• 2c71dd7a47 Added rotation functionality, minor cleanups on the way 2017-11-28 21:35:49 +01:00
• 3567b77cec added basic construct to keep on turning puzzle piece. non functional as of yet. 2017-11-22 16:06:23 +01:00
• c56b117d81 Added CLions local project directories and .DS_Store (MAC OS) to gitignore PGotzmann 2017-11-22 11:05:35 +01:00
• 17386304c5 Merge branch 'master' into inception PGotzmann 2017-11-22 10:56:11 +01:00
• af3ba8da56 edited README Todo to reflect new steps in project. g-spacewhale 2017-11-21 16:26:03 +01:00
• 742dbd3c36 edited todo in readme to new todos g-spacewhale 2017-11-21 16:23:26 +01:00
• 6c81722d02 removed a.out from HEAD cache. less spamming now, sry about that. g-spacewhale 2017-11-21 16:14:12 +01:00
• 74e1e2e224 changed to use heavypuzzle in main g-spacewhale 2017-11-21 16:05:38 +01:00
• 1e0018c6a4 changed minor stuff g-spacewhale 2017-11-21 15:07:15 +01:00
• e947a8b24f slight update to structure. going into subbranch now g-spacewhale 2017-11-21 11:19:51 +01:00
• 665ad108d4 changed review and log g-spacewhale 2017-11-21 10:31:48 +01:00
• 772a1d815a added hardest puzzle #evafornoobs. does not compute g-spacewhale 2017-11-19 23:03:11 +01:00
• aa00553bdb removed bugs. some puzzles take forever. most can be solved g-spacewhale 2017-11-19 22:53:00 +01:00
• 15940f41da added more strucuture to strucutur.cpp. commiting now to extract new debugging branch g-spacewhale 2017-11-19 17:52:02 +01:00
• c308b6d9e8 furthered structure.cpp with code segments. edited log class in solve.h 2017-11-18 22:48:40 +01:00
• 85da2a4def Merge branch 'master' into TeamCMU 2017-11-18 20:42:30 +01:00
• d9c659698b Update README.md g-spacewhale 2017-11-18 20:20:58 +01:00
• 8ddc13d65c merged master g-spacewhale 2017-11-18 10:47:48 +01:00
• 12cb2023b1 added swp to gitignore, removed a swp g-spacewhale 2017-11-18 10:44:10 +01:00
• 1318b86dfb removes swp files g-spacewhale 2017-11-18 10:34:23 +01:00
• 57340e9ec3 Merge branch 'master' into TeamCMU merging master into branch. adding gitignore g-spacewhale 2017-11-18 10:30:13 +01:00
• 290046e52b added .gitignore g-spacewhale 2017-11-18 10:26:50 +01:00
• beb1404b86 Merge branch 'master' into TeamCMU g-spacewhale 2017-11-18 10:24:34 +01:00
• 638c515a03 removed temp and local from Readme g-spacewhale 2017-11-18 10:14:03 +01:00
• 9bb5bf23a3 Merge branch 'CMUadd_partgoodU' into TeamCMU g-spacewhale 2017-11-18 10:06:51 +01:00
• ce87ec7885 Merge branch 'master' into TeamCMU g-spacewhale 2017-11-18 10:03:13 +01:00
• 46dbdd5ed5 changed readme g-spacewhale 2017-11-18 10:02:21 +01:00
• 4aeb90259f code not functional, added in new function reverted original function g-spacewhale 2017-11-18 09:50:09 +01:00
• 204387c42f resolved readme.m conflict to master g-spacewhale 2017-11-18 08:36:50 +01:00
• 037d20096a added codebase. changed folderstructure g-spacewhale 2017-11-18 08:22:35 +01:00
• 95cf7cc7b3 edited file structure to better represent our current system. added entire code base g-spacewhale 2017-11-18 08:16:05 +01:00
• 03f1fd78e2 Update README.md g-spacewhale 2017-11-17 22:29:31 +01:00
• 623df2e3c9 edited readme again g-spacewhale 2017-11-17 22:23:44 +01:00
• 874273201c changed readme g-spacewhale 2017-11-17 22:12:10 +01:00
• b05fedb76e added folder structure g-spacewhale 2017-11-17 22:10:36 +01:00
• d4de31d21d edited readme g-spacewhale 2017-11-17 21:40:10 +01:00
• c876daacc7 added main g-spacewhale 2017-11-17 21:38:47 +01:00
• 85a846cce4 edited readme g-spacewhale 2017-11-17 21:32:21 +01:00
• 0c8ecb456a edited file structure, added git instructions g-spacewhale 2017-11-17 21:31:45 +01:00
• a1dea01195 rem. legacy added commited master g-spacewhale 2017-11-17 21:23:32 +01:00
• 5480c2e5a8 filestructure, parts, backlog g-spacewhale 2017-11-17 21:09:15 +01:00
• aa1ecd4a0b Update README.md g-spacewhale 2017-11-17 20:55:57 +01:00
• 6e0724b19a Update README.md g-spacewhale 2017-11-17 20:48:46 +01:00
• 42a1385030 Initial commit g-spacewhale 2017-11-17 20:47:39 +01:00