{"commits":[{"author":{"email":"46f1a0bd5592a2f9244ca321b129902a06b53e03@mskiba.net","name":"Mitchell Skiba"},"sha":"cc9aaad7b172219d95001b584583ead87a6d2f1f","message":"adding dia diagram of class","url":"https://api.github.com/repos/rit-sse/rapdevx/commits/cc9aaad7b172219d95001b584583ead87a6d2f1f"},{"author":{"email":"46f1a0bd5592a2f9244ca321b129902a06b53e03@mskiba.net","name":"Mitchell Skiba"},"sha":"d389b9e62b8651ba3fa9bffe86a2bcac301ae00f","message":"in progress context - adding phases","url":"https://api.github.com/repos/rit-sse/rapdevx/commits/d389b9e62b8651ba3fa9bffe86a2bcac301ae00f"},{"author":{"email":"46f1a0bd5592a2f9244ca321b129902a06b53e03@mskiba.net","name":"Mitchell Skiba"},"sha":"ee2ba017e315a5a6aa652559f9a6a0a6515697e9","message":"added classes for all, finished waiting","url":"https://api.github.com/repos/rit-sse/rapdevx/commits/ee2ba017e315a5a6aa652559f9a6a0a6515697e9"},{"author":{"email":"e6c4c1ff216177548e7615ac78ecec60f156d555@gmail.com","name":"Morgan Cabral"},"sha":"fadea64e044da318ba9924d960c385d5662c16c8","message":"Added getter/setter methods to Unit and code for the Ability class.","url":"https://api.github.com/repos/rit-sse/rapdevx/commits/fadea64e044da318ba9924d960c385d5662c16c8"},{"author":{"email":"e6c4c1ff216177548e7615ac78ecec60f156d555@gmail.com","name":"Morgan Cabral"},"sha":"f65840d988b53a7c27aa02bb721cf8132f6b276c","message":"Changed references to self.id so that self.gid is referenced instead (id is a keyword in python). Also fixed some getter/setter code which didn't use self properly.","url":"https://api.github.com/repos/rit-sse/rapdevx/commits/f65840d988b53a7c27aa02bb721cf8132f6b276c"},{"author":{"email":"0f4127964bbe5596f5e588f47431d6209f064dd2@gmail.com","name":"Brian Wyant"},"sha":"83cd91ac052ef5e5ec30b228930b68f9dbc0ac36","message":"adding basic implementation for server phases","url":"https://api.github.com/repos/rit-sse/rapdevx/commits/83cd91ac052ef5e5ec30b228930b68f9dbc0ac36"},{"author":{"email":"0f4127964bbe5596f5e588f47431d6209f064dd2@gmail.com","name":"Brian Wyant"},"sha":"0650e3c5081c3db0b1ce5c983ed7362a567f1000","message":"Merge branch 'master' of https://github.com/rit-sse/rapdevx-server\n\nConflicts:\n\tserver/gameplay.py","url":"https://api.github.com/repos/rit-sse/rapdevx/commits/0650e3c5081c3db0b1ce5c983ed7362a567f1000"},{"author":{"email":"46f1a0bd5592a2f9244ca321b129902a06b53e03@mskiba.net","name":"Mitchell Skiba"},"sha":"2e1917cc651791cad172e000c816b5fa5b347da7","message":"not sure what I changed... but I'll merge it","url":"https://api.github.com/repos/rit-sse/rapdevx/commits/2e1917cc651791cad172e000c816b5fa5b347da7"},{"author":{"email":"51946e788b7e6fa3128b61fb93083daf7dcfc3c1@rit.edu","name":"beccles"},"sha":"0b03c7b78ab7de183e8c8c1db8446e27bd055bde","message":"implemented registy","url":"https://api.github.com/repos/rit-sse/rapdevx/commits/0b03c7b78ab7de183e8c8c1db8446e27bd055bde"},{"author":{"email":"51946e788b7e6fa3128b61fb93083daf7dcfc3c1@rit.edu","name":"beccles"},"sha":"5945ea773f26d701f630720dfdfe6cddbbb05e92","message":"implemented registy: fixed errors and tested","url":"https://api.github.com/repos/rit-sse/rapdevx/commits/5945ea773f26d701f630720dfdfe6cddbbb05e92"},{"author":{"email":"ef3e61563ec2a4ebe7a382c0dc2cd098c7235a79@gmail.com","name":"Ethan Jurman"},"sha":"305d64ea531929d60828c5990fa79e0a702c0ae9","message":"collisionCheck","url":"https://api.github.com/repos/rit-sse/rapdevx/commits/305d64ea531929d60828c5990fa79e0a702c0ae9"},{"author":{"email":"ef3e61563ec2a4ebe7a382c0dc2cd098c7235a79@gmail.com","name":"Ethan Jurman"},"sha":"2c2f905870f2bd30c2e6002a38ad2c314f025077","message":"collisionCheck just tuples for now","url":"https://api.github.com/repos/rit-sse/rapdevx/commits/2c2f905870f2bd30c2e6002a38ad2c314f025077"},{"author":{"email":"e6c4c1ff216177548e7615ac78ecec60f156d555@gmail.com","name":"Morgan Cabral"},"sha":"b5b8c0d8e48fbd5a2f641c9b4f94f0196d626d5e","message":"Wrote documentation for gameplay.py","url":"https://api.github.com/repos/rit-sse/rapdevx/commits/b5b8c0d8e48fbd5a2f641c9b4f94f0196d626d5e"},{"author":{"email":"ef3e61563ec2a4ebe7a382c0dc2cd098c7235a79@gmail.com","name":"Ethan Jurman"},"sha":"955dab8c172f0188e4269ad34489cc047ad27141","message":"Merge branch 'master' of github.com:rit-sse/rapdevx-server","url":"https://api.github.com/repos/rit-sse/rapdevx/commits/955dab8c172f0188e4269ad34489cc047ad27141"},{"author":{"email":"e6c4c1ff216177548e7615ac78ecec60f156d555@gmail.com","name":"Morgan Cabral"},"sha":"f335790b14afd6f497e72947fe5e3ca086b4370d","message":"Continued to document methods in gameplay.py. Switched from MSDOS style line endings to Unix style line endings.","url":"https://api.github.com/repos/rit-sse/rapdevx/commits/f335790b14afd6f497e72947fe5e3ca086b4370d"},{"author":{"email":"e6c4c1ff216177548e7615ac78ecec60f156d555@gmail.com","name":"Morgan Cabral"},"sha":"5bc9b8715daa4d22bc16ef3363b2ad47167e1c19","message":"Merging","url":"https://api.github.com/repos/rit-sse/rapdevx/commits/5bc9b8715daa4d22bc16ef3363b2ad47167e1c19"},{"author":{"email":"ef3e61563ec2a4ebe7a382c0dc2cd098c7235a79@gmail.com","name":"Ethan Jurman"},"sha":"98b437aa877ed53e4b4dd1d0fc1962918dba8fa3","message":"collision changes","url":"https://api.github.com/repos/rit-sse/rapdevx/commits/98b437aa877ed53e4b4dd1d0fc1962918dba8fa3"},{"author":{"email":"ef3e61563ec2a4ebe7a382c0dc2cd098c7235a79@gmail.com","name":"Ethan Jurman"},"sha":"89478782d3f1f136e70596263a05ccd6a6e39082","message":"collision changes / unix fixes kinda","url":"https://api.github.com/repos/rit-sse/rapdevx/commits/89478782d3f1f136e70596263a05ccd6a6e39082"},{"author":{"email":"e6c4c1ff216177548e7615ac78ecec60f156d555@gmail.com","name":"Morgan Cabral"},"sha":"d3d9ea983c9fce0c0f015656a289c22e78228758","message":"Moar documentation.","url":"https://api.github.com/repos/rit-sse/rapdevx/commits/d3d9ea983c9fce0c0f015656a289c22e78228758"},{"author":{"email":"ef3e61563ec2a4ebe7a382c0dc2cd098c7235a79@gmail.com","name":"Ethan Jurman"},"sha":"a1c66b4a0095f9c4c914f3a8b2b1a2c49af1c1ab","message":"var. spelling corrections","url":"https://api.github.com/repos/rit-sse/rapdevx/commits/a1c66b4a0095f9c4c914f3a8b2b1a2c49af1c1ab"}],"ref":"refs/heads/server","head":"ef5c7fde38cc4659b80908a34b2aae87e2ce893c","push_id":52405471,"size":28}