Commit Graph

51 Commits

Author SHA1 Message Date
8547b5962a Merge pull request 'hot_new_model' (#16) from hot_new_model into master
Reviewed-on: #16
2023-02-13 09:51:15 +01:00
korzepadawid
465ddf21ee final 2023-02-13 07:59:35 +01:00
747473f16c added floor & lamp texture 2023-02-13 03:05:01 +01:00
ef35cfaa38 AAAAA 2023-02-13 02:25:10 +01:00
f6bf9a5f73 QSADSFGNH 2023-02-13 01:16:16 +01:00
97e497c932 changed door texture to a working one 2023-02-12 23:29:13 +01:00
f2f5c7e8b2 room uv mapping done 2023-02-12 23:00:07 +01:00
9638cd85c3 new_texture_error 2023-02-12 22:28:02 +01:00
korzepadawid
65286f2b54 i hope it works this time 2023-02-12 21:45:32 +01:00
a7a99a2bd8 Merge pull request 'textures-2' (#15) from textures-2 into master
Reviewed-on: #15
2023-02-12 20:21:34 +01:00
Angelika Iskra
df61b3bffe added textures to other models; 2023-02-12 18:44:48 +01:00
Angelika Iskra
d66ce91a4c added black, floor, spaceship, wood, wall textures; 2023-02-12 12:30:46 +01:00
58a9a512a3 pbr texturing 2023-02-11 17:43:48 +01:00
ee11b8fa93 Merge pull request 'fixed lamp and turning off/on lights;' (#14) from textures into master
Reviewed-on: #14
2023-02-11 16:39:49 +01:00
Angelika Iskra
79281ef178 worked on floor texture; 2023-02-11 16:36:58 +01:00
Angelika Iskra
1cef08d75b fixed lamp and turning off/on lights; 2023-02-11 15:26:26 +01:00
3501a17241 adding accidentally deleted files 2023-02-09 22:57:39 +01:00
f285c95732 Merge branch 'bloom' 2023-02-09 22:34:30 +01:00
57f4852410 cleanup2 2023-02-09 22:14:37 +01:00
c387a67792 clean up the branch 2023-02-09 22:07:19 +01:00
265a83cef4 minor fixes of model scaling 2023-02-09 19:32:30 +01:00
69c4a0e425 add furniture 2023-02-07 23:41:16 +01:00
947d3971c2 fix shadow of spaceship 2023-02-07 21:45:51 +01:00
158c48f703 fix resize 2023-02-07 21:14:43 +01:00
27e912bcbd skybox exposure 2023-02-07 20:29:53 +01:00
d1711de0e5 Merge pull request 'fixed models; cut the plane' (#13) from code_cleanup into master
Reviewed-on: #13
2023-02-07 20:10:30 +01:00
dawid
4e64a7e1b1 fixed models; cut the plane 2023-02-07 19:56:33 +01:00
564b7c4e74 bloom koniec - ale do poprawy 2023-02-06 17:29:54 +01:00
1c4b65ed79 Merge pull request 'fix shadow; added plant;' (#12) from fix-shadow into master
Reviewed-on: #12
2023-02-01 10:48:36 +01:00
Angelika Iskra
155763bdd5 fix shadow; added plant; 2023-02-01 10:47:45 +01:00
15e57b894d Merge pull request 'added furniture models, light switcher and car;' (#11) from furniture-2 into master
Reviewed-on: #11
2023-01-31 00:11:44 +01:00
Angelika Iskra
15abe70c4c added furniture models, light switcher and car; 2023-01-31 00:10:19 +01:00
korzepadawid
73fa84b026 blured horizontal 2023-01-30 13:05:38 +01:00
1f50ab3921 bloom bez g blura 2023-01-30 12:10:43 +01:00
8dfd5b1c9b Merge pull request 'more models' (#10) from additional_objects into master
Reviewed-on: #10
2023-01-28 12:25:36 +01:00
korzepadawid
490224f677 more models 2023-01-27 19:51:37 +01:00
cce8b553db Merge pull request 'room-2' (#9) from room-2 into master
Reviewed-on: #9
2023-01-24 11:57:03 +01:00
de279c9c32 naparwienie cieni 2023-01-24 11:53:35 +01:00
065e8f6321 changed room obj; 2023-01-24 00:19:30 +01:00
de5862f670 normal mapy 2023-01-23 13:18:35 +01:00
373b2b2ca2 poprawa 2023-01-23 12:11:20 +01:00
74e481c747 Merge pull request 'dodanie cieni z latarki drona' (#8) from room_cube into master
Reviewed-on: #8
2023-01-23 11:34:46 +01:00
5b2786ea1e dodanie cieni z latarki drona 2023-01-16 17:25:19 +01:00
72128eecb1 Merge pull request 'better cube' (#3) from room_cube into master
Reviewed-on: #3
2023-01-16 16:40:41 +01:00
korzepadawid
02aa3da621 better cube 2023-01-16 16:39:13 +01:00
7316bb0719 Merge pull request 'changed walls to white; added couch and coffee table;' (#2) from furniture-1 into master
Reviewed-on: #2
2023-01-14 19:10:59 +01:00
Angelika Iskra
a54856d680 changed walls to white; added couch and coffee table; 2023-01-14 19:09:48 +01:00
9c7d632ab3 Merge pull request 'Dodanie działającego skyboxa' (#1) from skybox into master
Reviewed-on: #1
2023-01-14 17:01:09 +01:00
fd8accb9c7 Dodanie działającego skyboxa 2023-01-14 16:54:20 +01:00
korzepadawid
a655e4780e bigger room 2023-01-14 14:43:18 +01:00