{"push_id":986395632,"size":10,"distinct_size":1,"ref":"refs/heads/dev","head":"4f6315b9f8af33ef55979f831d1c5929fa4e7cb0","before":"81df02e16ce121a2dde63f4ce5fac915b9ff95b6","commits":[{"sha":"e328ea615bbd58f0687e49391c1d4f5f1f3eba29","author":{"email":"1a31309c9df103682c6ebcfcf728af9b11009831@gmail.com","name":"Edward Thomas Garcia"},"message":"Created a Weapon Pickup System. Still needs to have some different type of weapons to test out. Will implement Swing Type next time.","distinct":false,"url":"https://api.github.com/repos/Tlmader/honest-abe/commits/e328ea615bbd58f0687e49391c1d4f5f1f3eba29"},{"sha":"305365c36c5a5c2e8addcbe4099dc15f8e07ef4f","author":{"email":"1a31309c9df103682c6ebcfcf728af9b11009831@gmail.com","name":"Edward Thomas Garcia"},"message":"Merge branch 'development/weapon-system' into development/melee","distinct":false,"url":"https://api.github.com/repos/Tlmader/honest-abe/commits/305365c36c5a5c2e8addcbe4099dc15f8e07ef4f"},{"sha":"107480892ebcd75cccf0891237cece2a38195237","author":{"email":"1a31309c9df103682c6ebcfcf728af9b11009831@gmail.com","name":"Edward Thomas Garcia"},"message":"Implemented Light and Heavy Attack Collisions such that they do the right amount of damage to target entity.","distinct":false,"url":"https://api.github.com/repos/Tlmader/honest-abe/commits/107480892ebcd75cccf0891237cece2a38195237"},{"sha":"2fa21970d1ecaaac7d80affdd507eb165cd92d28","author":{"email":"ebbed3d42d922e6ba163dec8df72da2f6b57e02e@uno.edu","name":"Edward Thomas Garcia"},"message":"Added Blood!","distinct":false,"url":"https://api.github.com/repos/Tlmader/honest-abe/commits/2fa21970d1ecaaac7d80affdd507eb165cd92d28"},{"sha":"b3987c2c50ca1ea56af3cd0bbfe9f670ef99de51","author":{"email":"1a31309c9df103682c6ebcfcf728af9b11009831@gmail.com","name":"Edward Thomas Garcia"},"message":"Refactored Attack, Created a new Attack Type JAB, Added a Bear enemy, Added a new Weapon (Musket without Bayonet, but will end up being Bayonet). Jab doesn't have the correct animation right now.","distinct":false,"url":"https://api.github.com/repos/Tlmader/honest-abe/commits/b3987c2c50ca1ea56af3cd0bbfe9f670ef99de51"},{"sha":"af8a1986e77646bf89c5fcd1441d5521276f06fe","author":{"email":"ced64b40f3a71301d2c41c5bc63c2d7f5de962bf@uno.edu","name":"Edward Thomas Garcia"},"message":"Big refactoring. Mashed up Jump and other properties into Movement. Character can now face both directions thanks to using a negative scale. It works for somethings, but I think I prefer to make separate animations such that there is a transition and so that there is no negative scale.","distinct":false,"url":"https://api.github.com/repos/Tlmader/honest-abe/commits/af8a1986e77646bf89c5fcd1441d5521276f06fe"},{"sha":"4dda298a52746f309096732446f0da45b1c814ae","author":{"email":"ebbed3d42d922e6ba163dec8df72da2f6b57e02e@uno.edu","name":"Edward Thomas Garcia"},"message":"Added a simple fix so that characters render properly.","distinct":false,"url":"https://api.github.com/repos/Tlmader/honest-abe/commits/4dda298a52746f309096732446f0da45b1c814ae"},{"sha":"b8fa1ac316929f29acc5c60ead50eeed122c97d1","author":{"email":"ced64b40f3a71301d2c41c5bc63c2d7f5de962bf@uno.edu","name":"Edward Thomas Garcia"},"message":"Merge remote-tracking branch 'origin/dev' into development/movement\n\n# Conflicts:\n#\tAssets/AnimationControls/Bear.controller\n#\tAssets/AnimationControls/GenericHumanController.controller\n#\tAssets/Prefabs/Actors/Enemy.prefab\n#\tAssets/Prefabs/Actors/Player.prefab\n#\tAssets/Prefabs/Bear.prefab\n#\tAssets/Scenes/PlayScene-ETdoFresh.unity\n#\tAssets/Scenes/PlayScene.unity\n#\tAssets/Scripts/Attack.cs\n#\tAssets/Scripts/CameraFollow.cs\n#\tAssets/Scripts/Item.cs\n#\tAssets/Scripts/Jump.cs\n#\tAssets/Scripts/PlayerControls.cs\n#\tAssets/Scripts/PlayerMotor.cs\n#\tAssets/Scripts/Weapon.cs","distinct":false,"url":"https://api.github.com/repos/Tlmader/honest-abe/commits/b8fa1ac316929f29acc5c60ead50eeed122c97d1"},{"sha":"60c099413c5fa37d0e5a609cd517c7c446451063","author":{"email":"1a31309c9df103682c6ebcfcf728af9b11009831@gmail.com","name":"Edward Thomas Garcia"},"message":"Changed one line of code to get Weapon Pickup to work.","distinct":false,"url":"https://api.github.com/repos/Tlmader/honest-abe/commits/60c099413c5fa37d0e5a609cd517c7c446451063"},{"sha":"4f6315b9f8af33ef55979f831d1c5929fa4e7cb0","author":{"email":"f4b85d8c65d2da65c4476766859a486364d1a741@uno.edu","name":"Parker Sprouse"},"message":"Merge pull request #34 from Tlmader/development/movement\n\nDevelopment/movement","distinct":true,"url":"https://api.github.com/repos/Tlmader/honest-abe/commits/4f6315b9f8af33ef55979f831d1c5929fa4e7cb0"}]}