{"push_id":732705254,"size":3,"distinct_size":3,"ref":"refs/heads/master","head":"274d17b9a6d8dc36a7cae936443af2bb0ac5565a","before":"9d7767911bcf5e096a91f805af69cf3d40b5bc97","commits":[{"sha":"3c3145cb496d06fe013af696ad628aaa1d74026e","author":{"email":"9d47bbc4b8c60e678e13ad8b460818e977a6f3a4@live.com","name":"Hazim"},"message":"Quests, dialog scripts, interactables, misc updates\n\nQuests\n- Added quests\n\nDialog Scripts\n- 25% done\n- found a bug with checkpoints (maybe)\n\nInteractables\n- quest highlight for item spawn changed to particles\n\nMisc.\n- minor level design update\n- added props and decor.\n- moved files","distinct":true,"url":"https://api.github.com/repos/zappky/FYP2/commits/3c3145cb496d06fe013af696ad628aaa1d74026e"},{"sha":"f0492cceb65313a712ac465a2c2b75c5b777c223","author":{"email":"9d47bbc4b8c60e678e13ad8b460818e977a6f3a4@live.com","name":"Hazim"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tFYP2/Assets/Materials/Props/trapdoor.mat.meta\n\tFYP2/Assets/Scenes/main-scene.unity\n\tFYP2/Assets/Scripts/DialogInterface.cs\n\tFYP2/Assets/Scripts/Interactable.cs\n\tFYP2/Assets/gamedata/backup/backup_checkpoint_playersave.xml\n\tFYP2/Assets/gamedata/backup/backup_questlogdatas.xml\n\tFYP2/Assets/gamedata/questlogdatas.xml","distinct":true,"url":"https://api.github.com/repos/zappky/FYP2/commits/f0492cceb65313a712ac465a2c2b75c5b777c223"},{"sha":"274d17b9a6d8dc36a7cae936443af2bb0ac5565a","author":{"email":"9d47bbc4b8c60e678e13ad8b460818e977a6f3a4@live.com","name":"Hazim"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tFYP2/Assets/Materials/Props/trapdoor.mat.meta\n\tFYP2/Assets/Scenes/main-scene.unity\n\tFYP2/Assets/Scripts/DialogInterface.cs\n\tFYP2/Assets/Scripts/Interactable.cs\n\tFYP2/Assets/gamedata/backup/backup_checkpoint_playersave.xml\n\tFYP2/Assets/gamedata/backup/backup_dialoginterfacedatas.xml\n\tFYP2/Assets/gamedata/backup/backup_questlogdatas.xml\n\tFYP2/Assets/gamedata/questlogdatas.xml","distinct":true,"url":"https://api.github.com/repos/zappky/FYP2/commits/274d17b9a6d8dc36a7cae936443af2bb0ac5565a"}]}