Commit Graph

78 Commits

Author SHA1 Message Date
e3b66ef977 Merge pull request 'final commit' (#21) from final_comit into master
Reviewed-on: #21
2024-02-08 19:54:38 +01:00
Wojtek
3dc84f2df1 final commit 2024-02-08 19:51:39 +01:00
f28de5f2be Merge pull request 'hearts' (#20) from hearts into master
Reviewed-on: #20
2024-02-08 05:10:34 +01:00
Wojtek
abf896ce6d nitroes 2 2024-02-08 04:55:27 +01:00
Wojtek
a49a76f8ef nitroes 2024-02-08 04:54:48 +01:00
Wojtek
1421b90c66 Opis projektu 2024-02-08 04:44:22 +01:00
630438b1bc Merge pull request 'enemies_placement' (#19) from enemies_placement into master
Reviewed-on: #19
2024-02-08 00:44:07 +01:00
5d2405774b Add starter enemy 2024-02-08 00:43:24 +01:00
23b1f0c124 Add constant enemies respawn when half of them is defeated 2024-02-08 00:23:07 +01:00
6737f14356 Add respawn for spaceship and enemies 2024-02-07 23:44:53 +01:00
de54348411 Merge pull request 'asteroids' (#18) from satellites into master
Reviewed-on: #18
2024-02-07 23:14:35 +01:00
Pawel Felcyn
d949505204 asteroids 2024-02-07 23:13:51 +01:00
91c2dca35b Change spaceship starting position and lower nitro consumption 2024-02-07 22:54:19 +01:00
1579e92b35 Add random location enemy generator 2024-02-07 22:46:33 +01:00
ebbda6e21e Merge pull request 'enemies_placement' (#17) from enemies_placement into master
Reviewed-on: #17
2024-02-07 16:32:08 +01:00
7c410aee09 Add turbo bar 2024-02-07 16:29:16 +01:00
598d709910 Fix healthbar is visible in maximized window 2024-02-07 16:26:33 +01:00
dc73f3b5f1 Fix hud bars are no longer moving and rotating with spaceship movement 2024-02-07 16:26:33 +01:00
6f85812a35 Change window size to 1920x1080 2024-02-07 16:26:33 +01:00
1f70717502 Merge pull request 'normal map on ship' (#15) from fix_normal_map into master
Reviewed-on: #15
2024-02-07 14:02:31 +01:00
Wojtek
ec331f322b normal map on ship 2024-02-07 13:59:41 +01:00
203110adf5 Merge pull request 'sun_textures+ship_texturing_works' (#14) from sun_textures into master
Reviewed-on: #14
2024-02-05 23:50:36 +01:00
Wojtek
8090c8ec1c sun_textures+ship_texturing_works 2024-02-05 22:22:25 +01:00
06edddcbdc Merge pull request 'spaceship animations' (#13) from movement into master
Reviewed-on: #13
2024-02-04 20:32:07 +01:00
Pawel Felcyn
6df3b595d7 spaceship animations 2024-02-04 20:31:21 +01:00
99c3fab77b Merge pull request 'normal mapping - sth wrong with the ship' (#12) from noramal into master
Reviewed-on: #12
2024-02-04 18:11:24 +01:00
Pawel Felcyn
3fe71e0f93 normal mapping - sth wrong with the ship 2024-02-04 18:10:19 +01:00
3b506455c6 Merge pull request 'health_bar' (#11) from health_bar into master
Reviewed-on: #11
2024-02-03 21:51:29 +01:00
61170baa47 Adjust hud postion to the new scale 2024-02-03 21:50:55 +01:00
1f09c40bb5 Add collision detection and taking dmg 2024-02-03 21:31:46 +01:00
94b22aad78 Add drawing HUD HP bar 2024-02-03 21:28:49 +01:00
de13bc43a4 Add drawing health bars for enemies 2024-02-03 21:28:12 +01:00
057d07c3b3 Merge pull request 'prbTexture+ammo_count' (#10) from prbTexture+ammo_count into master
Reviewed-on: #10
2024-02-02 22:15:39 +01:00
Wojtek
2a4d52c235 merge 2024-02-02 22:12:09 +01:00
Wojtek
48fcc13278 gitignore 2024-02-02 22:00:18 +01:00
Wojtek
e4d1460f2e usuniecie tekstury 2024-02-02 21:59:37 +01:00
Wojtek
54c3674f24 all planets has random textures 2024-02-02 21:59:37 +01:00
Wojtek
2054a2919e refractoring 2024-02-02 21:58:14 +01:00
Wojtek
6e7c437aa8 earth_texture works 2024-02-02 21:57:31 +01:00
Wojtek
67fa38035c new ship + texturing 2024-02-02 21:55:47 +01:00
a15c1f9c6c Merge pull request 'fix gitignore' (#9) from fire into master
Reviewed-on: #9
2024-02-02 21:33:58 +01:00
Pawel Felcyn
b3893d1587 fix gitignore 2024-02-02 21:31:27 +01:00
2c5a971405 Merge pull request 'fire from spaceship' (#7) from fire into master
Reviewed-on: #7
2024-01-30 21:16:16 +01:00
Pawel Felcyn
69d7db83fa fire from spaceship 2024-01-30 21:15:07 +01:00
cf07257222 Merge pull request 'enemies' (#6) from enemies into master
Reviewed-on: #6
2024-01-29 16:14:31 +01:00
Qumpell
79d0069a52 modify gitignore 2024-01-29 16:11:15 +01:00
4e3264ad2a Fix billboarding of enemies and their shooting positions 2024-01-29 16:11:15 +01:00
f1c3a1b57b Add enemy class 2024-01-29 16:10:54 +01:00
6b60c55af7 Add sprite renderer and sprite shaders 2024-01-29 16:07:55 +01:00
449a49102b Merge pull request 'create multiple suns' (#4) from multiple_suns into master
Reviewed-on: #4
2024-01-20 21:03:03 +01:00