0000000000000000000000000000000000000000 f4ecdb054581b15bae57b8fafd9fee89ac707a90 Ricardo Noriega <r.noriega31@gmail.com> 1485013209 -0500	clone: from https://github.com/rnoriega31/global_gamejam.git
f4ecdb054581b15bae57b8fafd9fee89ac707a90 5e59c499a7e3478ccca7d586b90677c3d7ddb5eb Ricardo Noriega <r.noriega31@gmail.com> 1485022945 -0500	commit: add player and collision
5e59c499a7e3478ccca7d586b90677c3d7ddb5eb 46d0f39d8e6aade11512c1fdae97984f90e60848 Ricardo Noriega <r.noriega31@gmail.com> 1485028900 -0500	commit: add double jump and falling-off-edge
46d0f39d8e6aade11512c1fdae97984f90e60848 2639a4f75437e83069a52372322e43bfbf1a8626 Ricardo Noriega <r.noriega31@gmail.com> 1485029295 -0500	commit (merge): Merge branch 'master' of https://github.com/rnoriega31/global_gamejam
2639a4f75437e83069a52372322e43bfbf1a8626 5738b1140d4d7e3fede0c42ef54d0f7a0d3ab534 Ricardo Noriega <r.noriega31@gmail.com> 1485041279 -0500	pull: Fast-forward
5738b1140d4d7e3fede0c42ef54d0f7a0d3ab534 f07270667acd339f15239e820c3277bc949aa78f Ricardo Noriega <r.noriega31@gmail.com> 1485048729 -0500	commit: Add triggers, disable double-jump, disable illuminate, add door and diamond place-holder assets, complete stage_1
f07270667acd339f15239e820c3277bc949aa78f daec79ec5f6795cbf9466b529624b0396fcced49 Ricardo Noriega <r.noriega31@gmail.com> 1485104134 -0500	commit: Change trigger properties, change sprite images for Door and Diamond
daec79ec5f6795cbf9466b529624b0396fcced49 a9bf758f9aa4d2fab3aa6b8e05202555efe1dfdd Ricardo Noriega <r.noriega31@gmail.com> 1485104452 -0500	commit (merge): Merge branch 'master' of https://github.com/rnoriega31/global_gamejam
a9bf758f9aa4d2fab3aa6b8e05202555efe1dfdd 56490deb570f1c838d047cea66f44d414246f9a2 Ricardo Noriega <r.noriega31@gmail.com> 1485104687 -0500	pull: Fast-forward
56490deb570f1c838d047cea66f44d414246f9a2 4afd0651c3c1b45056f17de2c0fbc5b21aab04e5 Ricardo Noriega <r.noriega31@gmail.com> 1485108911 -0500	pull: Fast-forward
4afd0651c3c1b45056f17de2c0fbc5b21aab04e5 f34c2c1d3c108fd6e62db20cff10f17dbeb3357c Ricardo Noriega <r.noriega31@gmail.com> 1485109165 -0500	commit: Merged with master
f34c2c1d3c108fd6e62db20cff10f17dbeb3357c d5fc29bb569c80014992e07553648d4452f780cd Ricardo Noriega <r.noriega31@gmail.com> 1485109760 -0500	pull: Fast-forward
d5fc29bb569c80014992e07553648d4452f780cd bb2b8ddeef85f5f047a51574ac061d0743d0731a Ricardo Noriega <r.noriega31@gmail.com> 1485114034 -0500	pull: Fast-forward
bb2b8ddeef85f5f047a51574ac061d0743d0731a 5d80e1ebdefa79dd453f4780d477a585fc56fc3d Ricardo Noriega <r.noriega31@gmail.com> 1485114163 -0500	commit: change stage_1 layout, merge with master
5d80e1ebdefa79dd453f4780d477a585fc56fc3d 944ccfb38bfc7b0ea260c2d8044f0a7af70c7ce8 Ricardo Noriega <r.noriega31@gmail.com> 1485119090 -0500	commit: change trigger timings, finish stage_1, progress stage_2
944ccfb38bfc7b0ea260c2d8044f0a7af70c7ce8 9cc6de2367d64c6d884122fd411f6afdb501bc45 Ricardo Noriega <r.noriega31@gmail.com> 1485119431 -0500	commit (merge): Fix merge conflict with master
9cc6de2367d64c6d884122fd411f6afdb501bc45 4e6de4787dad314921e314f375510bfff0fb2ac4 Ricardo Noriega <r.noriega31@gmail.com> 1485120547 -0500	commit: Add instructions to second room
4e6de4787dad314921e314f375510bfff0fb2ac4 d9a02ea8462e2250541e2898357a502dbe648a56 Ricardo Noriega <r.noriega31@gmail.com> 1485123962 -0500	pull: Fast-forward
d9a02ea8462e2250541e2898357a502dbe648a56 4af686183d3809c25f62e50162cb7f5dfc758197 Ricardo Noriega <r.noriega31@gmail.com> 1485124173 -0500	commit: Solve merge conflict with master
4af686183d3809c25f62e50162cb7f5dfc758197 6a864885e7b41ee1a9aec62fd6492a0c3f7a67ed Ricardo Noriega <r.noriega31@gmail.com> 1485125730 -0500	commit: Change rm_thanks fps to 60, modify spr_Spike_0, change next room of rm_stage2, add BGM to rm_stage3, change next room of rm_stage3
6a864885e7b41ee1a9aec62fd6492a0c3f7a67ed 0db5e57f8d7460e6046b7e8800c2c5bb41e44063 Ricardo Noriega <r.noriega31@gmail.com> 1485128783 -0500	pull: Fast-forward
0db5e57f8d7460e6046b7e8800c2c5bb41e44063 a056ade7eef409959ae93b52ff5d4b9ccde753b6 Ricardo Noriega <r.noriega31@gmail.com> 1485129074 -0500	pull: Fast-forward
