Commit Graph

41 Commits

Author SHA1 Message Date
e2146bc5a1 Revert "Fix fragment shader"
This reverts commit 98683e60f9.
2021-02-04 01:56:17 +01:00
f2ab237a78 Merge branch 'master' of https://git.wmi.amu.edu.pl/s444441/GRK-projekt-2020 2021-02-04 01:53:48 +01:00
0f673097ef Zmieniony model statku 2021-02-04 01:53:40 +01:00
xkamikoo
98683e60f9 Fix fragment shader 2021-02-02 12:04:58 +01:00
xkamikoo
e84613bc32 Lower gamma 2021-02-01 16:44:35 +01:00
056b8c0c06 Removed unnecessary options 2021-02-01 11:16:54 +01:00
dd40b83ed4 Particle life decreased, working flying dir 2021-02-01 11:09:42 +01:00
xkamikoo
dc4ceed8ad Remove doubles 2021-02-01 02:47:31 +01:00
xkamikoo
0a5ac016c1 Merge particles with master 2021-02-01 02:47:01 +01:00
xkamikoo
09b261ec90 Fixed particles 2021-02-01 02:22:35 +01:00
xkamikoo
b3abac8b97 kinda works, but ship looks like it's on fire 2021-02-01 01:12:15 +01:00
16ee1c04f9 Merge branch 'master' of https://git.wmi.amu.edu.pl/s444441/GRK-projekt-2020 2021-02-01 00:34:25 +01:00
b564ce57cf fullScreen, esc key to exit 2021-02-01 00:33:46 +01:00
xkamikoo
30e50f11e0 moon 2021-02-01 00:30:11 +01:00
12f2044980 Particle coś 2021-02-01 00:26:43 +01:00
xkamikoo
042572f519 Bigger bloom, adjust sun intensity 2021-01-29 02:13:38 +01:00
xkamikoo
b7731e7faf Add bloom 2021-01-29 02:03:00 +01:00
xkamikoo
1645ef73cd commit but not pushed because skybox puf 2021-01-29 01:07:43 +01:00
xkamikoo
cfd744b476 space humster 2021-01-28 21:09:42 +01:00
xkamikoo
1f1294c688 deleted red ambient 2021-01-27 01:35:39 +01:00
283e9fd53f merge engineOffset 2021-01-26 23:22:05 +01:00
xkamikoo
a89f80d68b engine lights 2021-01-26 23:18:54 +01:00
8b3c045237 engine offset not working, keyboard change, cameraFace change 2021-01-26 22:24:47 +01:00
xkamikoo
e7fd0f5fa2 prototype of engine lights 2021-01-25 23:50:53 +01:00
xkamikoo
69e858e2b9 fixed lighting 2021-01-24 23:18:02 +01:00
7680f519a5 Przerzucone bump i diffuse dla statku 2021-01-24 20:59:54 +01:00
2ab247aeac Dodany antyaliasing 2021-01-24 20:49:53 +01:00
xkamikoo
09eeec7f6c few comments 2021-01-24 19:21:05 +01:00
a261c758d6 corvette.mtl 2021-01-24 05:22:12 +01:00
xkamikoo
72e8f3d0f4 changed shipmodel to corvette, assimp 2021-01-24 02:57:03 +01:00
xkamikoo
1bf4112f99 Merge branch 'master' of https://git.wmi.amu.edu.pl/s444441/GRK-projekt-2020 2021-01-24 01:02:43 +01:00
xkamikoo
65c0f5ae4a shaders for bloom (i'm working on it!) 2021-01-24 01:02:35 +01:00
4aab45c76c Signed-off-by: Adrian Charkiewicz <adrcha2@st.amu.edu.pl> 2021-01-24 00:40:45 +01:00
be98e05537 Test 2021-01-21 22:42:06 +01:00
xkamikoo
8b245730aa multilights, two suns, 2021-01-17 01:26:29 +01:00
xkamikoo
0ac976fa5c added moon 2021-01-16 21:20:03 +01:00
xkamikoo
a403ea75d6 add sun and earth, basic textures and lighting 2021-01-16 20:33:47 +01:00
6f33df50a3 Merge pull request 'origin' (#1) from origin into master
Reviewed-on: s444441/GRK-projekt-2020#1
2021-01-16 17:20:09 +01:00
xkamikoo
81e5a55669 rm zad 2021-01-16 17:14:57 +01:00
xkamikoo
0446a2bfe3 new project 2021-01-16 17:11:39 +01:00
xkamikoo
0e96643e6a Dodaj pliki .gitignore i .gitattributes. 2021-01-16 17:03:22 +01:00