Commit Graph

Select branches

Hide Pull Requests

develop

enemies_placement

final_comit

health_bar

hearts

master

planets_textures

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#3

#4

#5

#6

#7

#8

#9

Mono Color

• e3b66ef977 Merge pull request 'final commit' (#21) from final_comit into master master Wojciech Goralewski 2024-02-08 19:54:38 +0100
• 3dc84f2df1 final commit #21 final_comit Wojtek 2024-02-08 19:51:39 +0100
• f28de5f2be Merge pull request 'hearts' (#20) from hearts into master Wojciech Goralewski 2024-02-08 05:10:34 +0100
• abf896ce6d nitroes 2 #20 hearts Wojtek 2024-02-08 04:55:27 +0100
• a49a76f8ef nitroes Wojtek 2024-02-08 04:54:48 +0100
• 1421b90c66 Opis projektu Wojtek 2024-02-08 04:44:22 +0100
• 630438b1bc Merge pull request 'enemies_placement' (#19) from enemies_placement into master Mateusz Kantorski 2024-02-08 00:44:07 +0100
• 5d2405774b Add starter enemy #19 enemies_placement s473577 2024-02-08 00:43:24 +0100
• 23b1f0c124 Add constant enemies respawn when half of them is defeated s473577 2024-02-08 00:23:07 +0100
• 6737f14356 Add respawn for spaceship and enemies s473577 2024-02-07 23:44:53 +0100
• de54348411 Merge pull request 'asteroids' (#18) from satellites into master Paweł Felcyn 2024-02-07 23:14:35 +0100
• d949505204 asteroids #18 Pawel Felcyn 2024-02-07 23:13:51 +0100
• 91c2dca35b Change spaceship starting position and lower nitro consumption s473577 2024-02-07 22:54:19 +0100
• 1579e92b35 Add random location enemy generator s473577 2024-02-07 22:46:33 +0100
• ebbda6e21e Merge pull request 'enemies_placement' (#17) from enemies_placement into master Mateusz Kantorski 2024-02-07 16:32:08 +0100
• 7c410aee09 Add turbo bar #17 s473577 2024-02-07 16:23:09 +0100
• 598d709910 Fix healthbar is visible in maximized window s473577 2024-02-07 15:35:59 +0100
• dc73f3b5f1 Fix hud bars are no longer moving and rotating with spaceship movement s473577 2024-02-07 15:09:10 +0100
• 6f85812a35 Change window size to 1920x1080 s473577 2024-02-07 13:34:39 +0100
• 3f818cac54 Add turbo bar #16 s473577 2024-02-07 16:23:09 +0100
• 95988104a1 Fix healthbar is visible in maximized window s473577 2024-02-07 15:35:59 +0100
• 2063395cea Fix hud bars are no longer moving and rotating with spaceship movement s473577 2024-02-07 15:09:10 +0100
• 1f70717502 Merge pull request 'normal map on ship' (#15) from fix_normal_map into master Wojciech Goralewski 2024-02-07 14:02:31 +0100
• ec331f322b normal map on ship #15 Wojtek 2024-02-07 13:59:41 +0100
• 7543350dfd Change window size to 1920x1080 s473577 2024-02-07 13:34:39 +0100
• 203110adf5 Merge pull request 'sun_textures+ship_texturing_works' (#14) from sun_textures into master Wojciech Goralewski 2024-02-05 23:50:36 +0100
• 8090c8ec1c sun_textures+ship_texturing_works #14 Wojtek 2024-02-05 22:22:25 +0100
• 06edddcbdc Merge pull request 'spaceship animations' (#13) from movement into master Paweł Felcyn 2024-02-04 20:32:07 +0100
• 6df3b595d7 spaceship animations #13 Pawel Felcyn 2024-02-04 20:31:21 +0100
• 99c3fab77b Merge pull request 'normal mapping - sth wrong with the ship' (#12) from noramal into master Paweł Felcyn 2024-02-04 18:11:24 +0100
• 3fe71e0f93 normal mapping - sth wrong with the ship #12 Pawel Felcyn 2024-02-04 18:10:19 +0100
• 3b506455c6 Merge pull request 'health_bar' (#11) from health_bar into master Mateusz Kantorski 2024-02-03 21:51:29 +0100
• 61170baa47 Adjust hud postion to the new scale #11 health_bar s473577 2024-02-03 21:50:55 +0100
• 1f09c40bb5 Add collision detection and taking dmg s473577 2024-02-03 20:20:01 +0100
• 94b22aad78 Add drawing HUD HP bar s473577 2024-02-01 23:27:42 +0100
• de13bc43a4 Add drawing health bars for enemies s473577 2024-02-01 15:11:52 +0100
• 057d07c3b3 Merge pull request 'prbTexture+ammo_count' (#10) from prbTexture+ammo_count into master Paweł Felcyn 2024-02-02 22:15:39 +0100
• 2a4d52c235 merge #10 Wojtek 2024-02-02 22:12:09 +0100
• 48fcc13278 gitignore Wojtek 2024-02-02 21:51:24 +0100
• e4d1460f2e usuniecie tekstury Wojtek 2024-01-31 18:59:00 +0100
• 54c3674f24 all planets has random textures Wojtek 2024-01-31 13:42:00 +0100
• 2054a2919e refractoring Wojtek 2024-01-24 22:49:58 +0100
• 6e7c437aa8 earth_texture works Wojtek 2024-01-22 19:39:58 +0100
• 67fa38035c new ship + texturing Wojtek 2024-01-22 18:46:06 +0100
• a15c1f9c6c Merge pull request 'fix gitignore' (#9) from fire into master Paweł Felcyn 2024-02-02 21:33:58 +0100
• b3893d1587 fix gitignore #9 Pawel Felcyn 2024-02-02 21:31:27 +0100
• 2c5a971405 Merge pull request 'fire from spaceship' (#7) from fire into master #8 Paweł Felcyn 2024-01-30 21:16:16 +0100
• 69d7db83fa fire from spaceship #7 Pawel Felcyn 2024-01-30 21:13:23 +0100
• cf07257222 Merge pull request 'enemies' (#6) from enemies into master Mateusz Kantorski 2024-01-29 16:14:31 +0100
• 79d0069a52 modify gitignore #6 #5 Qumpell 2024-01-29 16:06:06 +0100
• 4e3264ad2a Fix billboarding of enemies and their shooting positions s473577 2024-01-24 00:35:11 +0100
• f1c3a1b57b Add enemy class s473577 2024-01-22 00:45:08 +0100
• 6b60c55af7 Add sprite renderer and sprite shaders s473577 2024-01-22 00:43:08 +0100
• 90e88b0dc2 xd planets_textures Pawel Felcyn 2024-01-24 22:49:59 +0100
• 7097be100e lower arrays sizes in shaders Pawel Felcyn 2024-01-22 15:56:33 +0100
• 449a49102b Merge pull request 'create multiple suns' (#4) from multiple_suns into master Paweł Felcyn 2024-01-20 21:03:03 +0100
• 1e913c61e6 create multiple suns #4 Pawel Felcyn 2024-01-20 21:01:14 +0100
• ad25bf4f9e Merge pull request 'add shooting' (#3) from shooting into master Paweł Felcyn 2024-01-16 22:48:12 +0100
• 4436a7b0d8 add shooting #3 Pawel Felcyn 2024-01-16 22:15:26 +0100
• 112c322941 Merge pull request 'skybox' (#2) from skybox into master Mateusz Kantorski 2024-01-15 16:14:55 +0100
• 8de2bf6a70 Add drawing skybox #2 s473577 2024-01-12 23:26:00 +0100
• c8d4806f88 Add skybox textures and cube model s473577 2024-01-12 23:19:19 +0100
• 06a808b3a7 spaceship get instance returns pointer Pawel Felcyn 2024-01-10 21:20:52 +0100
• 7b2fb51136 merge develop into master Pawel Felcyn 2024-01-10 21:12:45 +0100
• b06b3e7f5e move suns to game utils Pawel Felcyn 2024-01-10 20:56:06 +0100
• f9c93f9d5b render one planet with moon Pawel Felcyn 2024-01-08 16:17:25 +0100
• 874934e603 Change Spaceship::getInstance to spaceship #1 develop s473577 2024-01-05 00:10:48 +0100
• c0f6329de7 Add color, roughness and metallic properities to spaceship s473577 2024-01-05 00:08:17 +0100
• 60a5c80adc sun shines brughter Pawel Felcyn 2024-01-04 21:48:56 +0100
• 656756dc0a delete unnecessary models Pawel Felcyn 2024-01-04 21:38:08 +0100
• fe7fad1258 one sun shines Pawel Felcyn 2024-01-04 21:35:34 +0100
• 7a876100dd create multiple suns Pawel Felcyn 2024-01-04 20:51:01 +0100
• 2b390af6d9 move rendering sun to Sun class Pawel Felcyn 2024-01-03 22:06:27 +0100
• 034df6be24 move camera to spaceship Pawel Felcyn 2024-01-03 20:59:48 +0100
• 5c8faba1f8 spaceship light Pawel Felcyn 2024-01-03 20:56:56 +0100
• 5ee26a6c64 create spaceship class Pawel Felcyn 2024-01-03 20:51:29 +0100
• 4bdf8d5e8b seperate class for sun variables Pawel Felcyn 2024-01-03 20:40:52 +0100
• 321f321cb0 Fix .gitignore s473577 2024-01-02 21:03:26 +0100
• 70b6b74f11 Add project template s473577 2024-01-02 20:54:56 +0100
• aa10ba21d2 update presentation s473577 2023-12-18 22:13:31 +0100
• 72230e90bc prezentacja ostateczna Pawel Felcyn 2023-12-11 21:42:57 +0100
• 73f176759d update prezentation Pawel Felcyn 2023-12-08 23:43:58 +0100
• 83463f64a5 update prezentation Pawel Felcyn 2023-12-08 23:40:14 +0100
• 984960daf8 add presentation Pawel Felcyn 2023-12-07 22:14:55 +0100