Skip to content

Commit e7f6c85

Browse files
authored
Merge branch 'master' into master
2 parents 9033696 + b39c54c commit e7f6c85

12 files changed

+1436
-80
lines changed

app_jq.html

+7-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55
<meta http-equiv="x-ua-compatible" content="ie=edge">
6-
<title>Projekt [wpisz nazwę]</title>
6+
<title>Projekt Gra Platformowa</title>
77
<meta name="description" content="">
88
<meta name="viewport" content="width=device-width, initial-scale=1">
99

@@ -41,7 +41,13 @@ <h1>Projekt [wpisz nazwę]</h1>
4141
<script src="js/plugins.js"></script>
4242
<!-- ewentualny kod JS ogólny -->
4343
<script src="js/main.js"></script>
44+
<script src="js/vendor/p5.min.js"></script>
45+
<script src="js/vendor/p5.dom.min.js"></script>
46+
<script src="js/vendor/p5.sound.min.js"></script>
4447
<!--kod aplikacji w jQuery-->
48+
<script src="js/platforms.js"></script>
49+
<script src="js/spikes.js"></script>
50+
<script src="js/enemies.js"></script>
4551
<script src="js/app_jq.js"></script>
4652

4753
</body>

app_p5.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55
<meta http-equiv="x-ua-compatible" content="ie=edge">
6-
<title>Projekt [wpisz nazwę]</title>
6+
<title>Projekt Gra Platformowa</title>
77
<meta name="description" content="">
88
<meta name="viewport" content="width=device-width, initial-scale=1">
99

File renamed without changes.

assets/pistol1.png

1.35 KB
Loading

assets/pistol2.png

-50 Bytes
Loading

assets/pistol3.png

-940 Bytes
Loading

assets/pistol4.png

964 Bytes
Loading

assets/pistol5.png

3 Bytes
Loading

assets/pistol6.png

-1.33 KB
Binary file not shown.

index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<![endif]-->
2222

2323
<!-- Tutaj dodajesz swój kod -->
24-
<h1>Projekt [wpisz nazwę]</h1>
24+
<h1>Projekt Gra Platformowa</h1>
2525
<div>
2626
<ul class="menu">
2727
<li><a href="index.html">Strona główna</a></li>

0 commit comments

Comments
 (0)