Commit Graph

Select branches

Hide Pull Requests

additional_objects

asfdgfghm

bloom

code_cleanup

fix-shadow

furniture-2

hot_new_model

master

no-pbr

old-room

room_cube

shadow-mapping

skybox

ssao

textures

textures-2

uv_mapping

#1

#10

#11

#12

#13

#14

#15

#16

#2

#3

#4

#5

#6

#7

#8

#9

Mono Color

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