0000000000000000000000000000000000000000 d0a89f35eb3ba524a90b79bcd558415f4782b864 Tyler Gemora <tgemora@uci.edu> 1517027192 -0800	clone: from https://github.com/thetylerace13/SFSF.git
d0a89f35eb3ba524a90b79bcd558415f4782b864 d5809e673debe1957de5cf150b4d85dbc7bc31df Tyler Gemora <tgemora@uci.edu> 1517027544 -0800	commit: Unity Project
d5809e673debe1957de5cf150b4d85dbc7bc31df df643d60e014b18a80bcf350f4570a11a2180821 Tyler Gemora <tgemora@uci.edu> 1517028716 -0800	commit: Moved project folders
df643d60e014b18a80bcf350f4570a11a2180821 58740177edbf98f0312a7745db23b08556ca9747 Tyler Gemora <tgemora@uci.edu> 1517030635 -0800	commit: Basic networking
58740177edbf98f0312a7745db23b08556ca9747 cfb55d3419b21c55b4540e84931ea51d51a15c84 Tyler Gemora <tgemora@uci.edu> 1517031573 -0800	commit: Networking scripts
cfb55d3419b21c55b4540e84931ea51d51a15c84 9e3d149f1cb8e7a4375bba9d240c50f15c40ae79 Tyler Gemora <tgemora@uci.edu> 1517037328 -0800	commit: Testing chat on network
9e3d149f1cb8e7a4375bba9d240c50f15c40ae79 0a0669654529ab504da13eddc9a23e4c1c49303c Tyler Gemora <tgemora@uci.edu> 1517085834 -0800	commit: Tried networking and failed; got a chat window, though.
0a0669654529ab504da13eddc9a23e4c1c49303c 0a0669654529ab504da13eddc9a23e4c1c49303c Tyler Gemora <tgemora@uci.edu> 1517085873 -0800	checkout: moving from master to branching
0a0669654529ab504da13eddc9a23e4c1c49303c ffffc01cff2c0cf421e56b89768a8d7a6927df84 Tyler Gemora <tgemora@uci.edu> 1517090200 -0800	commit: Basic branching complete
ffffc01cff2c0cf421e56b89768a8d7a6927df84 0a0669654529ab504da13eddc9a23e4c1c49303c Tyler Gemora <tgemora@uci.edu> 1517090289 -0800	checkout: moving from branching to master
0a0669654529ab504da13eddc9a23e4c1c49303c ffffc01cff2c0cf421e56b89768a8d7a6927df84 Tyler Gemora <tgemora@uci.edu> 1517090296 -0800	merge branching: Fast-forward
ffffc01cff2c0cf421e56b89768a8d7a6927df84 5a755c4bf6a3987315848e70049c162dc565c8ef Tyler Gemora <tgemora@uci.edu> 1517095092 -0800	commit: Added responses at end of scenarios
5a755c4bf6a3987315848e70049c162dc565c8ef 223fd0709daefe037c0699baed529ce2530cef71 Tyler Gemora <tgemora@uci.edu> 1517095211 -0800	pull: Fast-forward
223fd0709daefe037c0699baed529ce2530cef71 14c6b70cf2963fc0f847ddb8d1bcd7ec772260d4 Tyler Gemora <tgemora@uci.edu> 1517096069 -0800	commit: Can move between scenarios now
14c6b70cf2963fc0f847ddb8d1bcd7ec772260d4 7ac8a2b74c1ef8b1d6ae6d6367ddd3b054debc4e Tyler Gemora <tgemora@uci.edu> 1517116940 -0800	commit: Scenarios implemented!
7ac8a2b74c1ef8b1d6ae6d6367ddd3b054debc4e 038cffdf5b14af56b6643f2ea1df23e137e991fb Tyler Gemora <tgemora@uci.edu> 1517116948 -0800	pull: Merge made by the 'recursive' strategy.
038cffdf5b14af56b6643f2ea1df23e137e991fb eb324a7a40467393da96788710e5900aae02f4fa Tyler Gemora <tgemora@uci.edu> 1517117719 -0800	commit: Basic destroy on command file
eb324a7a40467393da96788710e5900aae02f4fa ac9f9abd25ae529b33b2b3d038265ce20edb21fe Tyler Gemora <tgemora@uci.edu> 1517117872 -0800	commit (merge): Basic destroy file
ac9f9abd25ae529b33b2b3d038265ce20edb21fe 10250f8049e7743ad670b3e0b2ca9f4fa4867e58 Tyler Gemora <tgemora@uci.edu> 1517118916 -0800	pull: Fast-forward
10250f8049e7743ad670b3e0b2ca9f4fa4867e58 2b3463192d8f02cea7fd9be228995d280256f78b Tyler Gemora <tgemora@uci.edu> 1517120106 -0800	commit: Cool flickering lights in TV scene
2b3463192d8f02cea7fd9be228995d280256f78b b8dd1fb00337f4e7557998a56f49ad10f5a083cf Tyler Gemora <tgemora@uci.edu> 1517159198 -0800	commit: Moved the SFT assets
b8dd1fb00337f4e7557998a56f49ad10f5a083cf b672a575985b6ff01c23a16fc38fbd13d244862f Tyler Gemora <tgemora@uci.edu> 1517161529 -0800	commit: A little more changes to TV scene
b672a575985b6ff01c23a16fc38fbd13d244862f 612a2b40271c37c4d869790f24cc0670680c5899 Tyler Gemora <tgemora@uci.edu> 1517162003 -0800	pull: Fast-forward
612a2b40271c37c4d869790f24cc0670680c5899 1513720b4afe0f653d4eb0194a82d4ebdbb2bac3 Tyler Gemora <tgemora@uci.edu> 1517162247 -0800	commit: Fixed in-game sounds
1513720b4afe0f653d4eb0194a82d4ebdbb2bac3 72e4ac8d5aa805e07de46e92ee9a9eb51a99ed37 Tyler Gemora <tgemora@uci.edu> 1517162358 -0800	commit: Sounds part 2
72e4ac8d5aa805e07de46e92ee9a9eb51a99ed37 ccf350fbd69538cadf7e7967cfebf89aea5da9ae Tyler Gemora <tgemora@uci.edu> 1517162698 -0800	commit: Small change to scenario tracking
ccf350fbd69538cadf7e7967cfebf89aea5da9ae 05bc4912b5d0574bd87f6b1e30be07aee1620089 Tyler Gemora <tgemora@uci.edu> 1517164072 -0800	commit: Added back-end sound control
05bc4912b5d0574bd87f6b1e30be07aee1620089 d4c1e1a6aaaff4ff9d5540665afbc4b39c5bd0fd Tyler Gemora <tgemora@uci.edu> 1517164079 -0800	pull: Merge made by the 'recursive' strategy.
d4c1e1a6aaaff4ff9d5540665afbc4b39c5bd0fd c9f4397cb64974a98745767cb04f1ce97d85bc76 Tyler Gemora <tgemora@uci.edu> 1517168893 -0800	commit: Added colors to different player text
c9f4397cb64974a98745767cb04f1ce97d85bc76 19145010c1a56fbddf4057e87f7bb81f49f93645 Tyler Gemora <tgemora@uci.edu> 1517172749 -0800	commit: Fixed a few menu things.
19145010c1a56fbddf4057e87f7bb81f49f93645 4f39af72526640dbd415dad1a9ae0ad89729f656 Tyler Gemora <tgemora@uci.edu> 1517173438 -0800	commit: Build settings
4f39af72526640dbd415dad1a9ae0ad89729f656 086289f9a2735da9a4932ca105529adea277c3fd Tyler Gemora <tgemora@uci.edu> 1517173662 -0800	pull: Fast-forward
086289f9a2735da9a4932ca105529adea277c3fd 0fa916037674a87a841d4ae87b2b329c9ff1169f Tyler Gemora <tgemora@uci.edu> 1517174158 -0800	commit: Some lighting changes in cockpit
0fa916037674a87a841d4ae87b2b329c9ff1169f 4d5bd25d4657c4a56b2faf4583103aa413ea0e99 Tyler Gemora <tgemora@uci.edu> 1517176359 -0800	commit: Text in cockpit
4d5bd25d4657c4a56b2faf4583103aa413ea0e99 b48f586951caab6703841900ddaa3dca4443e11d Tyler Gemora <tgemora@uci.edu> 1517176449 -0800	commit (merge): Text in cockpit
b48f586951caab6703841900ddaa3dca4443e11d 471f728df4510e89ec376f2365bafc60b8a8ad44 Tyler Gemora <tgemora@uci.edu> 1517176952 -0800	commit: Fixed main scene
471f728df4510e89ec376f2365bafc60b8a8ad44 083dc5d94151f11f7192cabe1f4cc33a01e46895 Tyler Gemora <tgemora@uci.edu> 1517177899 -0800	commit: Moved assets
083dc5d94151f11f7192cabe1f4cc33a01e46895 2f1ed6cd2a2b88f4a0242e72468f44e2e1ac80a3 Tyler Gemora <tgemora@uci.edu> 1517179358 -0800	commit: Text delay and fixed sounds
2f1ed6cd2a2b88f4a0242e72468f44e2e1ac80a3 5dee0289aaccc4d9578e75b0e9ea093d877b3513 Tyler Gemora <tgemora@uci.edu> 1517179363 -0800	pull: Merge made by the 'recursive' strategy.
5dee0289aaccc4d9578e75b0e9ea093d877b3513 b2b9536a4f766aa7702670f1057a6ae1cf3c3572 Tyler Gemora <tgemora@uci.edu> 1517180356 -0800	commit: Main scene logisitics finished
b2b9536a4f766aa7702670f1057a6ae1cf3c3572 d7a7d605c0c2f437390a46baf98049b164038a31 Tyler Gemora <tgemora@uci.edu> 1517180615 -0800	commit: Fixed main menu buttons
d7a7d605c0c2f437390a46baf98049b164038a31 c742976200c9fa1feb9dad9907f4fc0cbf225728 Tyler Gemora <tgemora@uci.edu> 1517180839 -0800	commit (merge): Merge
c742976200c9fa1feb9dad9907f4fc0cbf225728 d37be0c077df3342ddbefcd5fc5d50b38b8bb239 Tyler Gemora <tgemora@uci.edu> 1517180932 -0800	commit: Changed scene
d37be0c077df3342ddbefcd5fc5d50b38b8bb239 6a5a557a5470122eddd0c3c936a2f355733d3e52 Tyler Gemora <tgemora@uci.edu> 1517180995 -0800	pull: Fast-forward
6a5a557a5470122eddd0c3c936a2f355733d3e52 682c474c8d291c4ac7665eb33a96f474766a51ec Tyler Gemora <tgemora@uci.edu> 1517181070 -0800	commit: Changed buttons
