Commit Graph

Select branches

Hide Pull Requests

master

parallax

particle

test

#1

#2

#3

Mono Color

• 1339929d4a planets added to text on collision master Marcin Kwapisz 2021-02-25 21:24:34 +0100
• 33a003fe6b Merge branch 'master' of https://git.wmi.amu.edu.pl/s444441/GRK-projekt-2020 Marcin Kwapisz 2021-02-25 21:11:51 +0100
• 371f2026c9 Text integrated with endgame Marcin Kwapisz 2021-02-25 21:11:47 +0100
• 7b5120a912 Final changes xkamikoo 2021-02-25 21:05:06 +0100
• bb50ec0e4e Text working, text on the bottom Marcin Kwapisz 2021-02-25 20:59:15 +0100
• e9ca499224 Endgame + little fix xkamikoo 2021-02-25 20:52:49 +0100
• 5e8f2b8330 Merge branch 'master' of https://git.wmi.amu.edu.pl/s444441/GRK-projekt-2020 xkamikoo 2021-02-25 01:37:56 +0100
• f8a3e2c102 Second hamster (Parallax not working right again :c) xkamikoo 2021-02-25 01:37:48 +0100
• 0f242ba18f Text Marcin Kwapisz 2021-02-25 01:35:36 +0100
• 1c29af1da7 Integration text Marcin Kwapisz 2021-02-25 01:31:32 +0100
• 1d52adb106 Text on screen added, few modifications needed Marcin Kwapisz 2021-02-25 01:30:26 +0100
• 636a4bb003 Parallax hamster xkamikoo 2021-02-25 01:02:36 +0100
• dcc9542440 Integrate Marcin's parallax with project xkamikoo 2021-02-24 23:50:12 +0100
• 36fe4ce569 another skybox xkamikoo 2021-02-24 22:34:59 +0100
• 7564d92018 Ziemia jest przeźroczysta parallax Marcin Kwapisz 2021-02-24 21:51:46 +0100
• 1c5dad97dd Better camera + few planets xkamikoo 2021-02-24 21:43:29 +0100
• 4cbbfea666 Humster disappear s xkamikoo 2021-02-24 01:04:09 +0100
• 6a998252e9 Fixed particles xkamikoo 2021-02-23 23:22:02 +0100
• 85c9c561ee Bigger particles, some changes in physx xkamikoo 2021-02-23 23:14:02 +0100
• 963c2a86a2 Physics, kinda works. xkamikoo 2021-02-23 22:08:43 +0100
• 1b2815b668 Class Object xkamikoo 2021-02-23 19:36:37 +0100
• 8d2f13843e Physics, first attempt. xkamikoo 2021-02-23 00:03:44 +0100
• a64b9198d7 Change MSAA to FXAA xkamikoo 2021-02-19 19:43:55 +0100
• 5db9e1b196 Preparation for PhysX xkamikoo 2021-02-19 14:40:57 +0100
• 19d7977344 Add asteroids (something is wrong with them, but it compiles) xkamikoo 2021-02-15 23:15:35 +0100
• 0b24cbc7ae Asteroids. TODO: find model with small amount of verticles xkamikoo 2021-02-12 03:43:11 +0100
• c406c3571d Using only assimp-based models, working on improving shaders xkamikoo 2021-02-12 00:08:28 +0100
• 032c080f33 Fix particles direction, xkamikoo 2021-02-09 22:51:41 +0100
• e2146bc5a1 Revert "Fix fragment shader" Marcin Kwapisz 2021-02-04 01:56:17 +0100
• f2ab237a78 Merge branch 'master' of https://git.wmi.amu.edu.pl/s444441/GRK-projekt-2020 Marcin Kwapisz 2021-02-04 01:53:48 +0100
• 0f673097ef Zmieniony model statku Marcin Kwapisz 2021-02-04 01:53:40 +0100
• 98683e60f9 Fix fragment shader xkamikoo 2021-02-02 12:04:58 +0100
• e84613bc32 Lower gamma xkamikoo 2021-02-01 16:44:35 +0100
• 056b8c0c06 Removed unnecessary options Marcin Kwapisz 2021-02-01 11:16:54 +0100
• dd40b83ed4 Particle life decreased, working flying dir Marcin Kwapisz 2021-02-01 11:09:42 +0100
• dc4ceed8ad Remove doubles xkamikoo 2021-02-01 02:47:31 +0100
• 0a5ac016c1 Merge particles with master xkamikoo 2021-02-01 02:47:01 +0100
• 09b261ec90 Fixed particles #3 particle xkamikoo 2021-02-01 02:22:35 +0100
• b3abac8b97 kinda works, but ship looks like it's on fire xkamikoo 2021-02-01 01:12:15 +0100
• 16ee1c04f9 Merge branch 'master' of https://git.wmi.amu.edu.pl/s444441/GRK-projekt-2020 Adrian Charkiewicz 2021-02-01 00:34:25 +0100
• b564ce57cf fullScreen, esc key to exit Adrian Charkiewicz 2021-02-01 00:33:46 +0100
• 30e50f11e0 moon xkamikoo 2021-02-01 00:30:11 +0100
• 12f2044980 Particle coś Marcin Kwapisz 2021-02-01 00:26:43 +0100
• 042572f519 Bigger bloom, adjust sun intensity xkamikoo 2021-01-29 02:13:38 +0100
• b7731e7faf Add bloom xkamikoo 2021-01-29 02:03:00 +0100
• 1645ef73cd commit but not pushed because skybox puf xkamikoo 2021-01-29 01:07:43 +0100
• cfd744b476 space humster xkamikoo 2021-01-28 21:09:42 +0100
• 1f1294c688 deleted red ambient xkamikoo 2021-01-27 01:35:39 +0100
• 283e9fd53f merge engineOffset Kamila Matysiak 2021-01-26 23:22:05 +0100
• a89f80d68b engine lights #2 xkamikoo 2021-01-26 23:18:54 +0100
• 8b3c045237 engine offset not working, keyboard change, cameraFace change Adrian Charkiewicz 2021-01-26 22:24:47 +0100
• e7fd0f5fa2 prototype of engine lights xkamikoo 2021-01-25 23:50:53 +0100
• 69e858e2b9 fixed lighting xkamikoo 2021-01-24 23:18:02 +0100
• 7680f519a5 Przerzucone bump i diffuse dla statku Marcin Kwapisz 2021-01-24 20:59:54 +0100
• 2ab247aeac Dodany antyaliasing Marcin Kwapisz 2021-01-24 20:49:53 +0100
• 09eeec7f6c few comments xkamikoo 2021-01-24 19:21:05 +0100
• a261c758d6 corvette.mtl Adrian Charkiewicz 2021-01-24 05:22:12 +0100
• 72e8f3d0f4 changed shipmodel to corvette, assimp xkamikoo 2021-01-24 02:57:03 +0100
• 1bf4112f99 Merge branch 'master' of https://git.wmi.amu.edu.pl/s444441/GRK-projekt-2020 xkamikoo 2021-01-24 01:02:43 +0100
• 65c0f5ae4a shaders for bloom (i'm working on it!) xkamikoo 2021-01-24 01:02:35 +0100
• 4aab45c76c Signed-off-by: Adrian Charkiewicz <adrcha2@st.amu.edu.pl> Adrian Charkiewicz 2021-01-24 00:40:45 +0100
• be98e05537 Test Marcin Kwapisz 2021-01-21 22:42:06 +0100
• e99d5d3a6d !models/ test xkamikoo 2021-01-21 22:26:32 +0100
• 9e6ea164bc modified gitignore xkamikoo 2021-01-21 22:25:16 +0100
• 8b245730aa multilights, two suns, xkamikoo 2021-01-17 01:26:29 +0100
• 0ac976fa5c added moon xkamikoo 2021-01-16 21:20:03 +0100
• a403ea75d6 add sun and earth, basic textures and lighting xkamikoo 2021-01-16 20:33:47 +0100
• 6f33df50a3 Merge pull request 'origin' (#1) from origin into master Kamila Matysiak 2021-01-16 17:20:09 +0100
• 81e5a55669 rm zad #1 xkamikoo 2021-01-16 17:14:57 +0100
• 0446a2bfe3 new project xkamikoo 2021-01-16 17:11:39 +0100
• 0e96643e6a Dodaj pliki .gitignore i .gitattributes. xkamikoo 2021-01-16 17:03:22 +0100