-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathgitlog.txt
3698 lines (2996 loc) · 138 KB
/
gitlog.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
commit 63cfc9d1b0a50a9801777fdeb155a6079411f6de
Merge: 00243b9 f4923b7
Author: HeatherZheng <[email protected]>
Date: Tue May 15 16:21:57 2018 -0400
Merge branch 'master' of https://github.com/yilin-lu/2Escape
commit 00243b9f5e99baaf7797a59352ad5543dc202d92
Merge: 7863381 18d6692
Author: HeatherZheng <[email protected]>
Date: Tue May 15 16:21:27 2018 -0400
state_test update
commit f4923b784b020e5457c893d8d47a59acbc2ebd70
Author: betsyfu <[email protected]>
Date: Tue May 15 16:20:58 2018 -0400
Update README.md
README.md | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
commit 78960b2cb60f4fd6518e1440622a54c6a5e9ddf9
Author: betsyfu <[email protected]>
Date: Tue May 15 16:18:20 2018 -0400
Update README.md
screenshot
README.md | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit 2096e6feb6b797a571fba8e74191a631a772108a
Author: betsyfu <[email protected]>
Date: Tue May 15 16:16:32 2018 -0400
Update README.md
screenshot
README.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit ce5d5464503ba29e003bd5e908ee786483f23200
Author: betsyfu <[email protected]>
Date: Tue May 15 16:15:34 2018 -0400
Update README.md
screenshot
README.md | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
commit 1c2a19894171052a334bceb958c51d657f20ff4b
Author: betsyfu <[email protected]>
Date: Tue May 15 16:13:30 2018 -0400
screenshot1
screen.png | Bin 0 -> 878941 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
commit 246f4d817e07470f925cd075575e70d45b42f2ce
Author: betsyfu <[email protected]>
Date: Tue May 15 16:12:16 2018 -0400
Update README.md
more
README.md | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
commit 7863381ad002720452b959d8b5a7e2245892be29
Author: HeatherZheng <[email protected]>
Date: Tue May 15 16:07:42 2018 -0400
state_test update
state_test.ml | 158 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 80 insertions(+), 78 deletions(-)
commit 18d6692eecaa4a42d570084867347543796f467e
Author: betsyfu <[email protected]>
Date: Tue May 15 15:59:58 2018 -0400
Update README.md
changes
README.md | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
commit b77c68cfa396ba9992a98536d2318a2671f3f8c5
Author: betsyfu <[email protected]>
Date: Tue May 15 15:59:08 2018 -0400
Update README.md
Installation,Acknowledgement
README.md | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
commit ae41ae7f9135a12c0a2b71bb163a3d632e51251f
Author: Anneliese Lu <[email protected]>
Date: Tue May 15 15:32:18 2018 -0400
a reference
player_2_drop_book.txt | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 80 insertions(+)
commit 052dc32f396bf693d302ef5ff0d35708b8924060
Author: Anneliese Lu <[email protected]>
Date: Tue May 15 15:30:05 2018 -0400
new gears
sprites2/gear_bottom.png | Bin 0 -> 5437 bytes
sprites2/gear_left.png | Bin 0 -> 5228 bytes
sprites2/gear_mid.png | Bin 0 -> 5950 bytes
sprites2/gear_middle.png | Bin 0 -> 6219 bytes
sprites2/gear_right.png | Bin 0 -> 5077 bytes
sprites2/gear_top.png | Bin 0 -> 5170 bytes
6 files changed, 0 insertions(+), 0 deletions(-)
commit 0cdee53f8fe59fa2eae1a3552c4be93065f136a5
Merge: 2829722 05c956d
Author: Aaron Lou <[email protected]>
Date: Tue May 15 15:14:46 2018 -0400
Merge branch 'master' of https://github.com/yilin-lu/2Escape
commit 05c956dd91eef7d4bbb540b2303a2cd728f8cecd
Author: Anneliese Lu <[email protected]>
Date: Tue May 15 15:14:35 2018 -0400
store
init.ml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 28297222400559881b2a419f01ea0242499a0e5f
Merge: 63e2817 72f66a7
Author: Aaron Lou <[email protected]>
Date: Tue May 15 15:13:25 2018 -0400
Merge branch 'master' of https://github.com/yilin-lu/2Escape
commit 72f66a744ee43d3e6f96fa52063b26620ecb5a29
Author: Anneliese Lu <[email protected]>
Date: Tue May 15 15:13:14 2018 -0400
remove mov
init.ml | 6 +++---
test.json | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
commit 63e2817328b90e4b599413f9b6804be1e479c1b0
Merge: 98a409d e9eb0d6
Author: Aaron Lou <[email protected]>
Date: Tue May 15 15:09:29 2018 -0400
Merge branch 'master' of https://github.com/yilin-lu/2Escape
commit e9eb0d6f7daa7123042a0c5d8d67638aa0de1bc4
Author: Anneliese Lu <[email protected]>
Date: Tue May 15 15:09:10 2018 -0400
keyloc t f
sprites2/{cross.png => cross/false.png} | Bin
sprites2/cross/true.png | Bin 0 -> 3504 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
commit 98a409d7459453a0cc4443ab9b9cd3ec064716e4
Merge: 6ac6025 f1ef6ca
Author: Aaron Lou <[email protected]>
Date: Tue May 15 15:03:00 2018 -0400
Merge branch 'master' of https://github.com/yilin-lu/2Escape
commit 6ac6025cdc2b996f5cbf38fe88aa10989780b88c
Author: Aaron Lou <[email protected]>
Date: Tue May 15 15:02:59 2018 -0400
Stash
Gui.ml | 6 +-
Makefile | 2 +-
init.ml | 4 +-
parser_tests.byte | 1 +
parser_tests.ml | 45 +++++++++++++-
sprites/blank.png | Bin 0 -> 1139 bytes
sprites/cylinder_1.png | Bin 0 -> 1985 bytes
sprites/cylinder_11.png | Bin 0 -> 5653 bytes
sprites/cylinder_12.png | Bin 0 -> 4426 bytes
sprites/cylinder_13.png | Bin 0 -> 5171 bytes
sprites/cylinder_14.png | Bin 0 -> 4940 bytes
sprites/cylinder_15.png | Bin 0 -> 2789 bytes
sprites/cylinder_16.png | Bin 0 -> 4547 bytes
sprites/cylinder_17.png | Bin 0 -> 4438 bytes
sprites/cylinder_18.png | Bin 0 -> 4320 bytes
sprites/cylinder_19.png | Bin 0 -> 5049 bytes
sprites/cylinder_2.png | Bin 0 -> 4509 bytes
sprites/cylinder_20.png | Bin 0 -> 5505 bytes
sprites/cylinder_21.png | Bin 0 -> 5279 bytes
sprites/cylinder_3.png | Bin 0 -> 4054 bytes
sprites/cylinder_4.png | Bin 0 -> 4064 bytes
sprites/cylinder_5.png | Bin 0 -> 3813 bytes
sprites/cylinder_6.png | Bin 0 -> 3827 bytes
sprites/cylinder_7.png | Bin 0 -> 1805 bytes
sprites/cylinder_8.png | Bin 0 -> 3379 bytes
sprites/cylinder_9.png | Bin 0 -> 6318 bytes
sprites/end.png.jpg | Bin 0 -> 326661 bytes
sprites/exit/closed.png | Bin 0 -> 341 bytes
sprites/exit/open.png | Bin 0 -> 642 bytes
sprites/gear_1/down.png | Bin 0 -> 2603 bytes
sprites/gear_1/left.png | Bin 0 -> 2549 bytes
sprites/gear_1/right.png | Bin 0 -> 2600 bytes
sprites/gear_1/up.png | Bin 0 -> 2264 bytes
sprites/gear_2/down.png | Bin 0 -> 3255 bytes
sprites/gear_2/left.png | Bin 0 -> 3482 bytes
sprites/gear_2/right.png | Bin 0 -> 3542 bytes
sprites/gear_2/up.png | Bin 0 -> 3081 bytes
sprites/gear_3/down.png | Bin 0 -> 2514 bytes
sprites/gear_3/left.png | Bin 0 -> 2621 bytes
sprites/gear_3/right.png | Bin 0 -> 2670 bytes
sprites/gear_3/up.png | Bin 0 -> 2591 bytes
sprites/gear_4/down.png | Bin 0 -> 3524 bytes
sprites/gear_4/left.png | Bin 0 -> 3343 bytes
sprites/gear_4/right.png | Bin 0 -> 3339 bytes
sprites/gear_4/up.png | Bin 0 -> 3593 bytes
sprites/gear_5/down.png | Bin 0 -> 2501 bytes
sprites/gear_5/left.png | Bin 0 -> 2652 bytes
sprites/gear_5/right.png | Bin 0 -> 2590 bytes
sprites/gear_5/up.png | Bin 0 -> 2498 bytes
sprites/gear_6/down.png | Bin 0 -> 3461 bytes
sprites/gear_6/left.png | Bin 0 -> 3698 bytes
sprites/gear_6/right.png | Bin 0 -> 3634 bytes
sprites/gear_6/up.png | Bin 0 -> 3266 bytes
sprites/gear_7/down.png | Bin 0 -> 2591 bytes
sprites/gear_7/left.png | Bin 0 -> 2670 bytes
sprites/gear_7/right.png | Bin 0 -> 2621 bytes
sprites/gear_7/up.png | Bin 0 -> 2364 bytes
sprites/gear_8/down.png | Bin 0 -> 3593 bytes
sprites/gear_8/left.png | Bin 0 -> 3339 bytes
sprites/gear_8/right.png | Bin 0 -> 3343 bytes
sprites/gear_8/up.png | Bin 0 -> 3374 bytes
sprites/gear_a/down.png | Bin 0 -> 3564 bytes
sprites/gear_a/gear_a_1_down.png | Bin 5521 -> 0 bytes
sprites/gear_a/gear_a_1_left.png | Bin 5750 -> 0 bytes
sprites/gear_a/gear_a_1_right.png | Bin 5639 -> 0 bytes
sprites/gear_a/gear_a_1_up.png | Bin 5470 -> 0 bytes
sprites/gear_a/gear_a_2_down.png | Bin 5521 -> 0 bytes
sprites/gear_a/gear_a_2_left.png | Bin 5750 -> 0 bytes
sprites/gear_a/gear_a_2_right.png | Bin 5639 -> 0 bytes
sprites/gear_a/gear_a_2_up.png | Bin 5470 -> 0 bytes
sprites/gear_a/gear_a_3_down.png | Bin 5521 -> 0 bytes
sprites/gear_a/gear_a_3_left.png | Bin 5750 -> 0 bytes
sprites/gear_a/gear_a_3_right.png | Bin 5639 -> 0 bytes
sprites/gear_a/gear_a_3_up.png | Bin 5470 -> 0 bytes
sprites/gear_a/gear_a_4_down.png | Bin 5521 -> 0 bytes
sprites/gear_a/gear_a_4_left.png | Bin 5750 -> 0 bytes
sprites/gear_a/gear_a_4_right.png | Bin 5639 -> 0 bytes
sprites/gear_a/gear_a_4_up.png | Bin 5470 -> 0 bytes
sprites/gear_a/left.png | Bin 0 -> 3729 bytes
sprites/gear_a/right.png | Bin 0 -> 3804 bytes
sprites/gear_a/up.png | Bin 0 -> 3458 bytes
sprites/gear_d/down.png | Bin 0 -> 4146 bytes
sprites/gear_d/gear_d_1_down.png | Bin 5670 -> 0 bytes
sprites/gear_d/gear_d_1_left.png | Bin 5890 -> 0 bytes
sprites/gear_d/gear_d_1_right.png | Bin 5789 -> 0 bytes
sprites/gear_d/gear_d_1_up.png | Bin 5643 -> 0 bytes
sprites/gear_d/gear_d_2_down.png | Bin 5670 -> 0 bytes
sprites/gear_d/gear_d_2_left.png | Bin 5890 -> 0 bytes
sprites/gear_d/gear_d_2_right.png | Bin 5789 -> 0 bytes
sprites/gear_d/gear_d_2_up.png | Bin 5643 -> 0 bytes
sprites/gear_d/gear_d_3_down.png | Bin 5670 -> 0 bytes
sprites/gear_d/gear_d_3_left.png | Bin 5890 -> 0 bytes
sprites/gear_d/gear_d_3_right.png | Bin 5789 -> 0 bytes
sprites/gear_d/gear_d_3_up.png | Bin 5643 -> 0 bytes
sprites/gear_d/gear_d_4_down.png | Bin 5670 -> 0 bytes
sprites/gear_d/gear_d_4_left.png | Bin 5890 -> 0 bytes
sprites/gear_d/gear_d_4_right.png | Bin 5789 -> 0 bytes
sprites/gear_d/gear_d_4_up.png | Bin 5643 -> 0 bytes
sprites/gear_d/left.png | Bin 0 -> 4224 bytes
sprites/gear_d/right.png | Bin 0 -> 4056 bytes
sprites/gear_d/up.png | Bin 0 -> 4038 bytes
sprites/start_1.png | Bin 0 -> 1464519 bytes
sprites/start_2.png | Bin 0 -> 666287 bytes
sprites/start_3.png | Bin 0 -> 128537 bytes
sprites/start_4.png | Bin 0 -> 765349 bytes
sprites1/a.png | Bin 0 -> 5667 bytes
sprites1/b.png | Bin 0 -> 5587 bytes
sprites1/b_key.png | Bin 0 -> 2628 bytes
sprites1/blank.png | Bin 0 -> 1139 bytes
sprites1/book.png | Bin 0 -> 4385 bytes
sprites1/c.png | Bin 0 -> 5294 bytes
sprites1/c_key.png | Bin 0 -> 2211 bytes
sprites1/clocktower_key.png | Bin 0 -> 2817 bytes
sprites1/cylinder_1.png | Bin 0 -> 1985 bytes
sprites1/cylinder_11.png | Bin 0 -> 5653 bytes
sprites1/cylinder_12.png | Bin 0 -> 4426 bytes
sprites1/cylinder_13.png | Bin 0 -> 5171 bytes
sprites1/cylinder_14.png | Bin 0 -> 4940 bytes
sprites1/cylinder_15.png | Bin 0 -> 2789 bytes
sprites1/cylinder_16.png | Bin 0 -> 4547 bytes
sprites1/cylinder_17.png | Bin 0 -> 4438 bytes
sprites1/cylinder_18.png | Bin 0 -> 4320 bytes
sprites1/cylinder_19.png | Bin 0 -> 5049 bytes
sprites1/cylinder_2.png | Bin 0 -> 4509 bytes
sprites1/cylinder_20.png | Bin 0 -> 5505 bytes
sprites1/cylinder_21.png | Bin 0 -> 5279 bytes
sprites1/cylinder_3.png | Bin 0 -> 4054 bytes
sprites1/cylinder_4.png | Bin 0 -> 4064 bytes
sprites1/cylinder_5.png | Bin 0 -> 3813 bytes
sprites1/cylinder_6.png | Bin 0 -> 3827 bytes
sprites1/cylinder_7.png | Bin 0 -> 1805 bytes
sprites1/cylinder_8.png | Bin 0 -> 3379 bytes
sprites1/cylinder_9.png | Bin 0 -> 6318 bytes
sprites1/d.png | Bin 0 -> 5504 bytes
sprites1/e.png | Bin 0 -> 5493 bytes
sprites1/e_key.png | Bin 0 -> 2332 bytes
sprites1/end.png.jpg | Bin 0 -> 326661 bytes
sprites1/exit/closed.png | Bin 0 -> 341 bytes
sprites1/exit/open.png | Bin 0 -> 642 bytes
sprites1/gear_1/down.png | Bin 0 -> 2603 bytes
sprites1/gear_1/left.png | Bin 0 -> 2549 bytes
sprites1/gear_1/right.png | Bin 0 -> 2600 bytes
sprites1/gear_1/up.png | Bin 0 -> 2264 bytes
sprites1/gear_2/down.png | Bin 0 -> 3255 bytes
sprites1/gear_2/left.png | Bin 0 -> 3482 bytes
sprites1/gear_2/right.png | Bin 0 -> 3542 bytes
sprites1/gear_2/up.png | Bin 0 -> 3081 bytes
sprites1/gear_3/down.png | Bin 0 -> 2514 bytes
sprites1/gear_3/left.png | Bin 0 -> 2621 bytes
sprites1/gear_3/right.png | Bin 0 -> 2670 bytes
sprites1/gear_3/up.png | Bin 0 -> 2591 bytes
sprites1/gear_4/down.png | Bin 0 -> 3524 bytes
sprites1/gear_4/left.png | Bin 0 -> 3343 bytes
sprites1/gear_4/right.png | Bin 0 -> 3339 bytes
sprites1/gear_4/up.png | Bin 0 -> 3593 bytes
sprites1/gear_5/down.png | Bin 0 -> 2501 bytes
sprites1/gear_5/left.png | Bin 0 -> 2652 bytes
sprites1/gear_5/right.png | Bin 0 -> 2590 bytes
sprites1/gear_5/up.png | Bin 0 -> 2498 bytes
sprites1/gear_6/down.png | Bin 0 -> 3461 bytes
sprites1/gear_6/left.png | Bin 0 -> 3698 bytes
sprites1/gear_6/right.png | Bin 0 -> 3634 bytes
sprites1/gear_6/up.png | Bin 0 -> 3266 bytes
sprites1/gear_7/down.png | Bin 0 -> 2591 bytes
sprites1/gear_7/left.png | Bin 0 -> 2670 bytes
sprites1/gear_7/right.png | Bin 0 -> 2621 bytes
sprites1/gear_7/up.png | Bin 0 -> 2364 bytes
sprites1/gear_8/down.png | Bin 0 -> 3593 bytes
sprites1/gear_8/left.png | Bin 0 -> 3339 bytes
sprites1/gear_8/right.png | Bin 0 -> 3343 bytes
sprites1/gear_8/up.png | Bin 0 -> 3374 bytes
sprites1/gear_a/down.png | Bin 0 -> 3564 bytes
sprites1/gear_a/left.png | Bin 0 -> 3729 bytes
sprites1/gear_a/right.png | Bin 0 -> 3804 bytes
sprites1/gear_a/up.png | Bin 0 -> 3458 bytes
sprites1/gear_d/down.png | Bin 0 -> 4146 bytes
sprites1/gear_d/left.png | Bin 0 -> 4224 bytes
sprites1/gear_d/right.png | Bin 0 -> 4056 bytes
sprites1/gear_d/up.png | Bin 0 -> 4038 bytes
sprites1/handler.png | Bin 0 -> 3544 bytes
sprites1/ladder.png | Bin 0 -> 3887 bytes
sprites1/rope.png | Bin 0 -> 3710 bytes
sprites1/start_1.png | Bin 0 -> 1464519 bytes
sprites1/start_2.png | Bin 0 -> 666287 bytes
sprites1/start_3.png | Bin 0 -> 128537 bytes
sprites1/start_4.png | Bin 0 -> 765349 bytes
sprites1/steel.png | Bin 0 -> 4955 bytes
sprites1/stick.png | Bin 0 -> 2723 bytes
sprites1/workshop_key.png | Bin 0 -> 2420 bytes
state_test.byte | 1 +
state_test.ml | 121 ++++++++++++++++++--------------------
191 files changed, 108 insertions(+), 72 deletions(-)
commit f1ef6ca111fd4099d6292eb7c07b9103df5a6aff
Merge: 14bb3c3 6a77ef0
Author: Anneliese Lu <[email protected]>
Date: Tue May 15 15:02:32 2018 -0400
Merge branch 'master' of https://github.com/yilin-lu/2Escape
commit 14bb3c3aa0927fa16feb650bcd4caebc8688f351
Author: Anneliese Lu <[email protected]>
Date: Tue May 15 15:02:24 2018 -0400
keyloc img fix
init.ml | 44 ++++++++++++++++++++++----------------------
sprites2/cross.png | Bin 0 -> 5944 bytes
sprites2/exit/closed.png | Bin 341 -> 4265 bytes
sprites2/exit/open.png | Bin 642 -> 2951 bytes
4 files changed, 22 insertions(+), 22 deletions(-)
commit 6a77ef053933b89c399e55b0692bab9b6781bcdf
Author: betsyfu <[email protected]>
Date: Tue May 15 14:59:32 2018 -0400
Update README.md
overview
README.md | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
commit aa038f09d61b240f39eeec3ca890566e158cfbf6
Author: HeatherZheng <[email protected]>
Date: Tue May 15 14:53:58 2018 -0400
add cutscene picture
sprites2/end.png.jpg | Bin 0 -> 326661 bytes
sprites2/start_1.png | Bin 0 -> 1464519 bytes
sprites2/start_2.png | Bin 0 -> 666287 bytes
sprites2/start_3.png | Bin 0 -> 128537 bytes
sprites2/start_4.png | Bin 0 -> 765349 bytes
5 files changed, 0 insertions(+), 0 deletions(-)
commit ac0e696086b6340d0012f59d47c329d025bc6faf
Merge: 4fe8d10 b0a583b
Author: HeatherZheng <[email protected]>
Date: Tue May 15 14:47:52 2018 -0400
Merge branch 'master' of https://github.com/yilin-lu/2Escape
commit 4fe8d108136f2d2b4bab7a2dd99ffff619e163df
Merge: cb1a9e2 cb6923d
Author: HeatherZheng <[email protected]>
Date: Tue May 15 14:47:16 2018 -0400
add script for cutscene
commit b0a583b800dd16a3448f3dfce325481003c2466b
Author: Anneliese Lu <[email protected]>
Date: Tue May 15 14:46:52 2018 -0400
cylinders
sprites2/cylinder_1.png | Bin 0 -> 1985 bytes
sprites2/cylinder_11.png | Bin 0 -> 5653 bytes
sprites2/cylinder_12.png | Bin 0 -> 4426 bytes
sprites2/cylinder_13.png | Bin 0 -> 5171 bytes
sprites2/cylinder_14.png | Bin 0 -> 4940 bytes
sprites2/cylinder_15.png | Bin 0 -> 2789 bytes
sprites2/cylinder_16.png | Bin 0 -> 4547 bytes
sprites2/cylinder_17.png | Bin 0 -> 4438 bytes
sprites2/cylinder_18.png | Bin 0 -> 4320 bytes
sprites2/cylinder_19.png | Bin 0 -> 5049 bytes
sprites2/cylinder_2.png | Bin 0 -> 4509 bytes
sprites2/cylinder_20.png | Bin 0 -> 5505 bytes
sprites2/cylinder_21.png | Bin 0 -> 5279 bytes
sprites2/cylinder_3.png | Bin 0 -> 4054 bytes
sprites2/cylinder_4.png | Bin 0 -> 4064 bytes
sprites2/cylinder_5.png | Bin 0 -> 3813 bytes
sprites2/cylinder_6.png | Bin 0 -> 3827 bytes
sprites2/cylinder_7.png | Bin 0 -> 1805 bytes
sprites2/cylinder_8.png | Bin 0 -> 3379 bytes
sprites2/cylinder_9.png | Bin 0 -> 6318 bytes
sprites3/black.png | Bin 233 -> 0 bytes
sprites3/blue_bookshelf.png | Bin 3338 -> 0 bytes
sprites3/book.png | Bin 3890 -> 0 bytes
sprites3/clocktower_key.png | Bin 2435 -> 0 bytes
sprites3/debris.png | Bin 1504 -> 0 bytes
sprites3/desk_bottom.png | Bin 3936 -> 0 bytes
sprites3/desk_top.png | Bin 3122 -> 0 bytes
sprites3/empty.png | Bin 4991 -> 0 bytes
sprites3/gear_a_1.png | Bin 3458 -> 0 bytes
sprites3/gear_a_2.png | Bin 3804 -> 0 bytes
sprites3/gear_a_3.png | Bin 3564 -> 0 bytes
sprites3/gear_a_4.png | Bin 3729 -> 0 bytes
sprites3/gear_d_1.png | Bin 3458 -> 0 bytes
sprites3/gear_d_2.png | Bin 3804 -> 0 bytes
sprites3/gear_d_3.png | Bin 3564 -> 0 bytes
sprites3/gear_d_4.png | Bin 3729 -> 0 bytes
sprites3/hall_handler_key copy.png | Bin 2324 -> 0 bytes
sprites3/handler_key.jpg | Bin 1705 -> 0 bytes
sprites3/invempty.png | Bin 575 -> 0 bytes
sprites3/ladder.png | Bin 2897 -> 0 bytes
sprites3/larrow.png | Bin 1596 -> 0 bytes
sprites3/opening.png | Bin 1263821 -> 0 bytes
sprites3/player1/down.png | Bin 1638 -> 0 bytes
sprites3/player1/left.png | Bin 1651 -> 0 bytes
sprites3/player1/right.png | Bin 1635 -> 0 bytes
sprites3/player1/up.png | Bin 1439 -> 0 bytes
sprites3/player2/down.png | Bin 1847 -> 0 bytes
sprites3/player2/left.png | Bin 1874 -> 0 bytes
sprites3/player2/right.png | Bin 1881 -> 0 bytes
sprites3/player2/up.png | Bin 1551 -> 0 bytes
sprites3/rarrow.png | Bin 1620 -> 0 bytes
sprites3/red_bookshelf.png | Bin 3931 -> 0 bytes
sprites3/rope.png | Bin 1965 -> 0 bytes
sprites3/teeth.png | Bin 2032 -> 0 bytes
sprites3/transparent.png | Bin 3337 -> 0 bytes
sprites3/turbine.png | Bin 2911 -> 0 bytes
sprites3/turbine_bottomleft.png | Bin 4333 -> 0 bytes
sprites3/turbine_bottomright.png | Bin 4307 -> 0 bytes
sprites3/turbine_topleft.png | Bin 4377 -> 0 bytes
sprites3/turbine_topright.png | Bin 4281 -> 0 bytes
sprites3/wood.png | Bin 4477 -> 0 bytes
sprites3/workshop_desk_bottom.png | Bin 3262 -> 0 bytes
sprites3/workshop_desk_top.png | Bin 3953 -> 0 bytes
sprites3/workshop_key.png | Bin 1512 -> 0 bytes
64 files changed, 0 insertions(+), 0 deletions(-)
commit cb1a9e2dce12b1a3824e7a1edf5846e081a6bb65
Merge: d5de326 5c22bc4
Author: HeatherZheng <[email protected]>
Date: Tue May 15 14:44:20 2018 -0400
add script for cutscene
commit cb6923d1d2781ace4bc106413ec4a265968ad558
Author: Anneliese Lu <[email protected]>
Date: Tue May 15 14:39:25 2018 -0400
id changes
init.ml | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
commit 5c22bc43967bd9f6779687b572ddcf72c67d4b7e
Author: Anneliese Lu <[email protected]>
Date: Tue May 15 14:38:38 2018 -0400
id changes
fake.txt | 0
in.txt | 1 -
init.ml | 64 ++++++++++-----------
one_log.json | 9 ---
out.txt | 0
sprites/opening.png | Bin 1263821 -> 1161559 bytes
sprites2/{exit_closed.png => exit/closed.png} | Bin
sprites2/{exit_open.png => exit/open.png} | Bin
sprites2/{gear/gear_1_down.png => gear_1/down.png} | Bin
sprites2/{gear/gear_1_left.png => gear_1/left.png} | Bin
.../{gear/gear_1_right.png => gear_1/right.png} | Bin
sprites2/{gear/gear_1_up.png => gear_1/up.png} | Bin
sprites2/{gear/gear_2_down.png => gear_2/down.png} | Bin
sprites2/{gear/gear_2_left.png => gear_2/left.png} | Bin
.../{gear/gear_2_right.png => gear_2/right.png} | Bin
sprites2/{gear/gear_2_up.png => gear_2/up.png} | Bin
sprites2/{gear/gear_3_down.png => gear_3/down.png} | Bin
sprites2/{gear/gear_3_left.png => gear_3/left.png} | Bin
.../{gear/gear_3_right.png => gear_3/right.png} | Bin
sprites2/{gear/gear_3_up.png => gear_3/up.png} | Bin
sprites2/{gear/gear_4_down.png => gear_4/down.png} | Bin
sprites2/{gear/gear_4_left.png => gear_4/left.png} | Bin
.../{gear/gear_4_right.png => gear_4/right.png} | Bin
sprites2/{gear/gear_4_up.png => gear_4/up.png} | Bin
sprites2/{gear/gear_5_down.png => gear_5/down.png} | Bin
sprites2/{gear/gear_5_left.png => gear_5/left.png} | Bin
.../{gear/gear_5_right.png => gear_5/right.png} | Bin
sprites2/{gear/gear_5_up.png => gear_5/up.png} | Bin
sprites2/{gear/gear_6_down.png => gear_6/down.png} | Bin
sprites2/{gear/gear_6_left.png => gear_6/left.png} | Bin
.../{gear/gear_6_right.png => gear_6/right.png} | Bin
sprites2/{gear/gear_6_up.png => gear_6/up.png} | Bin
sprites2/{gear/gear_7_down.png => gear_7/down.png} | Bin
sprites2/{gear/gear_7_left.png => gear_7/left.png} | Bin
.../{gear/gear_7_right.png => gear_7/right.png} | Bin
sprites2/{gear/gear_7_up.png => gear_7/up.png} | Bin
sprites2/{gear/gear_8_down.png => gear_8/down.png} | Bin
sprites2/{gear/gear_8_left.png => gear_8/left.png} | Bin
.../{gear/gear_8_right.png => gear_8/right.png} | Bin
sprites2/{gear/gear_8_up.png => gear_8/up.png} | Bin
sprites2/gear_a/down.png | Bin 0 -> 3564 bytes
sprites2/gear_a/left.png | Bin 0 -> 3729 bytes
sprites2/gear_a/right.png | Bin 0 -> 3804 bytes
sprites2/gear_a/up.png | Bin 0 -> 3458 bytes
sprites2/gear_d/down.png | Bin 0 -> 4146 bytes
sprites2/gear_d/left.png | Bin 0 -> 4224 bytes
sprites2/gear_d/right.png | Bin 0 -> 4056 bytes
sprites2/gear_d/up.png | Bin 0 -> 4038 bytes
48 files changed, 32 insertions(+), 42 deletions(-)
commit d5de32608a44af21c2eed4bfdcd4fd153222ea5b
Author: HeatherZheng <[email protected]>
Date: Tue May 15 14:38:36 2018 -0400
add script for cutscene
init.ml | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 44 insertions(+), 3 deletions(-)
commit 87805b87988a182cdb2d5216e364ead63343b58c
Author: Anneliese Lu <[email protected]>
Date: Tue May 15 14:14:26 2018 -0400
gear 3 * 3
init.ml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit b05a5d1fe616f401484934a9757c06edaccc49aa
Merge: cae19f2 37e9e5a
Author: Anneliese Lu <[email protected]>
Date: Tue May 15 14:13:32 2018 -0400
Merge branch 'master' of https://github.com/yilin-lu/2Escape
commit cae19f2331ae3ba267978483f0c730f68e419be1
Author: Anneliese Lu <[email protected]>
Date: Tue May 15 14:13:21 2018 -0400
gear 3 * 3
init.ml | 50 ++++++++++++++++++++---------------------
sprites2/gear/gear_1_down.png | Bin 0 -> 2603 bytes
sprites2/gear/gear_1_left.png | Bin 0 -> 2549 bytes
sprites2/gear/gear_1_right.png | Bin 0 -> 2600 bytes
sprites2/gear/gear_1_up.png | Bin 0 -> 2264 bytes
sprites2/gear/gear_2_down.png | Bin 0 -> 3255 bytes
sprites2/gear/gear_2_left.png | Bin 0 -> 3482 bytes
sprites2/gear/gear_2_right.png | Bin 0 -> 3542 bytes
sprites2/gear/gear_2_up.png | Bin 0 -> 3081 bytes
sprites2/gear/gear_3_down.png | Bin 0 -> 2514 bytes
sprites2/gear/gear_3_left.png | Bin 0 -> 2621 bytes
sprites2/gear/gear_3_right.png | Bin 0 -> 2670 bytes
sprites2/gear/gear_3_up.png | Bin 0 -> 2591 bytes
sprites2/gear/gear_4_down.png | Bin 0 -> 3524 bytes
sprites2/gear/gear_4_left.png | Bin 0 -> 3343 bytes
sprites2/gear/gear_4_right.png | Bin 0 -> 3339 bytes
sprites2/gear/gear_4_up.png | Bin 0 -> 3593 bytes
sprites2/gear/gear_5_down.png | Bin 0 -> 2501 bytes
sprites2/gear/gear_5_left.png | Bin 0 -> 2652 bytes
sprites2/gear/gear_5_right.png | Bin 0 -> 2590 bytes
sprites2/gear/gear_5_up.png | Bin 0 -> 2498 bytes
sprites2/gear/gear_6_down.png | Bin 0 -> 3461 bytes
sprites2/gear/gear_6_left.png | Bin 0 -> 3698 bytes
sprites2/gear/gear_6_right.png | Bin 0 -> 3634 bytes
sprites2/gear/gear_6_up.png | Bin 0 -> 3266 bytes
sprites2/gear/gear_7_down.png | Bin 0 -> 2591 bytes
sprites2/gear/gear_7_left.png | Bin 0 -> 2670 bytes
sprites2/gear/gear_7_right.png | Bin 0 -> 2621 bytes
sprites2/gear/gear_7_up.png | Bin 0 -> 2364 bytes
sprites2/gear/gear_8_down.png | Bin 0 -> 3593 bytes
sprites2/gear/gear_8_left.png | Bin 0 -> 3339 bytes
sprites2/gear/gear_8_right.png | Bin 0 -> 3343 bytes
sprites2/gear/gear_8_up.png | Bin 0 -> 3374 bytes
33 files changed, 25 insertions(+), 25 deletions(-)
commit 37e9e5aec4a248f666cc64776689c85a1cee0e2e
Author: Aaron Lou <[email protected]>
Date: Tue May 15 14:12:32 2018 -0400
State bugfixes
Gui.ml | 2 +-
sprites/invempty.png | Bin 0 -> 1139 bytes
sprites/larrow.png | Bin 0 -> 1596 bytes
sprites/rarrow.png | Bin 0 -> 1620 bytes
state.ml | 30 +++++++++++++++++-------------
5 files changed, 18 insertions(+), 14 deletions(-)
commit eba31ed5a648839a5716280d711b2ed7fc38b421
Merge: 8840ecb e2847ca
Author: Aaron Lou <[email protected]>
Date: Tue May 15 13:41:57 2018 -0400
Merge branch 'master' of https://github.com/yilin-lu/2Escape
commit e2847ca124f32b3e96a4c08be37310be198f08c3
Author: Anneliese Lu <[email protected]>
Date: Tue May 15 13:41:14 2018 -0400
blank
sprites2/blank.png | Bin 0 -> 1139 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
commit 8840ecbdde59c423cac081578d173c921843c70d
Merge: 0e12e74 85d8531
Author: Aaron Lou <[email protected]>
Date: Tue May 15 13:38:27 2018 -0400
Merge branch 'master' of https://github.com/yilin-lu/2Escape
commit 0e12e740909a2eac52826ff3747c815462df3187
Author: Aaron Lou <[email protected]>
Date: Tue May 15 13:38:25 2018 -0400
Add
init.ml | 70 ++++++++++++++++++++++-----------------------
parser_tests.ml | 5 ++++
server.js | 1 +
server.ml | 2 +-
sprites/a.png | Bin 0 -> 5667 bytes
sprites/b.png | Bin 0 -> 5587 bytes
sprites/b_key.png | Bin 0 -> 2628 bytes
sprites/book.png | Bin 6792 -> 4385 bytes
sprites/c.png | Bin 0 -> 5294 bytes
sprites/c_key.png | Bin 0 -> 2211 bytes
sprites/clocktower_key.png | Bin 5867 -> 2817 bytes
sprites/d.png | Bin 0 -> 5504 bytes
sprites/e.png | Bin 0 -> 5493 bytes
sprites/e_key.png | Bin 0 -> 2332 bytes
sprites/exit_closed.png | Bin 0 -> 341 bytes
sprites/exit_open.png | Bin 0 -> 642 bytes
sprites/handler.png | Bin 0 -> 3544 bytes
sprites/ladder.png | Bin 5129 -> 3887 bytes
sprites/player1_back.png | Bin 5415 -> 0 bytes
sprites/player1_front.png | Bin 5727 -> 0 bytes
sprites/player1_left.png | Bin 5742 -> 0 bytes
sprites/player1_right.png | Bin 5702 -> 0 bytes
sprites/player2_back.png | Bin 5555 -> 0 bytes
sprites/player2_front.png | Bin 5774 -> 0 bytes
sprites/player2_left.png | Bin 5797 -> 0 bytes
sprites/player2_right.png | Bin 5732 -> 0 bytes
sprites/rope.png | Bin 5960 -> 3710 bytes
sprites/steel.png | Bin 0 -> 4955 bytes
sprites/stick.png | Bin 0 -> 2723 bytes
sprites/workshop_key.png | Bin 6055 -> 2420 bytes
state.ml | 42 +++++++++++++++------------
31 files changed, 65 insertions(+), 55 deletions(-)
commit 85d853153df15b86527caf49c6b72b7457bb8757
Author: Anneliese Lu <[email protected]>
Date: Tue May 15 13:37:56 2018 -0400
some id fix
init.ml | 256 ++++++++++++++++++++++++++++++++--------------------------------
1 file changed, 128 insertions(+), 128 deletions(-)
commit 74b1835ee08dfcb589a2073afde5eef0b97581cc
Merge: ae7e0ab 7525e32
Author: Aaron Lou <[email protected]>
Date: Tue May 15 12:51:11 2018 -0400
Fixed
commit ae7e0abae7a0bfa8451ae5e9ee9087c2f45ff082
Author: Aaron Lou <[email protected]>
Date: Tue May 15 12:50:48 2018 -0400
Server cleaning
client.ml | 49 ------------------------
client.mli | 27 -------------
cutscene.mli | 20 ++++++++++
server.js | 14 +++++--
server.ml | 36 +++++++++++++++--
sprites/black.png | Bin
sprites/blue_bookshelf.png | Bin 3338 -> 4626 bytes
sprites/book.png | Bin 3890 -> 6792 bytes
sprites/clocktower_key.png | Bin 2435 -> 5867 bytes
sprites/debris.png | Bin 1504 -> 5883 bytes
sprites/desk_bottom.png | Bin 3936 -> 5835 bytes
sprites/desk_top.png | Bin 3122 -> 5590 bytes
{sprites2 => sprites}/floor.png | Bin
{sprites2 => sprites}/gear_a/gear_a_1_down.png | Bin
{sprites2 => sprites}/gear_a/gear_a_1_left.png | Bin
{sprites2 => sprites}/gear_a/gear_a_1_right.png | Bin
{sprites2 => sprites}/gear_a/gear_a_1_up.png | Bin
{sprites2 => sprites}/gear_a/gear_a_2_down.png | Bin
{sprites2 => sprites}/gear_a/gear_a_2_left.png | Bin
{sprites2 => sprites}/gear_a/gear_a_2_right.png | Bin
{sprites2 => sprites}/gear_a/gear_a_2_up.png | Bin
{sprites2 => sprites}/gear_a/gear_a_3_down.png | Bin
{sprites2 => sprites}/gear_a/gear_a_3_left.png | Bin
{sprites2 => sprites}/gear_a/gear_a_3_right.png | Bin
{sprites2 => sprites}/gear_a/gear_a_3_up.png | Bin
{sprites2 => sprites}/gear_a/gear_a_4_down.png | Bin
{sprites2 => sprites}/gear_a/gear_a_4_left.png | Bin
{sprites2 => sprites}/gear_a/gear_a_4_right.png | Bin
{sprites2 => sprites}/gear_a/gear_a_4_up.png | Bin
sprites/gear_a_1.png | Bin 3458 -> 5470 bytes
{sprites2 => sprites}/gear_d/gear_d_1_down.png | Bin
{sprites2 => sprites}/gear_d/gear_d_1_left.png | Bin
{sprites2 => sprites}/gear_d/gear_d_1_right.png | Bin
{sprites2 => sprites}/gear_d/gear_d_1_up.png | Bin
{sprites2 => sprites}/gear_d/gear_d_2_down.png | Bin
{sprites2 => sprites}/gear_d/gear_d_2_left.png | Bin
{sprites2 => sprites}/gear_d/gear_d_2_right.png | Bin
{sprites2 => sprites}/gear_d/gear_d_2_up.png | Bin
{sprites2 => sprites}/gear_d/gear_d_3_down.png | Bin
{sprites2 => sprites}/gear_d/gear_d_3_left.png | Bin
{sprites2 => sprites}/gear_d/gear_d_3_right.png | Bin
{sprites2 => sprites}/gear_d/gear_d_3_up.png | Bin
{sprites2 => sprites}/gear_d/gear_d_4_down.png | Bin
{sprites2 => sprites}/gear_d/gear_d_4_left.png | Bin
{sprites2 => sprites}/gear_d/gear_d_4_right.png | Bin
{sprites2 => sprites}/gear_d/gear_d_4_up.png | Bin
{sprites2 => sprites}/hall_handler_key.png | Bin
{sprites2 => sprites}/handler_key.png | Bin
sprites/ladder.png | Bin 2897 -> 5129 bytes
sprites/opening.png | Bin 0 -> 1263821 bytes
{sprites2 => sprites}/player1_back.png | Bin
{sprites2 => sprites}/player1_front.png | Bin
{sprites2 => sprites}/player1_left.png | Bin
{sprites2 => sprites}/player1_right.png | Bin
{sprites2 => sprites}/player2_back.png | Bin
{sprites2 => sprites}/player2_front.png | Bin
{sprites2 => sprites}/player2_left.png | Bin
{sprites2 => sprites}/player2_right.png | Bin
sprites/red_bookshelf.png | Bin 3931 -> 5100 bytes
sprites/rope.png | Bin 1965 -> 5960 bytes
sprites/transparent.png | Bin
sprites/workshop_desk_bottom.png | Bin 3262 -> 5703 bytes
sprites/workshop_desk_top.png | Bin 3953 -> 5877 bytes
sprites/workshop_key.png | Bin 1512 -> 6055 bytes
sprites2/blue_bookshelf.png | Bin 4626 -> 0 bytes
sprites2/book.png | Bin 6792 -> 0 bytes
sprites2/clocktower_key.png | Bin 5867 -> 0 bytes
sprites2/debris.png | Bin 5883 -> 0 bytes
sprites2/desk_bottom.png | Bin 5835 -> 0 bytes
sprites2/desk_top.png | Bin 5590 -> 0 bytes
sprites2/gear_a_1.png | Bin 5470 -> 0 bytes
sprites2/ladder.png | Bin 5129 -> 0 bytes
sprites2/red_bookshelf.png | Bin 5100 -> 0 bytes
sprites2/rope.png | Bin 5960 -> 0 bytes
sprites2/workshop_desk_bottom.png | Bin 5703 -> 0 bytes
sprites2/workshop_desk_top.png | Bin 5877 -> 0 bytes
sprites2/workshop_key.png | Bin 6055 -> 0 bytes
{sprites2 => sprites3}/black.png | Bin
sprites3/blue_bookshelf.png | Bin 0 -> 3338 bytes
sprites3/book.png | Bin 0 -> 3890 bytes
sprites3/clocktower_key.png | Bin 0 -> 2435 bytes
sprites3/debris.png | Bin 0 -> 1504 bytes
sprites3/desk_bottom.png | Bin 0 -> 3936 bytes
sprites3/desk_top.png | Bin 0 -> 3122 bytes
sprites3/empty.png | Bin 0 -> 4991 bytes
sprites/gear_d_1.png => sprites3/gear_a_1.png | Bin
{sprites => sprites3}/gear_a_2.png | Bin
{sprites => sprites3}/gear_a_3.png | Bin
{sprites => sprites3}/gear_a_4.png | Bin
sprites3/gear_d_1.png | Bin 0 -> 3458 bytes
{sprites => sprites3}/gear_d_2.png | Bin
{sprites => sprites3}/gear_d_3.png | Bin
{sprites => sprites3}/gear_d_4.png | Bin
{sprites => sprites3}/hall_handler_key copy.png | Bin
{sprites => sprites3}/handler_key.jpg | Bin
{sprites => sprites3}/invempty.png | Bin
sprites3/ladder.png | Bin 0 -> 2897 bytes
{sprites => sprites3}/larrow.png | Bin
sprites3/opening.png | Bin 0 -> 1263821 bytes
sprites3/player1/down.png | Bin 0 -> 1638 bytes
sprites3/player1/left.png | Bin 0 -> 1651 bytes
sprites3/player1/right.png | Bin 0 -> 1635 bytes
sprites3/player1/up.png | Bin 0 -> 1439 bytes
sprites3/player2/down.png | Bin 0 -> 1847 bytes
sprites3/player2/left.png | Bin 0 -> 1874 bytes
sprites3/player2/right.png | Bin 0 -> 1881 bytes
sprites3/player2/up.png | Bin 0 -> 1551 bytes
{sprites => sprites3}/rarrow.png | Bin
sprites3/red_bookshelf.png | Bin 0 -> 3931 bytes
sprites3/rope.png | Bin 0 -> 1965 bytes
{sprites2 => sprites3}/teeth.png | Bin
{sprites2 => sprites3}/transparent.png | Bin
{sprites2 => sprites3}/turbine.png | Bin
{sprites2 => sprites3}/turbine_bottomleft.png | Bin
{sprites2 => sprites3}/turbine_bottomright.png | Bin
{sprites2 => sprites3}/turbine_topleft.png | Bin
{sprites2 => sprites3}/turbine_topright.png | Bin
{sprites2 => sprites3}/wood.png | Bin
sprites3/workshop_desk_bottom.png | Bin 0 -> 3262 bytes
sprites3/workshop_desk_top.png | Bin 0 -> 3953 bytes
sprites3/workshop_key.png | Bin 0 -> 1512 bytes
121 files changed, 62 insertions(+), 84 deletions(-)
commit 7525e32b6596edfae3d73eb2865617a02ea1fca0
Author: Anneliese Lu <[email protected]>
Date: Tue May 15 12:31:31 2018 -0400
transparent bg
sprites2/b_key.png | Bin 5513 -> 2628 bytes
sprites2/book.png | Bin 6792 -> 4385 bytes
sprites2/c_key.png | Bin 5192 -> 2211 bytes
sprites2/clocktower_key.png | Bin 5867 -> 2817 bytes
sprites2/e_key.png | Bin 5403 -> 2332 bytes
sprites2/hall_handler_key.png | Bin 6235 -> 2730 bytes
sprites2/handler.png | Bin 6709 -> 3544 bytes
sprites2/handler_key.png | Bin 6112 -> 2903 bytes
sprites2/ladder.png | Bin 5129 -> 3887 bytes
sprites2/rope.png | Bin 5960 -> 3710 bytes
sprites2/steel.png | Bin 6356 -> 4955 bytes
sprites2/stick.png | Bin 6272 -> 2723 bytes
sprites2/turbine.png | Bin 4307 -> 2911 bytes
sprites2/workshop_key.png | Bin 6055 -> 2420 bytes
14 files changed, 0 insertions(+), 0 deletions(-)
commit 946c956679e4690921282c28a3798dfa8b109dca
Author: Anneliese Lu <[email protected]>
Date: Tue May 15 12:00:14 2018 -0400
more img
sprites2/exit_closed.png | Bin 0 -> 341 bytes
sprites2/exit_open.png | Bin 0 -> 642 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
commit 8fe15a916e52eea9a75e57224539ab4b42b864e8
Merge: 26e16bd fc84cf0
Author: Anneliese Lu <[email protected]>
Date: Tue May 15 11:56:35 2018 -0400
Merge branch 'master' of https://github.com/yilin-lu/2Escape
commit 26e16bdef6e47d33d0a9e760027788c4dbf79f7b
Author: Anneliese Lu <[email protected]>
Date: Tue May 15 11:56:23 2018 -0400
more img
init.ml | 12 ++++++------
sprites2/a.png | Bin 0 -> 5667 bytes
sprites2/b.png | Bin 0 -> 5587 bytes
sprites2/b_key.png | Bin 0 -> 5513 bytes
sprites2/c.png | Bin 0 -> 5294 bytes
sprites2/c_key.png | Bin 0 -> 5192 bytes
sprites2/d.png | Bin 0 -> 5504 bytes
sprites2/e.png | Bin 0 -> 5493 bytes
sprites2/e_key.png | Bin 0 -> 5403 bytes
sprites2/handler.png | Bin 0 -> 6709 bytes
sprites2/steel.png | Bin 0 -> 6356 bytes
sprites2/stick.png | Bin 0 -> 6272 bytes
12 files changed, 6 insertions(+), 6 deletions(-)
commit fc84cf060c5fc72094f0196c826fc3e190e27e51
Author: Aaron Lou <[email protected]>
Date: Tue May 15 11:36:28 2018 -0400
Gitignore
.gitignore | 1 +
GUI.ml | 463 -------
GUITesting/_build/_digests | 6 -
GUITesting/_build/_log | 12 -
GUITesting/_build/myocamlbuild | Bin 2446820 -> 0 bytes
GUITesting/_build/myocamlbuild.cmi | Bin 602 -> 0 bytes
GUITesting/_build/myocamlbuild.cmx | Bin 627 -> 0 bytes
GUITesting/_build/myocamlbuild.ml | 1 -
GUITesting/_build/myocamlbuild.o | Bin 1504 -> 0 bytes
GUITesting/_build/ocamlc.where | 1 -
GUITesting/_build/test.cmi | Bin 1290 -> 0 bytes
GUITesting/_build/test.cmo | Bin 7783 -> 0 bytes
GUITesting/_build/test.d.byte | Bin 7556612 -> 0 bytes
GUITesting/_build/test.d.cmi | Bin 1290 -> 0 bytes
GUITesting/_build/test.d.cmo | Bin 379212 -> 0 bytes
GUITesting/_build/test.d.js | 861 ------------
GUITesting/_build/test.ml | 82 --
GUITesting/_build/test.ml.depends | 1 -
GUITesting/_tags | 3 -
_build/Gui.ml => Gui.ml | 0
_build/Gui.cmi | Bin 13734 -> 0 bytes
_build/Gui.cmo | Bin 29325 -> 0 bytes
_build/Gui.d.byte | Bin 11002990 -> 0 bytes
_build/Gui.d.cmi | Bin 13734 -> 0 bytes
_build/Gui.d.cmo | Bin 1231022 -> 0 bytes
_build/Gui.d.js | 2617 ------------------------------------
_build/Gui.ml.depends | 1 -
_build/_digests | 38 -
_build/_log | 18 -
_build/cutscene.cmi | Bin 779 -> 0 bytes
_build/cutscene.cmo | Bin 511 -> 0 bytes
_build/cutscene.d.cmo | Bin 3227 -> 0 bytes
_build/cutscene.ml | 13 -
_build/cutscene.ml.depends | 1 -
_build/cutscene.mli | 10 -
_build/cutscene.mli.depends | 1 -
_build/helper.cmi | Bin 824 -> 0 bytes
_build/helper.cmo | Bin 680 -> 0 bytes
_build/helper.d.cmi | Bin 824 -> 0 bytes
_build/helper.d.cmo | Bin 5218 -> 0 bytes
_build/helper.ml | 53 -
_build/helper.ml.depends | 1 -
_build/init.cmi | Bin 5226 -> 0 bytes
_build/init.cmo | Bin 29812 -> 0 bytes
_build/init.ml | 687 ----------
_build/init.ml.depends | 1 -
_build/json_parser.cmi | Bin 1780 -> 0 bytes
_build/json_parser.cmo | Bin 16318 -> 0 bytes
_build/json_parser.d.cmo | Bin 66398 -> 0 bytes
_build/json_parser.ml | 341 -----
_build/json_parser.ml.depends | 1 -
_build/json_parser.mli | 23 -
_build/json_parser.mli.depends | 1 -
_build/myocamlbuild | Bin 2446820 -> 0 bytes
_build/myocamlbuild.cmi | Bin 602 -> 0 bytes
_build/myocamlbuild.cmx | Bin 627 -> 0 bytes
_build/myocamlbuild.ml | 1 -
_build/myocamlbuild.o | Bin 1504 -> 0 bytes
_build/ocamlc.where | 1 -
_build/server.byte | Bin 538128 -> 0 bytes
_build/server.cmi | Bin 1647 -> 0 bytes
_build/server.cmo | Bin 2532 -> 0 bytes