-
Notifications
You must be signed in to change notification settings - Fork 11
/
uhishdiuhsfuhisduhf
2321 lines (1565 loc) · 76.8 KB
/
uhishdiuhsfuhisduhf
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
[33mcommit cb8eab0f001683fa1d39b9628f1d50e23228b665[m
Merge: f380892 878a7fd
Author: aktersnurra95 <[email protected]>
Date: Sun Feb 26 02:18:50 2017 +0100
Resolved merge issue.
[33mcommit f380892ffd98ece9665db0676729860caef70811[m
Author: aktersnurra95 <[email protected]>
Date: Sun Feb 26 02:16:40 2017 +0100
Added vertical behaivior for bigbadbird to pursue player.
[33mcommit 878a7fd791f7fea543d3f7371356512daf7f0df7[m
Author: Felix Eder <[email protected]>
Date: Sun Feb 26 02:07:19 2017 +0100
Added some initialfreeze timing for enemies
[33mcommit d5e354a3a9acdafaf18d090b35ca24f722286cc4[m
Author: aktersnurra95 <[email protected]>
Date: Sun Feb 26 01:38:52 2017 +0100
Fixed a bunch of issues with bigbadbird.
[33mcommit 4654c854b56da1141f7c211cf8cb5477509a6c81[m
Author: aktersnurra95 <[email protected]>
Date: Sun Feb 26 00:01:05 2017 +0100
Fixed issue with lasershooter when not hitting anything. Fixed bossactivator trigger.
[33mcommit 9d09e40b15ed7d81764bcafd0d6987b716df9381[m
Author: aktersnurra95 <[email protected]>
Date: Sat Feb 25 23:11:51 2017 +0100
Added improved sprites for nature enviroment and added to test scene.
[33mcommit b255ecd8a6b18251edab73de7e7be5e7127541d6[m
Author: aktersnurra95 <[email protected]>
Date: Sat Feb 25 20:57:13 2017 +0100
Added a few tool scripts in editor to simplify some tasks
[33mcommit 200b77c6a9ef891ce6a52890aa88b82c8dae68a7[m
Author: aktersnurra95 <[email protected]>
Date: Sat Feb 25 00:41:02 2017 +0100
Fixed some minor issues with gameover and victory screen controls. Made birdboss into prefab and added a camera adjust to the battle.
[33mcommit e40f7bda55741415d7dedd0c60be1f65060ebea7[m
Author: aktersnurra95 <[email protected]>
Date: Fri Feb 24 23:59:19 2017 +0100
Updated with success
[33mcommit 06804a422b60458614f1c46b52a9f119954d243b[m
Author: aktersnurra95 <[email protected]>
Date: Fri Feb 24 23:57:20 2017 +0100
Updated again.
[33mcommit ed321428e5f56cd12c3ff8d112a98b29a4d3e58d[m
Author: aktersnurra95 <[email protected]>
Date: Fri Feb 24 23:54:54 2017 +0100
Updated to unity 5.5.2 again after small issue with layers.
[33mcommit 2c46b2d02656a7b7f8ef650d99f9d5886156c9ae[m
Author: aktersnurra95 <[email protected]>
Date: Fri Feb 24 23:47:04 2017 +0100
Revert "UPDATED TO NEW UNITY VERSION"
This reverts commit d6ff9e5c7cbcb9fcc43f47a0eaff21bd72abedb8.
[33mcommit d6ff9e5c7cbcb9fcc43f47a0eaff21bd72abedb8[m
Author: Sendan <[email protected]>
Date: Fri Feb 24 21:22:07 2017 +0100
UPDATED TO NEW UNITY VERSION
[33mcommit a1756bd9be9bf5aa73e018b094afa2d8e39d9279[m
Author: aktersnurra95 <[email protected]>
Date: Mon Feb 20 16:46:30 2017 +0100
Added new temp background for courtyard. Added new focus feature for camera to focus towards a chosen gameobject. Also changed branch sprites to array in script.
[33mcommit f7bfbcebca3420920cb7286a489da6bddecc2bad[m
Author: Felix Eder <[email protected]>
Date: Mon Feb 20 12:32:02 2017 +0100
Update Lore corner.md
[33mcommit 9cdf65662bb81d548c5cfb55c6349105d9c84fd4[m
Merge: 6f6b526 bc038ec
Author: Felix Eder <[email protected]>
Date: Mon Feb 20 00:54:21 2017 +0100
Merge branch 'master' of https://github.com/FelixEder/RetroFutureGame
[33mcommit 6f6b526b0d7b0f6ae2acbf036c11fd8d47f75fb4[m
Author: Felix Eder <[email protected]>
Date: Mon Feb 20 00:52:33 2017 +0100
Added background parallax script and a temp background.
[33mcommit bc038eccfed57858c2f712be2f99dfae9bc13f5a[m
Author: felixed <[email protected]>
Date: Mon Feb 20 00:36:02 2017 +0100
Added a new lore corner text where I wrote some lore
[33mcommit 1f7b0a93eb0cd8b97be7dc4207202baafcb478fb[m
Author: Felix Eder <[email protected]>
Date: Sun Feb 19 23:09:49 2017 +0100
Added some new sprites for enviroment. Made items not collide with enemies unless trown.
[33mcommit 6e483406fd4f37b86eadf2d454f432d335071d68[m
Author: aktersnurra95 <[email protected]>
Date: Fri Feb 17 00:44:09 2017 +0100
Added new spritesheet for electrohaz and converted script to use animation instead of sprites. Added new sprite for spikesfromGoogle.
[33mcommit 6bc473edba75898916e72b429e8bfb98e580a613[m
Author: aktersnurra95 <[email protected]>
Date: Thu Feb 16 21:39:54 2017 +0100
Made pickup trigger function primarily the same way as punch trigger but is only enabled for one frame and can only pickup one item.
[33mcommit 9935443587d715f083f294d0401d3a28a35e2876[m
Author: aktersnurra95 <[email protected]>
Date: Thu Feb 16 18:37:15 2017 +0100
Added degrading sprite for branch and implemented code to swap sprite when damaged.
[33mcommit 39414ae63769c6717a91aed2bbd4ce1ebe0c9cad[m
Author: aktersnurra95 <[email protected]>
Date: Tue Feb 14 20:20:38 2017 +0100
Added animation to blob/smallcritter and jumpingcritter. Changed sprite for rock to match pixel/unit ratio and updated its hitbox. Added ability to increase max health and energy via debug script and fixed debug script to work with new megapunch. Also fixed said issue for upgrade script.
[33mcommit 0d0f5d7444e38296675ef640fd7129f1f873f8e1[m
Author: aktersnurra95 <[email protected]>
Date: Tue Feb 14 18:00:32 2017 +0100
Converted megapunch to use same logics as regular punch and implemented it into punch script.
[33mcommit 5ead8bbd9694a3d231517ac78cdc34481f6335be[m
Author: aktersnurra95 <[email protected]>
Date: Tue Feb 14 15:45:32 2017 +0100
Improved punch script even more, works better than ever. Fixed a few bugs with pickupable items and punching.
[33mcommit e1ab02f67c5adda883544334406544ee15558be3[m
Author: aktersnurra95 <[email protected]>
Date: Mon Feb 13 01:35:57 2017 +0100
Reworked punch logic/script to make it more reliable. Changed how game calculates damage on branch to not break instantly with new logic. Added function to change punch trigger size/offset when punching with different item. Added a visual presentation to punch area.
[33mcommit dd849fc51e723dd1ae406c5fecd5140fecd1b90d[m
Merge: aedb662 2920f76
Author: aktersnurra95 <[email protected]>
Date: Sun Feb 12 22:52:41 2017 +0100
Merge branch 'master' of https://github.com/FelixEder/RetroFutureGame
[33mcommit aedb662f32f1efd9a8dc3b1987f984374e151c59[m
Author: aktersnurra95 <[email protected]>
Date: Sun Feb 12 22:52:35 2017 +0100
Some very minor changes to a few prefabs
[33mcommit 2920f7608f6994da70d05020b10e62acb57f09f1[m
Author: Felix Eder <[email protected]>
Date: Sun Feb 12 22:51:54 2017 +0100
Missed to add the statue boss prefab, will be done now
[33mcommit e93e54dd45dcab0e9f18ca75d7ba4521db4015a3[m
Author: Felix Eder <[email protected]>
Date: Sun Feb 12 01:58:05 2017 +0100
Missed a save from a code
[33mcommit 42f2754b07e091c5f33b30eabbab8b821ef1ad52[m
Author: Felix Eder <[email protected]>
Date: Sun Feb 12 01:17:06 2017 +0100
Fixed the prefab spawners for drops and items
[33mcommit dd23e3d113b1ce93ef288ac3eb2a55004c1d1986[m
Author: Felix Eder <[email protected]>
Date: Sun Feb 12 00:33:15 2017 +0100
Fixed how the bosses are supposed to respawn
[33mcommit dba2831291ebcfe4a4318a3c7cea558ffe8020d0[m
Author: Felix Eder <[email protected]>
Date: Sat Feb 11 23:42:38 2017 +0100
Checkpoints now only activate one time
[33mcommit c23107574f30fee042803476c1293d5b1e0cbac5[m
Author: Felix Eder <[email protected]>
Date: Sat Feb 11 23:25:12 2017 +0100
Fixed invulnerablility for all enemies
[33mcommit 009ef48c679b5fa092cd21cef07db10950954c4b[m
Author: Felix Eder <[email protected]>
Date: Sat Feb 11 23:16:46 2017 +0100
Fixed mega punch ability, it now works as intended
[33mcommit 7183669ab76434f4b08ed13624405f5b8b966214[m
Author: Felix Eder <[email protected]>
Date: Sat Feb 11 22:23:49 2017 +0100
Fixed hard enemy rush bug
[33mcommit d8c77d9ebc591fb2aa19e1f37fd3f264ec17de14[m
Author: Felix Eder <[email protected]>
Date: Sat Feb 11 22:05:13 2017 +0100
Fixed PIS and changed items in game to only be spawned by PIS
[33mcommit 93c5f99762975875794be5ac7c7578c42736a4d7[m
Author: Felix Eder <[email protected]>
Date: Sun Jan 29 00:14:03 2017 +0100
Adding missed files
[33mcommit ecba4a053c655ac1f859eccd7eb744a1cf1e5ebd[m
Author: Felix Eder <[email protected]>
Date: Sun Jan 29 00:13:32 2017 +0100
Implemented the electric hazard, work well
[33mcommit af9bccf29aff9cfb3f7b6c3b0d99f21816983458[m
Merge: abbf4e5 a2cda0e
Author: Felix Eder <[email protected]>
Date: Sat Jan 28 23:23:30 2017 +0100
Merge branch 'master' of https://github.com/FelixEder/RetroFutureGame
[33mcommit abbf4e5632b7924cd13f5d6dd4ae2d3972359cc2[m
Author: Felix Eder <[email protected]>
Date: Sat Jan 28 23:23:25 2017 +0100
Added a very basic victoryscreen and a way to activate it as well as a temporary credit scene.
[33mcommit a2cda0ea8c49755c6077ee4481e5245ad7b12ce3[m
Merge: f569252 04d0e0d
Author: felixed <[email protected]>
Date: Sat Jan 28 23:15:34 2017 +0100
ggit Merge branch 'master' of github.com:FelixEder/RetroFutureGame
[33mcommit f56925219a7b37064af5693c1cd49a1e5a285722[m
Author: felixed <[email protected]>
Date: Sat Jan 28 23:14:26 2017 +0100
Added script for electrohazard
[33mcommit 04d0e0d1560e521505a5290d3f9fa6baff674e3d[m
Merge: e00937b 686ea29
Author: Felix Eder <[email protected]>
Date: Sat Jan 28 22:16:40 2017 +0100
Merge branch 'master' of https://github.com/FelixEder/RetroFutureGame
[33mcommit e00937bf51a5b0f90c9100dd7c1acc4523b74131[m
Author: Felix Eder <[email protected]>
Date: Sat Jan 28 22:15:19 2017 +0100
Added a new mode for prefabspawners to only respawn enemies after game over. Fixed a small visual bug where enemies z-collided and looked transparent.
[33mcommit 686ea29a6be5408267b40a143ad8d79b160b9da2[m
Author: felixed <[email protected]>
Date: Sat Jan 28 21:42:00 2017 +0100
Added initial ElectroHaz code
[33mcommit fba6e9f7667ed8e0d740f78d2da7628f2e7dae38[m
Author: aktersnurra95 <[email protected]>
Date: Sat Dec 10 18:38:52 2016 +0100
Added some sound event changes, maximize energy after respawn.
[33mcommit 6810374f8478165c61883dafa6610c240796d09b[m
Author: aktersnurra95 <[email protected]>
Date: Sat Dec 10 16:28:39 2016 +0100
update to unity 5.5.0 again since last time did not work
[33mcommit d79ec371a2c8a0675747457906b6e4b398cb2c2d[m
Author: aktersnurra95 <[email protected]>
Date: Sat Dec 10 15:52:41 2016 +0100
Pulled latest repository and updated to unity 5.5.0
[33mcommit 9d65355e8dab758b745cd8a737dd8fb87e678112[m
Author: Felix Eder <[email protected]>
Date: Sat Nov 12 13:45:22 2016 +0100
Added the same thang for Speed upgrades
[33mcommit bcb19d4df4266c9457664671f2abd99f425a0bea[m
Author: Felix Eder <[email protected]>
Date: Sat Nov 12 13:34:41 2016 +0100
Added a counter for upgrades
[33mcommit d71dcc343205c29c5904fe9a37993d4a8f9eca5e[m
Author: Felix Eder <[email protected]>
Date: Sat Nov 12 01:37:22 2016 +0100
Added Spikes from Google to the game
[33mcommit 8a873766b971948f48e65086b32db79fabea5704[m
Author: Viktor <[email protected]>
Date: Sat Nov 12 00:27:37 2016 +0100
Added knockback to SpikesFromGoogle
[33mcommit 1e6acdbd286ca06bc225c4fe70693f6d87f50ee6[m
Author: Felix Eder <[email protected]>
Date: Sat Nov 12 00:29:32 2016 +0100
Wrote script that determines how the enemies should act during their childlike experiences
[33mcommit d79cc58e2971b44f6ad7cec9a72f55fe1e0dcfd9[m
Author: Felix Eder <[email protected]>
Date: Sat Nov 12 00:04:04 2016 +0100
Added kill script for prefabspawner to kill all children on command, ex. on game reset after death.
[33mcommit 56ac1c6ed77302a5c14893f4f3eaf80f84c08874[m
Author: Felix Eder <[email protected]>
Date: Fri Nov 11 23:21:38 2016 +0100
Added game over screen UI and resume+main menu buttons to screen. Added scripts for respawn to checkpoint position and assigned to button.
[33mcommit 28c3efa784b48e90ac0d24542bd6533943944068[m
Author: Felix Eder <[email protected]>
Date: Mon Oct 24 16:37:26 2016 +0200
Started work on the game over screen
[33mcommit 14c52f9aee42af0d8ac6fa3f4e95976904993fe6[m
Author: Felix Eder <[email protected]>
Date: Wed Oct 19 15:57:51 2016 +0200
Reformed the checkpoints into prefabs in unity and placed out two of them
[33mcommit 9cc6a0f6b3fa8058a5f6d6dbf0bfe19e719952e3[m
Author: Felix Eder <[email protected]>
Date: Wed Oct 19 15:51:41 2016 +0200
Created the basic checkpoint script as well as unity object
[33mcommit b8f33af78f4f1011415429ffc2dfb241cf68cc13[m
Author: Felix Eder <[email protected]>
Date: Tue Oct 18 17:40:15 2016 +0200
Wrote the script and implemented the countdown in unity, works as it should
[33mcommit 9e768892df89db8ea56e0b6507be1c752991bd0c[m
Author: Felix Eder <[email protected]>
Date: Sun Sep 25 15:19:55 2016 +0200
Final boss drops are now also placed a bit more randomly
[33mcommit 24b069d7ff5592dd6efb3706442bd454b8d58861[m
Author: Felix Eder <[email protected]>
Date: Sun Sep 25 14:19:34 2016 +0200
The Itemprefabspawner now spawns items randomly within a set area
[33mcommit 0614bd379563dc17ac8fc0746aca970d829354b8[m
Author: Felix Eder <[email protected]>
Date: Sun Sep 25 13:38:39 2016 +0200
Solved the issue with the itemspawner, it now works as planned
[33mcommit 8caf17d38a87a44ca6b133457084db03eb5bb122[m
Author: Felix Eder <[email protected]>
Date: Sat Sep 24 18:24:49 2016 +0200
Removed the Invisible-system for PIS, replaced by a distance system that doesn't work at the moment
[33mcommit 9726b45000940ed7fae7b85412562b963db68c3d[m
Author: Felix Eder <[email protected]>
Date: Sat Sep 24 18:06:02 2016 +0200
Rewrote the spawner somewhat and does spawn as it should, the items don't self-destruct as planned however
[33mcommit 1c92956c9598246ea3488c4a4246e30bc6870bd5[m
Author: Felix Eder <[email protected]>
Date: Tue Aug 30 19:50:39 2016 +0200
Started work on the prefabspawner and it works pretty well, however, lost items need to be removed somehow
[33mcommit 9107df91c1a1c60df0b8d1d9159c52576b4c39da[m
Author: Felix Eder <[email protected]>
Date: Fri Aug 26 20:13:12 2016 +0200
Added dupe of earlygame for Emil to use for checkpoints.
[33mcommit 3f461211b6ed5c3d9a1209e5a899ecc77a6eba52[m
Author: Felix Eder <[email protected]>
Date: Fri Aug 26 20:06:55 2016 +0200
Added new tutorial/tooltip message system that works with most pickups and also with a trigger script. Assigned a case for jump and health.
[33mcommit 3e7241751b33f0bd7f4d9dbfa434f1eee5f8179d[m
Merge: de65e25 fd6db3e
Author: Felix Eder <[email protected]>
Date: Fri Aug 26 16:57:27 2016 +0200
reselved conflict in throw
[33mcommit de65e2545287452b811480bab447bf4b479e9d4e[m
Author: Felix Eder <[email protected]>
Date: Fri Aug 26 16:55:21 2016 +0200
Fixed final boss trow rocks on himself with new layers. Implemented deafeating boss stage spawns next stage.
[33mcommit fd6db3e041e44f961adbf0c4d5aed95e85373ad0[m
Author: felixed <[email protected]>
Date: Fri Aug 26 16:54:03 2016 +0200
Added limit for rocks and FB stands still while kickpunching
[33mcommit bb657ee875aedc5a04445dc4a09f5cca277b74b0[m
Author: felixed <[email protected]>
Date: Fri Aug 26 16:37:05 2016 +0200
Added a max number of spawned rocks for the final boss
[33mcommit 9bdc8da325ec76c891132f73055fe444f284cdd9[m
Author: Gustav <[email protected]>
Date: Wed Aug 24 18:59:09 2016 +0200
Changed pivot of branch to make player hold it by the end.
[33mcommit 4567acda8134342941f1e6941a7f6958d5861292[m
Merge: 57d2007 8406a13
Author: Gustav <[email protected]>
Date: Wed Aug 24 18:43:06 2016 +0200
resolved merge issue
[33mcommit 57d200742f8aaa0f433d8bbdb93c9dea40e1f139[m
Author: Gustav <[email protected]>
Date: Wed Aug 24 18:41:28 2016 +0200
Made held items sync position to the right hand (holdPosition gameobject).
[33mcommit 8406a132f68281f9392a33352199e0472ce59231[m
Author: Felix Eder <[email protected]>
Date: Wed Aug 24 18:36:00 2016 +0200
Completed work on stage 3, mostly
[33mcommit 1c44108516a138c08a2f78a58db59ef4f692f68f[m
Author: Felix Eder <[email protected]>
Date: Wed Aug 24 18:08:00 2016 +0200
Fixed issues with the final boss spitting
[33mcommit 60af87aa25f9775a68d6597a36a38ef0437eb3bd[m
Merge: 1367212 febdebb
Author: Felix Eder <[email protected]>
Date: Wed Aug 24 18:02:17 2016 +0200
Merge branch 'master' of https://github.com/FelixEder/RetroFutureGame
[33mcommit 1367212edce173b1cfad8fe2f5d02d0ef511ac60[m
Author: Felix Eder <[email protected]>
Date: Wed Aug 24 18:02:12 2016 +0200
Started boss spit work
[33mcommit febdebbcccc9ea5f6083e373dbca532a1fc7b649[m
Author: Gustav <[email protected]>
Date: Wed Aug 24 18:01:08 2016 +0200
Moved finalboss stage 3 eye outside the head collission. Changed victim.transform to collider since we dont want the parent gameobject but the gameobject itself. Added layer to platformcollission detection to remove surface detection from platform under-collider.
[33mcommit d14113a7f67d6b4a1ef649fa3e00f5d2bf94c92a[m
Author: Felix Eder <[email protected]>
Date: Wed Aug 24 17:29:20 2016 +0200
Started work on the laser shooter for the last boss
[33mcommit 5f635d8eb94d008d1820e12e39aaad78d60ac832[m
Merge: c14cb9c e1571c0
Author: Felix Eder <[email protected]>
Date: Wed Aug 24 16:44:58 2016 +0200
Fixed merge issuen
[33mcommit c14cb9c6f66915c0be1ffae46fe6ccb0fa6123d4[m
Author: Felix Eder <[email protected]>
Date: Wed Aug 24 16:43:43 2016 +0200
Started work on finalboss laser
[33mcommit e1571c00ae8c66fe7845fa370ceb22955ba962ae[m
Author: Gustav <[email protected]>
Date: Wed Aug 24 16:42:13 2016 +0200
Changed char sprites and animations, fixed timings of animations.
[33mcommit e8f12b21422a113ab3ce5c3e0954b1454a54526e[m
Author: Felix Eder <[email protected]>
Date: Wed Aug 24 16:17:51 2016 +0200
Head can now jump around
[33mcommit 0304c63c6edf124360fb65da60d5dcd8086bdd51[m
Author: Felix Eder <[email protected]>
Date: Wed Aug 24 14:34:42 2016 +0200
Started work on phase 3 of the boss, can now walk around and get mirrored
[33mcommit db14910d8eb54d9ad76b504557d7af67cb30082d[m
Author: Felix Eder <[email protected]>
Date: Tue Aug 23 20:35:10 2016 +0200
Completed first draft of code for phase2 of final boss
[33mcommit 774554725f05a7e1e7deef0500b3cb8ec0cfa7a3[m
Author: Felix Eder <[email protected]>
Date: Tue Aug 23 18:59:05 2016 +0200
Boss now charges you when you shoot the head
[33mcommit d156e2a0091b2936a84e81e5f2074bd0f76e2c11[m
Author: Felix Eder <[email protected]>
Date: Tue Aug 23 18:21:33 2016 +0200
Boss can now spit out enemies and open mouth on correct times
[33mcommit a49b79e8a8d6935f90e66554bd228a11ff6fc181[m
Author: Felix Eder <[email protected]>
Date: Mon Aug 22 21:02:51 2016 +0200
Continued work on phase 2, will now open mouth when being stunned
[33mcommit 898a5b99764bc281af0bc36c25a71946bac75384[m
Author: Felix Eder <[email protected]>
Date: Mon Aug 22 18:23:22 2016 +0200
Fixed the script for phase two so that it now moves and charges as wanted
[33mcommit fb470fb2582ebef91a9676316bb1a3ed9af672e7[m
Author: Gustav <[email protected]>
Date: Sat Aug 20 14:33:47 2016 +0200
Added a time stat to pause menu and a ugly clock symbol, also fixed a strange issue to pause menu buttons.
[33mcommit b44a1fe58e32d8242a2c39edba32c2205b861fad[m
Author: Felix Eder <[email protected]>
Date: Thu Aug 18 17:41:34 2016 +0200
Added the prefab spawner to the mouth
[33mcommit c1181bab20b5e2dcce6de4f5b6b1c596a1d3df12[m
Author: Felix Eder <[email protected]>
Date: Wed Aug 17 21:22:57 2016 +0200
Wrote the script for the head of phase 2
[33mcommit af9391670b6e8cb466943aa9bb2e0a9f0aeef482[m
Author: Felix Eder <[email protected]>
Date: Wed Aug 17 19:21:17 2016 +0200
Started some of the work in the FinalBoss hierarchy, but that could take some work
[33mcommit 7955b607a10dfad691eeb32ac6f54861ff6da723[m
Author: Felix Eder <[email protected]>
Date: Wed Aug 17 18:24:29 2016 +0200
Added movement to the second phase of the battle
[33mcommit 2cee3dbc62dc90e4d6f97b158f8fa25153f7fa17[m
Author: felixed <[email protected]>
Date: Sun Aug 14 18:49:18 2016 +0200
Continued work on Phase 2 of the final boss fight
[33mcommit 23b4afc53b1be196e8098db87c3e336e1288f9a9[m
Author: aktersnurra95 <[email protected]>
Date: Sun Aug 14 14:08:12 2016 +0200
Fixed character getting hit by laser if punchtrigger was hit. Fixed an issue with punch not hitting objects if standing still. Squashed a few other minor bugs.
[33mcommit d7058adcb71b40f9776aeb0fd8cd35238b91a126[m
Author: aktersnurra95 <[email protected]>
Date: Sun Aug 14 01:55:45 2016 +0200
Removed all spriter related scripts and sprites/animations. Drew a new temp character sprite collection and made animations in Unity. Added IK script and changed some lines to work when character is mirrored. Some small corrections to Debug menu.
[33mcommit cd5c7e92fb330297035e554a0b377c139b64afb1[m
Author: aktersnurra95 <[email protected]>
Date: Sun Aug 7 22:56:00 2016 +0200
removed ostereich-todo files
[33mcommit 90efd3d1e970f555e7e6cf3cbb725cf561991957[m
Author: aktersnurra95 <[email protected]>
Date: Sun Aug 7 22:52:44 2016 +0200
renamed music folder
[33mcommit 3e758f1edcc93923bfc07058f1262edd4c1ccbba[m
Author: aktersnurra95 <[email protected]>
Date: Sun Aug 7 22:49:00 2016 +0200
Added some music/sound and created a script for handling audio playing in certain locations with optional fade.
[33mcommit ac8cdfdf4956d53680ec8e72c5ae705f2af531b3[m
Author: aktersnurra95 <[email protected]>
Date: Sun Aug 7 14:48:40 2016 +0200
added a check for platforms to reduce fall speed when above a platform to stop player from falling through them. Changed rock and branch tag to unified pickupableitem tag and rewrote code to work around it.
[33mcommit 71207c815792a09889c5b518dfeda535cfb3d339[m
Author: aktersnurra95 <[email protected]>
Date: Sat Aug 6 19:33:10 2016 +0200
small changes to statueboss script and gameobjects. made pickupable items always return to orig rotation on pickup, set their orig parent to a var and sets their parent to the orig parent on drop. some stuff with camera
[33mcommit 0e0e7bab2d6a0ec4beb010e2ee64a1fedf5084e4[m
Author: Gustav <[email protected]>
Date: Fri Aug 5 20:13:12 2016 +0200
Fixed debugmenu to not change upgradestate on toggle update causing it to swap back and forth. Also added a small input disable for knockback to make sure the player gets knocked back.
[33mcommit 70f9e1439b56729da9b5760ee9b4a47742ce04bc[m
Author: Gustav <[email protected]>
Date: Fri Aug 5 00:39:11 2016 +0200
Converted all inputs to go through a universal input manager therefore adding the ability to disable ingame user inputs. Minor changes to the wall jump script
[33mcommit d6ea1769e80f62cf7529d4129c999776bf81951b[m
Author: Gustav <[email protected]>
Date: Thu Aug 4 20:10:12 2016 +0200
Fixed char knockback and renamed the cript, works if player is not moving as of yet since player movement will cancel it out. Added some art, not done yet. Cleaned up some scripts and fixed minor issues. Rewrote laser (boss) script a bit to calculate the laser on every frame, also now kills enemies (smallcritter only).
[33mcommit 919f91a82e88e85406907cb81daac2269f4d923d[m
Author: Gustav <[email protected]>
Date: Thu Aug 4 15:17:58 2016 +0200
Fixed some minor issues with positioning of the debug menu, also swapped typestring for highjump to secondjump.
[33mcommit c5b1d43da5b774065842257d06a85664431f82d7[m
Author: aktersnurra95 <[email protected]>
Date: Mon Aug 1 01:06:52 2016 +0200
Added a useful ingame debug menu for toggling abilities. Other minor changes
[33mcommit 3404947aeb5c75af62ced6275996cb113360e8f0[m
Merge: 308d5ac e7b0a13
Author: aktersnurra95 <[email protected]>
Date: Sun Jul 31 20:55:17 2016 +0200
solved merge issues
[33mcommit 308d5acf6a68285ff663de582cfb4e658c42fcdd[m
Author: aktersnurra95 <[email protected]>
Date: Sun Jul 31 20:53:19 2016 +0200
Added new character sprite/animation and configured to work with movement/jump scripts, also integraded wall jump to replenish second jump after. Some minor other changes
[33mcommit e7b0a13ecac7ac8fe8d56097a1a78b9b1447d3b2[m
Author: Felix Eder <[email protected]>
Date: Sun Jul 31 19:43:45 2016 +0200
Started work on the second phase of the game
[33mcommit d43d7f3c6a1f7b0078b35ba6d46f9bf6bb9c242a[m
Merge: 292cc03 8d0df3a
Author: Felix Eder <[email protected]>
Date: Sun Jul 31 19:24:00 2016 +0200
Merge branch 'master' of https://github.com/FelixEder/RetroFutureGame
[33mcommit 292cc03671ad1fcbc52c8455f98ee3aa536f748e[m
Author: Felix Eder <[email protected]>
Date: Sun Jul 31 19:23:41 2016 +0200
Drew the first sprites for the second and third state of the finla boss
[33mcommit 8d0df3a67a22dcde9645ff1aaa9b958b5a22e968[m
Author: Sendan <[email protected]>
Date: Sun Jul 31 18:30:34 2016 +0200
Added spikes from google
[33mcommit 32cf3e67ee374da2a8132e8fd0ef831325133840[m
Merge: 871eea2 8a82841
Author: Felix Eder <[email protected]>
Date: Sun Jul 31 18:19:40 2016 +0200
Fixed particulary vile merge conflict
[33mcommit 871eea294c04cb1844e3141c19e17fbd9110ddc4[m
Author: Felix Eder <[email protected]>
Date: Sun Jul 31 18:17:22 2016 +0200
First phase of the final boss is almost finished, a small snag needs to be fixed
[33mcommit 8a82841b817f2ea7c5aa74af1b6df6609b262930[m
Author: aktersnurra95 <[email protected]>
Date: Sun Jul 31 16:51:31 2016 +0200
changed highJump to secondJump for when in air.
[33mcommit 7d5d7c8a59c748a653603fbddf2c2016a6ec45b8[m
Author: aktersnurra95 <[email protected]>
Date: Sun Jul 31 16:20:22 2016 +0200
Fixed wall slide issue, added new air move calculation.
[33mcommit 7498c9a1dd233a29923598d57dc1cfa545973818[m
Merge: 9e974ac d86b392
Author: aktersnurra95 <[email protected]>
Date: Sun Jul 31 15:00:33 2016 +0200
commit merge confilc
[33mcommit 9e974ac44f645a481a3330040f92742a0d7ec1b1[m
Author: aktersnurra95 <[email protected]>
Date: Sun Jul 31 14:59:23 2016 +0200
added invulnerability method and state in charStatus, began conversion to or in switch statements
[33mcommit d86b392798366175fc67330a9a00c2043f7e8085[m
Author: Felix Eder <[email protected]>
Date: Sun Jul 31 14:30:22 2016 +0200
Started work on the last boss of the game
[33mcommit a79e1b56e4a20e746f02c141c112bcdd142c43ba[m
Author: Felix Eder <[email protected]>
Date: Sun Jul 31 00:59:31 2016 +0200
readded assets folder.
[33mcommit 397cd36d67359d34811a873c6eb93e6df5d989b7[m
Author: Felix Eder <[email protected]>
Date: Sun Jul 31 00:57:21 2016 +0200
removed assets folder dues to naming errors
[33mcommit d8f7f91336f38a9a8002e930de755a0b13834800[m
Merge: 28d8c9c 7f99489
Author: Felix Eder <[email protected]>
Date: Sun Jul 31 00:19:26 2016 +0200
Merge branch 'master' of https://github.com/FelixEder/RetroFutureGame
[33mcommit 28d8c9c993e8b033fee14b357fde602124a1ef51[m
Author: Felix Eder <[email protected]>
Date: Sun Jul 31 00:19:04 2016 +0200
fixed smallfry script and gameobject stuff.
[33mcommit 7f99489f246a70bcd4d0ffec33b80331ac3f74ab[m
Merge: fb4059c 169d9c6
Author: felixed <[email protected]>
Date: Sat Jul 30 23:32:56 2016 +0200
Merge branch 'master' of github.com:FelixEder/RetroFutureGame
[33mcommit fb4059c45d971a9b8f9b512d8b49077154c8d318[m
Author: felixed <[email protected]>
Date: Sat Jul 30 23:31:56 2016 +0200
Drew sprite for SmallFry upgrade
[33mcommit 169d9c6062088017f58a2104b0625f37baced0cb[m
Merge: 5352613 108045c
Author: Felix Eder <[email protected]>
Date: Sat Jul 30 23:19:25 2016 +0200
Merge branch 'master' of https://github.com/FelixEder/RetroFutureGame
[33mcommit 5352613a5102f91588030048bda95d73b3e13924[m
Author: Felix Eder <[email protected]>
Date: Sat Jul 30 23:19:06 2016 +0200
Added smooth transition to cameraAdjuster and respective variable. Did stuff.
[33mcommit 108045c28cf1d776d1bf5e52b1868db572f4cf43[m
Merge: 23e873b a31a499
Author: felixed <[email protected]>
Date: Sat Jul 30 23:13:13 2016 +0200
Fixed small MergeIssue in CharMegaPunch.cs
[33mcommit 23e873b3b0a432f12ff78b860e962582fa23d949[m
Author: felixed <[email protected]>
Date: Sat Jul 30 23:10:24 2016 +0200
Wrote the script for SmallFry powerup
[33mcommit a31a499b4506aaa4e12fba30d504c0633f81042a[m
Author: Felix Eder <[email protected]>
Date: Sat Jul 30 21:30:09 2016 +0200
Fixed issue with megaPunch while script deactivated, also fixed the reset of megapunch after a succesful punch.
[33mcommit 2ea3e56172314f55a860869dbf87017c8d0ca538[m
Author: Felix Eder <[email protected]>
Date: Sat Jul 30 18:33:29 2016 +0200
Worked on smaller things in the scene
[33mcommit b8149223b3ef3eaacffa40a974ad69682bc657ca[m
Author: Felix Eder <[email protected]>
Date: Sat Jul 30 17:32:08 2016 +0200
MegaPunchBarrier added to game
[33mcommit 024b1b72dc7469322e1d28988809cf4d5f86bf15[m
Author: Felix Eder <[email protected]>
Date: Sat Jul 30 17:10:54 2016 +0200
The HardCritter now works, also edited a lot of scripts so that they go by the correct tags
[33mcommit f17c64709fdbfed9da427956d5d85cd1f6ad48e1[m
Author: Felix Eder <[email protected]>
Date: Sat Jul 30 16:07:07 2016 +0200
The Mega Punch now works, as well as added a few new enemies
[33mcommit c861e05e070440303cb7a7ae5853d57d0786273b[m
Merge: f68e050 88c63e6
Author: Felix Eder <[email protected]>
Date: Sat Jul 30 14:32:34 2016 +0200
Fixed merge isseu
[33mcommit f68e050bd32c8fff62d7f745f6b8eb831bc7eadb[m
Author: Felix Eder <[email protected]>
Date: Sat Jul 30 14:25:09 2016 +0200
Small fixes
[33mcommit 88c63e67bb5c526bc95ac861ae481efc76417d27[m
Author: aktersnurra95 <[email protected]>
Date: Sat Jul 30 00:30:52 2016 +0200
Added plugin files for importing asset animations from Spriter. Implemented new camera features into earlygame. Added a timer after doors leaving view until they close again.
[33mcommit 4f211567e46e674e1881e00bbc19b56399f78e96[m
Merge: a7652d7 77f0d7a
Author: aktersnurra95 <[email protected]>
Date: Fri Jul 29 23:45:37 2016 +0200
Resolved merge issues
[33mcommit a7652d7d86348370f9e35935b4e566a6a79eb456[m
Author: aktersnurra95 <[email protected]>
Date: Fri Jul 29 23:16:24 2016 +0200
Added new smooth camera movement and dynamic positioning of the camera view, temporarily removed door-cover code
[33mcommit 77f0d7ae9a7e52651197e54a0eb1db5f6a5f0c9f[m
Author: Felix Eder <[email protected]>
Date: Fri Jul 29 17:42:55 2016 +0200
BirdBoss now works and spawns enemies correctly
[33mcommit edff17aa326e73b14837b29d70d36b4d84b579ed[m
Author: Felix Eder <[email protected]>
Date: Fri Jul 29 16:42:56 2016 +0200
The stomping enemies now work correctly
[33mcommit d2bae10e9bccc0acf7f099a49768f9fe83216bc5[m
Author: Felix Eder <[email protected]>
Date: Fri Jul 29 16:04:51 2016 +0200
BigEyeGuy now works and can be defeated
[33mcommit 9afc83bc963d168a438b90b95e0b61bd107e62cf[m
Author: Felix Eder <[email protected]>
Date: Fri Jul 29 13:23:32 2016 +0200
Continued work on BirdBoss, we need to decide on a movement system
[33mcommit cf60c62c3c16c4d497b7de910053d7c65650bc29[m
Author: Felix Eder <[email protected]>
Date: Thu Jul 28 18:39:25 2016 +0200
Started work on the EyeGuy, and everything mostly works, but you can't hit it right now
[33mcommit 692fb8c0c1ef2723c237d57b09f76d90985ae0cf[m
Author: Felix Eder <[email protected]>
Date: Thu Jul 28 17:59:29 2016 +0200
The ShellMan enemy now works
[33mcommit a23eb415b89b6a917b9a5977efe9b61ea37cf0c4[m
Author: Felix Eder <[email protected]>
Date: Thu Jul 28 17:38:22 2016 +0200
CrawlerCritter now works as an enemy
[33mcommit 5a0b7f939eee4122a2f9dac5ba43a7d46d755896[m
Merge: 1e72ad5 0d5055c
Author: Felix Eder <[email protected]>
Date: Thu Jul 28 15:29:21 2016 +0200
Merge branch 'AustrianBranch'
[33mcommit 1e72ad500bc37afb25fbcd85086e46d77c275418[m
Merge: f7fb2bf 37cb123
Author: Felix Eder <[email protected]>
Date: Thu Jul 28 15:25:37 2016 +0200
Merge branch 'master' of https://github.com/FelixEder/RetroFutureGame
[33mcommit f7fb2bf6784e0d32d19f545ee2a2714674d1ae24[m
Author: Felix Eder <[email protected]>
Date: Thu Jul 28 15:25:30 2016 +0200
Continued work on Bird Boss, still not so very fun
[33mcommit 0d5055c2117c17a72cd8ef0d487e2249ddbb15d5[m
Author: felixed <[email protected]>
Date: Thu Jul 28 14:50:04 2016 +0200
Hard enemies can now be hurt by megapunching
[33mcommit 37cb12314d503b5113b1d57ef5d9f8e28cc4b0ff[m
Author: Felix Eder <[email protected]>
Date: Thu Jul 28 14:39:48 2016 +0200
Update Enemy & boss concepts
[33mcommit c8b972e8200b06b739541c3b08491d8ae8aa3121[m
Author: aktersnurra95 <[email protected]>
Date: Wed Jul 27 23:08:37 2016 +0200
Fixed a bunch of errors with wrong capitalization and some layers.
[33mcommit ad51385b60b9d9c0c40459700af7f8b1ebb7e4a3[m
Author: Felix Eder <[email protected]>
Date: Wed Jul 27 18:05:33 2016 +0200
Started work on the bigBadBirdBoss, still not so very fun to play
[33mcommit 5065d988daa2835a40f5f7c5ca4a41fc0883b7fe[m
Author: Felix Eder <[email protected]>
Date: Wed Jul 27 17:23:26 2016 +0200
Rewrote some of the smallCritter script. Removed child of smallCritter.
[33mcommit b9c5f1e76eff041a941200133bbb5865fc606cd8[m
Merge: 9008cf0 860c898
Author: Felix Eder <[email protected]>
Date: Wed Jul 27 17:03:55 2016 +0200
Solved all merge issues and converted most of the new scripts to new naming conventions.
[33mcommit 860c898ae323f175d2342c6df503bc9939d62d6d[m
Author: Felix Eder <[email protected]>
Date: Wed Jul 27 16:14:31 2016 +0200
Fixed Syntax errors with Unitys help
[33mcommit 9008cf0048711624973de4729063fef4c2fc9c6e[m
Author: Felix Eder <[email protected]>
Date: Wed Jul 27 15:50:07 2016 +0200
Fixed minor issues with tags and names
[33mcommit 9b073113f2670326376b9d7d48c6d2f244a85d0b[m
Author: aktersnurra95 <[email protected]>
Date: Wed Jul 27 01:12:21 2016 +0200
Converted all namingconventions of prefabs, tags, layers, sort layer to begin with uppercase letter. Rewrote some of the 'type' detecting systems for barriers, items to not use tags but public strings instead. Made some new prefabs of items and changed platform prefab to use polygon collider instead of line. Cleaned up timing system for enemydrops decay timer. (Not done with all convertions, som pickups do not react to player anymore)
[33mcommit 1ac7c04bcebee36e3c97d505d383f615868d6e4e[m
Author: aktersnurra95 <[email protected]>
Date: Tue Jul 26 01:06:48 2016 +0200
Added improved glitch death effect to small critter prefab
[33mcommit 423988982d4ada0a5328a9935f23cc2f6adf2ffb[m
Author: aktersnurra95 <[email protected]>
Date: Tue Jul 26 01:05:07 2016 +0200