Commit Graph

61 Commits

Author SHA1 Message Date
d-kaselautzke
26ce1477bd Merge Branch TeamCMU the last 2017-12-06 21:56:26 +01:00
d-kaselautzke
0469915cd9 Merge branch TeamCMU the 2nd 2017-12-06 21:26:06 +01:00
d-kaselautzke
f0e287af20 Merge branch TeamCMU
random generator v2 + coor class
2017-12-06 21:24:11 +01:00
d-kaselautzke
e66aa080bb changed m,n to Coor class
changed every unsigned int m,n to coor myCoor. except of getPiece
2017-12-06 20:56:01 +01:00
Raphael Maenle
9b282e83ca generating "Random" Pieces from picture source now
rgb values stored as double in the piece base class. this is bound to change once other group has expanded piece base class.
2017-12-06 16:25:13 +01:00
Raphael Maenle
cd7bc1c42a removed legacy 2017-12-06 11:03:38 +01:00
Raphael Maenle
eb489a58c2 removed bulk project files
Lets see if this works.
2017-12-06 11:02:19 +01:00
c-weidinger
067f64c9ab Deleted Source/.idea 2017-12-05 19:52:54 +01:00
c-weidinger
bf521f741d Gitignore 2017-12-05 19:47:20 +01:00
c-weidinger
a78ec0c34e Changed Gitignore 2017-12-05 19:44:54 +01:00
c-weidinger
586f9d0d3e Merge 2017-12-03 20:18:52 +01:00
c-weidinger
3ddb217f6d Merged First and NextCoor 2017-12-03 20:12:32 +01:00
TabDragon
8dd7f400f7 Deleted CLion Projekt Files
Deleted all Files created from CLion, like the .idea and cmake-build-debug folder.
This files will be created automatically from CLion at the first start up of the CMakeList.txt File
2017-12-03 14:33:28 +01:00
c-weidinger
e12550274b Corrected Raphis destroyed Project 2017-12-03 11:02:59 +01:00
Raphael Maenle
e2d2e403f5 changed all uint to unsigned int 2017-12-02 17:03:12 +01:00
Raphael Maenle
b1b6d55fc6 removes previously tracked files from commit 2017-12-02 17:01:51 +01:00
Raphael Maenle
2f91ceaccb edited .gitignore once more 2017-12-02 16:54:00 +01:00
Raphael Maenle
e303642409 edited gitignore to not sync .idea and cmap-build-debug 2017-12-02 16:52:32 +01:00
c-weidinger
17c3841650 Clion Project created
Included Raphaels code in CLion Project
2017-12-02 14:39:19 +01:00
g-spacewhale
51dd40961f added toto txt file 2017-12-02 11:37:37 +01:00
g-spacewhale
92eb243268 minor edit in structure. cleanup 2017-11-30 22:29:52 +01:00
g-spacewhale
82d0c740c3 added a simple converter from part to puzzlepiece called convertPart2PuzzlePiece. takes and gives vectors only 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
g-spacewhale
6c81722d02 removed a.out from HEAD cache. less spamming now, sry about that. 2017-11-21 16:14:12 +01:00
g-spacewhale
74e1e2e224 changed to use heavypuzzle in main 2017-11-21 16:05:38 +01:00
g-spacewhale
1e0018c6a4 changed minor stuff 2017-11-21 15:07:15 +01:00
g-spacewhale
e947a8b24f slight update to structure. going into subbranch now 2017-11-21 11:19:51 +01:00
g-spacewhale
665ad108d4 changed review and log 2017-11-21 10:31:48 +01:00
g-spacewhale
772a1d815a added hardest puzzle #evafornoobs. does not compute 2017-11-19 23:03:11 +01:00
g-spacewhale
aa00553bdb removed bugs. some puzzles take forever. most can be solved 2017-11-19 22:53:00 +01:00
g-spacewhale
15940f41da added more strucuture to strucutur.cpp. commiting now to extract new debugging branch 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
adding current master changes to branch
2017-11-18 20:42:30 +01:00
g-spacewhale
8ddc13d65c merged master 2017-11-18 10:47:48 +01:00
g-spacewhale
12cb2023b1 added swp to gitignore, removed a swp 2017-11-18 10:44:10 +01:00
g-spacewhale
1318b86dfb removes swp files 2017-11-18 10:34:23 +01:00
g-spacewhale
57340e9ec3 Merge branch 'master' into TeamCMU
merging master into branch. adding gitignore
2017-11-18 10:30:13 +01:00
g-spacewhale
290046e52b added .gitignore 2017-11-18 10:26:50 +01:00
g-spacewhale
beb1404b86 Merge branch 'master' into TeamCMU 2017-11-18 10:24:34 +01:00
g-spacewhale
638c515a03 removed temp and local from Readme 2017-11-18 10:14:03 +01:00
g-spacewhale
9bb5bf23a3 Merge branch 'CMUadd_partgoodU' into TeamCMU
this reverts to original function as U implementation not working
2017-11-18 10:06:51 +01:00
g-spacewhale
ce87ec7885 Merge branch 'master' into TeamCMU 2017-11-18 10:03:13 +01:00
g-spacewhale
46dbdd5ed5 changed readme 2017-11-18 10:02:21 +01:00
g-spacewhale
4aeb90259f code not functional, added in new function reverted original function 2017-11-18 09:50:09 +01:00
g-spacewhale
204387c42f resolved readme.m conflict to master 2017-11-18 08:36:50 +01:00
g-spacewhale
037d20096a added codebase. changed folderstructure 2017-11-18 08:22:35 +01:00
g-spacewhale
95cf7cc7b3 edited file structure to better represent our current system. added entire code base 2017-11-18 08:16:05 +01:00
g-spacewhale
03f1fd78e2
Update README.md 2017-11-17 22:29:31 +01:00
g-spacewhale
623df2e3c9 edited readme again 2017-11-17 22:23:44 +01:00