Commit Graph

47 Commits

Author SHA1 Message Date
OutsiderAK
fbc4aba1ca solved conflicts 2022-02-10 09:11:04 +01:00
ee0985b8a7 Add particle 2022-02-08 19:14:17 +01:00
051e685e2d Add Particles 2022-02-08 18:51:19 +01:00
dfcf638d8d Add particles 2022-02-08 18:51:06 +01:00
OutsiderAK
1623a49ea9 temporary duplicates 2022-02-03 13:49:39 +01:00
Kraton99
fd6bcaf47a add fog to skybox 2022-01-27 18:41:23 +01:00
Kraton99
4ef49086a5 add fog on skybox 2022-01-27 17:33:40 +01:00
Damian
814e7cae3c transparency 2022-01-25 22:08:36 +01:00
9a50b147f8 Merge pull request 'fish' (#5) from fish into master
Reviewed-on: #5
2022-01-25 21:59:21 +01:00
Damian
7a2a07005f invisible wall 2022-01-25 21:55:46 +01:00
Damian
146cd1f26d removed unused models 2022-01-25 18:41:15 +01:00
Damian
1519d42bde merge master 2022-01-25 17:53:30 +01:00
Damian
78481b13ad fish, terrain 2022-01-25 17:42:48 +01:00
Damian
0422d83324 fish 2022-01-23 23:22:10 +01:00
bccf8f85ee merge skybox 2022-01-23 19:55:55 +01:00
Damian
3a2c4da701 merge 2022-01-23 16:16:34 +01:00
Damian
a78d89e808 bubblesxd 2022-01-23 16:09:02 +01:00
c85b85ad42 normal map 2022-01-23 16:02:10 +01:00
727cbbdf5c add normal map for orca 2022-01-23 13:08:09 +01:00
OutsiderAK
2fbe8d8a98 fixed mirrored textures 2022-01-22 16:16:17 +01:00
Damian
a860dc57e0 fish, randomness to bubbles 2022-01-21 23:45:54 +01:00
OutsiderAK
54561b73b5 remove useless textures 2022-01-21 19:42:04 +01:00
OutsiderAK
8454ed0005 skybox but its mirrored 2022-01-21 19:41:34 +01:00
OutsiderAK
490155f6ff fix the program to run 2022-01-20 21:12:56 +01:00
OutsiderAK
26526567eb skybox tutorial main 2022-01-20 21:08:08 +01:00
OutsiderAK
5654648037 skybox tutorial 2022-01-20 21:04:43 +01:00
Damian
c5e01c780d fish xd 2022-01-19 23:17:30 +01:00
Damian
5eaaceafde fish 2022-01-19 19:17:48 +01:00
Damian
b211e3c81c fish 2022-01-19 19:17:33 +01:00
e796417faa fog 2022-01-19 19:17:24 +01:00
48e199296b fog 2022-01-19 18:52:33 +01:00
b2c9f0ad4a fix camera 2022-01-19 18:29:05 +01:00
c5c2f8af9d obj 2022-01-19 18:23:15 +01:00
Damian
260fe761fb Merge branch 'master' of https://git.wmi.amu.edu.pl/s452659/grafika 2022-01-19 18:21:43 +01:00
Damian
d39e0928f5 models 2022-01-19 18:21:32 +01:00
2b3f8015c5 fog merge 2022-01-19 18:18:40 +01:00
59a4681cbe Merge pull request 'bubbles' (#1) from bubbles into master
Reviewed-on: #1
2022-01-19 18:02:29 +01:00
Damian
66746a8051 Merge branch 'master' into bubbles 2022-01-08 20:13:55 +01:00
Damian
ee33aaf2c4 cleared git cache 2022-01-08 20:09:18 +01:00
Damian
3131ecc80e git cache cleared' 2022-01-08 20:06:54 +01:00
Damian
0a734d3edd bubbles 2022-01-08 20:03:43 +01:00
Damian
5074c45bf0 gitignore 2022-01-08 17:07:57 +01:00
3f9711c675 fix light 2022-01-07 21:46:21 +01:00
2c9efa0ed8 light changing 2022-01-06 22:12:51 +01:00
Damian
a95fdc0f31 Merge branch 'master' of https://git.wmi.amu.edu.pl/s452659/grafika 2022-01-06 20:21:53 +01:00
Damian
3ca2a067e6 init 2022-01-06 20:19:43 +01:00
9be1b32a5f Initial commit 2022-01-06 20:14:06 +01:00