{"action":"closed","number":6,"pull_request":{"url":"https://api.github.com/repos/tjcigda/loot/pulls/6","id":47294218,"html_url":"https://github.com/tjcigda/loot/pull/6","diff_url":"https://github.com/tjcigda/loot/pull/6.diff","patch_url":"https://github.com/tjcigda/loot/pull/6.patch","issue_url":"https://api.github.com/repos/tjcigda/loot/issues/6","number":6,"state":"closed","locked":false,"title":"Merge player into develop","user":{"login":"FieldsRJosh","id":14283593,"avatar_url":"https://avatars.githubusercontent.com/u/14283593?v=3","gravatar_id":"","url":"https://api.github.com/users/FieldsRJosh","html_url":"https://github.com/FieldsRJosh","followers_url":"https://api.github.com/users/FieldsRJosh/followers","following_url":"https://api.github.com/users/FieldsRJosh/following{/other_user}","gists_url":"https://api.github.com/users/FieldsRJosh/gists{/gist_id}","starred_url":"https://api.github.com/users/FieldsRJosh/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/FieldsRJosh/subscriptions","organizations_url":"https://api.github.com/users/FieldsRJosh/orgs","repos_url":"https://api.github.com/users/FieldsRJosh/repos","events_url":"https://api.github.com/users/FieldsRJosh/events{/privacy}","received_events_url":"https://api.github.com/users/FieldsRJosh/received_events","type":"User","site_admin":false},"body":"Created the Game Object Class and Player Class in order to allow the basic creation of a player character.\r\n\r\nMovement controls are added but have not been implemented into the Game class yet.\r\n\r\nCollision detection also is not implemented or currently coded in. (Requires Enemies/Objects Class to be coded)\r\n\r\nCreated Globals.h in order to maintain easier access between OBJECT ID's and DISPLAY WIDTH/HEIGHT.\r\n\r\nUpdated Game to initialize the player object and store it within the vector or GameObjects.\r\n\r\nAlso added the two iters for future collision detection between 2 GameObjects.","created_at":"2015-10-09T16:47:41Z","updated_at":"2015-10-09T18:18:28Z","closed_at":"2015-10-09T18:18:28Z","merged_at":null,"merge_commit_sha":"52b35c4b00f3f95fba7aecc213c0b9c120061bc7","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/tjcigda/loot/pulls/6/commits","review_comments_url":"https://api.github.com/repos/tjcigda/loot/pulls/6/comments","review_comment_url":"https://api.github.com/repos/tjcigda/loot/pulls/comments{/number}","comments_url":"https://api.github.com/repos/tjcigda/loot/issues/6/comments","statuses_url":"https://api.github.com/repos/tjcigda/loot/statuses/13937866ca0bb9fab97809108ab36931682afe0a","head":{"label":"tjcigda:feature-player","ref":"feature-player","sha":"13937866ca0bb9fab97809108ab36931682afe0a","user":{"login":"tjcigda","id":14256044,"avatar_url":"https://avatars.githubusercontent.com/u/14256044?v=3","gravatar_id":"","url":"https://api.github.com/users/tjcigda","html_url":"https://github.com/tjcigda","followers_url":"https://api.github.com/users/tjcigda/followers","following_url":"https://api.github.com/users/tjcigda/following{/other_user}","gists_url":"https://api.github.com/users/tjcigda/gists{/gist_id}","starred_url":"https://api.github.com/users/tjcigda/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tjcigda/subscriptions","organizations_url":"https://api.github.com/users/tjcigda/orgs","repos_url":"https://api.github.com/users/tjcigda/repos","events_url":"https://api.github.com/users/tjcigda/events{/privacy}","received_events_url":"https://api.github.com/users/tjcigda/received_events","type":"Organization","site_admin":false},"repo":{"id":43957016,"name":"loot","full_name":"tjcigda/loot","owner":{"login":"tjcigda","id":14256044,"avatar_url":"https://avatars.githubusercontent.com/u/14256044?v=3","gravatar_id":"","url":"https://api.github.com/users/tjcigda","html_url":"https://github.com/tjcigda","followers_url":"https://api.github.com/users/tjcigda/followers","following_url":"https://api.github.com/users/tjcigda/following{/other_user}","gists_url":"https://api.github.com/users/tjcigda/gists{/gist_id}","starred_url":"https://api.github.com/users/tjcigda/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tjcigda/subscriptions","organizations_url":"https://api.github.com/users/tjcigda/orgs","repos_url":"https://api.github.com/users/tjcigda/repos","events_url":"https://api.github.com/users/tjcigda/events{/privacy}","received_events_url":"https://api.github.com/users/tjcigda/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/tjcigda/loot","description":"","fork":false,"url":"https://api.github.com/repos/tjcigda/loot","forks_url":"https://api.github.com/repos/tjcigda/loot/forks","keys_url":"https://api.github.com/repos/tjcigda/loot/keys{/key_id}","collaborators_url":"https://api.github.com/repos/tjcigda/loot/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/tjcigda/loot/teams","hooks_url":"https://api.github.com/repos/tjcigda/loot/hooks","issue_events_url":"https://api.github.com/repos/tjcigda/loot/issues/events{/number}","events_url":"https://api.github.com/repos/tjcigda/loot/events","assignees_url":"https://api.github.com/repos/tjcigda/loot/assignees{/user}","branches_url":"https://api.github.com/repos/tjcigda/loot/branches{/branch}","tags_url":"https://api.github.com/repos/tjcigda/loot/tags","blobs_url":"https://api.github.com/repos/tjcigda/loot/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/tjcigda/loot/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/tjcigda/loot/git/refs{/sha}","trees_url":"https://api.github.com/repos/tjcigda/loot/git/trees{/sha}","statuses_url":"https://api.github.com/repos/tjcigda/loot/statuses/{sha}","languages_url":"https://api.github.com/repos/tjcigda/loot/languages","stargazers_url":"https://api.github.com/repos/tjcigda/loot/stargazers","contributors_url":"https://api.github.com/repos/tjcigda/loot/contributors","subscribers_url":"https://api.github.com/repos/tjcigda/loot/subscribers","subscription_url":"https://api.github.com/repos/tjcigda/loot/subscription","commits_url":"https://api.github.com/repos/tjcigda/loot/commits{/sha}","git_commits_url":"https://api.github.com/repos/tjcigda/loot/git/commits{/sha}","comments_url":"https://api.github.com/repos/tjcigda/loot/comments{/number}","issue_comment_url":"https://api.github.com/repos/tjcigda/loot/issues/comments{/number}","contents_url":"https://api.github.com/repos/tjcigda/loot/contents/{+path}","compare_url":"https://api.github.com/repos/tjcigda/loot/compare/{base}...{head}","merges_url":"https://api.github.com/repos/tjcigda/loot/merges","archive_url":"https://api.github.com/repos/tjcigda/loot/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/tjcigda/loot/downloads","issues_url":"https://api.github.com/repos/tjcigda/loot/issues{/number}","pulls_url":"https://api.github.com/repos/tjcigda/loot/pulls{/number}","milestones_url":"https://api.github.com/repos/tjcigda/loot/milestones{/number}","notifications_url":"https://api.github.com/repos/tjcigda/loot/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/tjcigda/loot/labels{/name}","releases_url":"https://api.github.com/repos/tjcigda/loot/releases{/id}","created_at":"2015-10-09T13:29:59Z","updated_at":"2015-10-09T14:31:58Z","pushed_at":"2015-10-09T18:16:40Z","git_url":"git://github.com/tjcigda/loot.git","ssh_url":"git@github.com:tjcigda/loot.git","clone_url":"https://github.com/tjcigda/loot.git","svn_url":"https://github.com/tjcigda/loot","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":"C++","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":1,"forks":0,"open_issues":1,"watchers":0,"default_branch":"develop"}},"base":{"label":"tjcigda:develop","ref":"develop","sha":"a6aec296df3c32b80b0ce2c680f260ab091022c5","user":{"login":"tjcigda","id":14256044,"avatar_url":"https://avatars.githubusercontent.com/u/14256044?v=3","gravatar_id":"","url":"https://api.github.com/users/tjcigda","html_url":"https://github.com/tjcigda","followers_url":"https://api.github.com/users/tjcigda/followers","following_url":"https://api.github.com/users/tjcigda/following{/other_user}","gists_url":"https://api.github.com/users/tjcigda/gists{/gist_id}","starred_url":"https://api.github.com/users/tjcigda/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tjcigda/subscriptions","organizations_url":"https://api.github.com/users/tjcigda/orgs","repos_url":"https://api.github.com/users/tjcigda/repos","events_url":"https://api.github.com/users/tjcigda/events{/privacy}","received_events_url":"https://api.github.com/users/tjcigda/received_events","type":"Organization","site_admin":false},"repo":{"id":43957016,"name":"loot","full_name":"tjcigda/loot","owner":{"login":"tjcigda","id":14256044,"avatar_url":"https://avatars.githubusercontent.com/u/14256044?v=3","gravatar_id":"","url":"https://api.github.com/users/tjcigda","html_url":"https://github.com/tjcigda","followers_url":"https://api.github.com/users/tjcigda/followers","following_url":"https://api.github.com/users/tjcigda/following{/other_user}","gists_url":"https://api.github.com/users/tjcigda/gists{/gist_id}","starred_url":"https://api.github.com/users/tjcigda/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tjcigda/subscriptions","organizations_url":"https://api.github.com/users/tjcigda/orgs","repos_url":"https://api.github.com/users/tjcigda/repos","events_url":"https://api.github.com/users/tjcigda/events{/privacy}","received_events_url":"https://api.github.com/users/tjcigda/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/tjcigda/loot","description":"","fork":false,"url":"https://api.github.com/repos/tjcigda/loot","forks_url":"https://api.github.com/repos/tjcigda/loot/forks","keys_url":"https://api.github.com/repos/tjcigda/loot/keys{/key_id}","collaborators_url":"https://api.github.com/repos/tjcigda/loot/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/tjcigda/loot/teams","hooks_url":"https://api.github.com/repos/tjcigda/loot/hooks","issue_events_url":"https://api.github.com/repos/tjcigda/loot/issues/events{/number}","events_url":"https://api.github.com/repos/tjcigda/loot/events","assignees_url":"https://api.github.com/repos/tjcigda/loot/assignees{/user}","branches_url":"https://api.github.com/repos/tjcigda/loot/branches{/branch}","tags_url":"https://api.github.com/repos/tjcigda/loot/tags","blobs_url":"https://api.github.com/repos/tjcigda/loot/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/tjcigda/loot/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/tjcigda/loot/git/refs{/sha}","trees_url":"https://api.github.com/repos/tjcigda/loot/git/trees{/sha}","statuses_url":"https://api.github.com/repos/tjcigda/loot/statuses/{sha}","languages_url":"https://api.github.com/repos/tjcigda/loot/languages","stargazers_url":"https://api.github.com/repos/tjcigda/loot/stargazers","contributors_url":"https://api.github.com/repos/tjcigda/loot/contributors","subscribers_url":"https://api.github.com/repos/tjcigda/loot/subscribers","subscription_url":"https://api.github.com/repos/tjcigda/loot/subscription","commits_url":"https://api.github.com/repos/tjcigda/loot/commits{/sha}","git_commits_url":"https://api.github.com/repos/tjcigda/loot/git/commits{/sha}","comments_url":"https://api.github.com/repos/tjcigda/loot/comments{/number}","issue_comment_url":"https://api.github.com/repos/tjcigda/loot/issues/comments{/number}","contents_url":"https://api.github.com/repos/tjcigda/loot/contents/{+path}","compare_url":"https://api.github.com/repos/tjcigda/loot/compare/{base}...{head}","merges_url":"https://api.github.com/repos/tjcigda/loot/merges","archive_url":"https://api.github.com/repos/tjcigda/loot/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/tjcigda/loot/downloads","issues_url":"https://api.github.com/repos/tjcigda/loot/issues{/number}","pulls_url":"https://api.github.com/repos/tjcigda/loot/pulls{/number}","milestones_url":"https://api.github.com/repos/tjcigda/loot/milestones{/number}","notifications_url":"https://api.github.com/repos/tjcigda/loot/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/tjcigda/loot/labels{/name}","releases_url":"https://api.github.com/repos/tjcigda/loot/releases{/id}","created_at":"2015-10-09T13:29:59Z","updated_at":"2015-10-09T14:31:58Z","pushed_at":"2015-10-09T18:16:40Z","git_url":"git://github.com/tjcigda/loot.git","ssh_url":"git@github.com:tjcigda/loot.git","clone_url":"https://github.com/tjcigda/loot.git","svn_url":"https://github.com/tjcigda/loot","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":"C++","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":1,"forks":0,"open_issues":1,"watchers":0,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/tjcigda/loot/pulls/6"},"html":{"href":"https://github.com/tjcigda/loot/pull/6"},"issue":{"href":"https://api.github.com/repos/tjcigda/loot/issues/6"},"comments":{"href":"https://api.github.com/repos/tjcigda/loot/issues/6/comments"},"review_comments":{"href":"https://api.github.com/repos/tjcigda/loot/pulls/6/comments"},"review_comment":{"href":"https://api.github.com/repos/tjcigda/loot/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/tjcigda/loot/pulls/6/commits"},"statuses":{"href":"https://api.github.com/repos/tjcigda/loot/statuses/13937866ca0bb9fab97809108ab36931682afe0a"}},"merged":false,"mergeable":true,"mergeable_state":"clean","merged_by":null,"comments":0,"review_comments":0,"commits":1,"additions":0,"deletions":0,"changed_files":0}}