|
|
33a003fe6b
|
Merge branch 'master' of https://git.wmi.amu.edu.pl/s444441/GRK-projekt-2020
|
2021-02-25 21:11:51 +01:00 |
|
|
|
371f2026c9
|
Text integrated with endgame
|
2021-02-25 21:11:47 +01:00 |
|
xkamikoo
|
7b5120a912
|
Final changes
|
2021-02-25 21:05:06 +01:00 |
|
|
|
bb50ec0e4e
|
Text working, text on the bottom
|
2021-02-25 20:59:15 +01:00 |
|
xkamikoo
|
e9ca499224
|
Endgame + little fix
|
2021-02-25 20:52:49 +01:00 |
|
xkamikoo
|
5e8f2b8330
|
Merge branch 'master' of https://git.wmi.amu.edu.pl/s444441/GRK-projekt-2020
|
2021-02-25 01:37:56 +01:00 |
|
xkamikoo
|
f8a3e2c102
|
Second hamster (Parallax not working right again :c)
|
2021-02-25 01:37:48 +01:00 |
|
|
|
0f242ba18f
|
Text
|
2021-02-25 01:35:36 +01:00 |
|
|
|
1c29af1da7
|
Integration text
|
2021-02-25 01:31:32 +01:00 |
|
|
|
1d52adb106
|
Text on screen added, few modifications needed
|
2021-02-25 01:30:26 +01:00 |
|
xkamikoo
|
636a4bb003
|
Parallax hamster
|
2021-02-25 01:02:36 +01:00 |
|
xkamikoo
|
dcc9542440
|
Integrate Marcin's parallax with project
|
2021-02-24 23:50:12 +01:00 |
|
xkamikoo
|
36fe4ce569
|
another skybox
|
2021-02-24 22:34:59 +01:00 |
|
xkamikoo
|
1c5dad97dd
|
Better camera + few planets
|
2021-02-24 21:43:29 +01:00 |
|
xkamikoo
|
4cbbfea666
|
Humster disappear s
|
2021-02-24 01:04:09 +01:00 |
|
xkamikoo
|
6a998252e9
|
Fixed particles
|
2021-02-23 23:22:02 +01:00 |
|
xkamikoo
|
85c9c561ee
|
Bigger particles, some changes in physx
|
2021-02-23 23:14:02 +01:00 |
|
xkamikoo
|
963c2a86a2
|
Physics, kinda works.
|
2021-02-23 22:08:43 +01:00 |
|
xkamikoo
|
1b2815b668
|
Class Object
|
2021-02-23 19:36:37 +01:00 |
|
xkamikoo
|
8d2f13843e
|
Physics, first attempt.
|
2021-02-23 00:03:44 +01:00 |
|
xkamikoo
|
a64b9198d7
|
Change MSAA to FXAA
|
2021-02-19 19:43:55 +01:00 |
|
xkamikoo
|
5db9e1b196
|
Preparation for PhysX
|
2021-02-19 14:40:57 +01:00 |
|
xkamikoo
|
19d7977344
|
Add asteroids (something is wrong with them, but it compiles)
|
2021-02-15 23:15:35 +01:00 |
|
xkamikoo
|
0b24cbc7ae
|
Asteroids.
TODO: find model with small amount of verticles
|
2021-02-12 03:43:11 +01:00 |
|
xkamikoo
|
c406c3571d
|
Using only assimp-based models, working on improving shaders
|
2021-02-12 00:08:28 +01:00 |
|
xkamikoo
|
032c080f33
|
Fix particles direction,
|
2021-02-09 22:51:41 +01:00 |
|
|
|
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 |
|
