XsedoX
|
79f13b93e5
|
Merge branch 'master' of https://git.wmi.amu.edu.pl/s464869/GRK_Project
|
2023-02-12 22:27:34 +01:00 |
|
XsedoX
|
acd60b813a
|
skybox... zrobiłem ile mogłem
|
2023-02-12 22:27:27 +01:00 |
|
|
|
6e7b8b0359
|
Merge pull request 'ready for new bubble shader' (#10) from fix into master
Reviewed-on: #10
|
2023-02-12 21:29:40 +01:00 |
|
|
|
f38842f977
|
ready for new bubble shader
|
2023-02-12 21:29:00 +01:00 |
|
|
|
187fb7dafa
|
Merge pull request 'fix' (#9) from fix into master
Reviewed-on: #9
|
2023-02-12 19:48:20 +01:00 |
|
AnielaWalczak
|
a5e49e770b
|
ostatnia zmiana mam nadzieje ze działa xd
|
2023-02-12 18:49:15 +01:00 |
|
|
|
d0fe09283c
|
minor fixes
|
2023-02-12 18:31:51 +01:00 |
|
|
|
d994de46eb
|
To Aniela robiła
|
2023-02-12 18:18:56 +01:00 |
|
|
|
2344bae670
|
Merge pull request '100% final' (#7) from improvements_2 into master
Reviewed-on: #7
|
2023-02-12 14:48:52 +01:00 |
|
|
|
fabeef2cd6
|
100% final
|
2023-02-12 14:47:40 +01:00 |
|
|
|
c1fedc7af3
|
Merge pull request 'improvements_2' (#6) from improvements_2 into master
Reviewed-on: #6
|
2023-02-12 11:21:22 +01:00 |
|
|
|
18e6ebc7af
|
final room version
|
2023-02-12 11:20:21 +01:00 |
|
|
|
1a04846f1e
|
na dzis fajrant
|
2023-02-11 22:33:04 +01:00 |
|
|
|
c5abb02d90
|
ao fix + colissions with walls
|
2023-02-11 20:44:24 +01:00 |
|
|
|
0a7eb60b12
|
add interactive fan + shadows
|
2023-02-11 19:00:49 +01:00 |
|
|
|
4d3b1f67e4
|
Rozwiazanie konfliktow
|
2023-02-11 15:05:18 +01:00 |
|
XsedoX
|
03b4685e54
|
merge with bubble
|
2023-02-11 14:03:10 +01:00 |
|
XsedoX
|
10b5d3407b
|
merge with master
|
2023-02-11 13:48:40 +01:00 |
|
AnielaWalczak
|
57fc609f7f
|
nowe
|
2023-02-11 13:26:59 +01:00 |
|
|
|
8db50ad3ad
|
Merge pull request 'improvements' (#4) from improvements into master
Reviewed-on: #4
|
2023-02-11 13:26:35 +01:00 |
|
|
|
a56122ee64
|
good enough
|
2023-02-11 13:24:00 +01:00 |
|
|
|
1467ac2e30
|
added 2nd shadow map and some new objects
|
2023-02-11 12:55:02 +01:00 |
|
|
|
191448773f
|
poprawki part 2
|
2023-02-11 12:45:40 +01:00 |
|
AnielaWalczak
|
de7216a411
|
deszcz poza pokojem
|
2023-02-10 22:58:05 +01:00 |
|
|
|
8bfb2f8823
|
poprawki - dodanie opcji przesuniecia bąbla
|
2023-02-10 21:01:44 +01:00 |
|
|
|
a2b4475590
|
v1.0 - nawet można już implementować :D
TO DO: render to texture/skybox pokoju
|
2023-02-10 20:28:59 +01:00 |
|
|
|
fad0a79c5c
|
Add shadows and computer
|
2023-02-10 19:05:09 +01:00 |
|
|
|
e214a19f45
|
Merge pull request 'dodanie_obiektów' (#3) from dodanie_obiektów into master
Reviewed-on: #3
|
2023-02-10 18:07:42 +01:00 |
|
|
|
cbb0df4d56
|
Prześlij pliki do 'cw 9/models'
|
2023-02-10 17:26:53 +01:00 |
|
|
|
a112aff82a
|
dodanie obiektów i tekstur
|
2023-02-10 17:17:51 +01:00 |
|
|
|
b580685a76
|
pbr
|
2023-02-09 17:18:49 +01:00 |
|
|
|
b4852f9fe1
|
Porzadki
|
2023-02-09 10:29:49 +01:00 |
|
|
|
5f35b93f8f
|
Merge pull request 'System kolizji' (#2) from system-kolizji into master
|
2023-02-09 10:08:38 +01:00 |
|
Artur Ziętkiewicz
|
0346d04a0b
|
System kolizji
|
2023-02-09 04:04:15 +01:00 |
|
|
|
8bd1c45046
|
uzupełnienie skybox
|
2023-01-30 23:55:59 +01:00 |
|
|
|
b2cafa61c8
|
Shadows + basic skybox + water
|
2023-01-30 14:45:13 +01:00 |
|
