s452622/GRK-Projekt
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • a0a172b8ac small code refractor master Thyme1 2022-02-11 15:14:44 +0100
  • a545bff119 code refactor Matraf 2022-02-11 14:51:22 +0100
  • 99515f54ee Zaktualizuj 'README.md' Mateusz Romański 2022-02-11 14:30:05 +0100
  • 677e0a1a24 cleaning code Matraf 2022-02-11 13:31:16 +0100
  • 1e18534773 merge master to particle-generator Matraf 2022-01-26 17:18:16 +0100
  • 22eddad225 change fog color and fix particle position Matraf 2022-01-26 17:06:14 +0100
  • 2f7d3260ad change particle graphic and add to ship Matraf 2022-01-26 15:15:41 +0100
  • a0ac366237 add random values for rotation/size objects Matraf 2022-01-26 12:23:51 +0100
  • 41cdfcc2f4 Merge pull request 'change: keypoints | keypoints reading | fish models' (#14) from floor into master Mateusz Walas 2022-01-26 11:51:13 +0100
  • 4465c08f13 change second fish #14 Matraf 2022-01-26 01:03:34 +0100
  • 890ed85c2f merge master to floor Matraf 2022-01-25 23:58:54 +0100
  • c76b8476a6 deleted floor Matraf 2022-01-25 23:19:17 +0100
  • 03d3efd52e changes Thyme1 2022-01-25 21:40:06 +0100
  • 1be1d6d95a generate pants on y from generated terrain Thyme1 2022-01-25 20:57:03 +0100
  • c99d7d76db add textures and programs for plants Thyme1 2022-01-25 19:11:47 +0100
  • 1ecf2d309f feat: make skybox bigger, add new sand texture #13 matixezor 2022-01-25 17:33:01 +0100
  • cef7267f78 Merge pull request 'feat: add terrain generation using perlin noise' (#12) from terrain-generation-second-approach into master Mateusz Romański 2022-01-25 12:18:30 +0100
  • 9a45f056a8 refactor: code refactor #12 matixezor 2022-01-24 23:18:16 +0100
  • f2f5a18cc1 refactor: code refactor matixezor 2022-01-24 20:02:48 +0100
  • dcdbcb9588 particles attached to cameraPos, cleaning code Matraf 2022-01-24 19:08:28 +0100
  • 782d777654 add particles Matraf 2022-01-24 18:07:31 +0100
  • ebb270c746 xd Matraf 2022-01-24 15:46:52 +0100
  • 4f03876027 debug plane obj matixezor 2022-01-24 14:04:46 +0100
  • 5fc16bb2c0 init matixezor 2022-01-24 13:40:40 +0100
  • 7a2a862a94 feat: refactor matixezor 2022-01-24 12:06:17 +0100
  • 246011dfd8 change shaders back Thyme1 2022-01-23 21:38:42 +0100
  • 0058724ddd zmiany w generowaniu terenu Thyme1 2022-01-23 21:19:33 +0100
  • 06e04c26e9 zmiany jakies Thyme1 2022-01-23 21:05:59 +0100
  • fc6b24fb3d no i chuj Matraf 2022-01-23 19:19:09 +0100
  • e7a5d0aa2b feat: add terrain class and height generator matixezor 2022-01-23 16:27:17 +0100
  • b0a88f49d0 change fishKeyPointsSecond Matraf 2022-01-21 13:13:02 +0100
  • 801653b4cf add third fish and delete unused models/textures Matraf 2022-01-21 12:53:35 +0100
  • ea9f2b23db change fishKeyPointsThird Matraf 2022-01-21 12:36:09 +0100
  • 312d30ec3e add reading keypoints from file Matraf 2022-01-21 12:34:15 +0100
  • a500d8febc small change for shark Matraf 2022-01-21 10:59:00 +0100
  • 37c38f6fbc Merge master to floor Matraf 2022-01-20 14:04:50 +0100
  • 9fcf4ad62c fixed shark Matraf 2022-01-20 14:01:40 +0100
  • 1611666e96 add more fish Matraf 2022-01-17 16:20:48 +0100
  • 91ebcef017 change light to directional and remove unused shaders Thyme1 2022-01-13 22:06:57 +0100
  • a4694c930b change light to directional and remove unused shaders Thyme1 2022-01-13 22:06:03 +0100
  • ceab013b30 add plants plants Thyme1 2022-01-12 20:54:37 +0100
  • 44164da244 add working terrain Matraf 2022-01-12 15:07:37 +0100
  • 9100642ce7 add new floor obj Matraf 2022-01-12 14:17:16 +0100
  • e75d13e4fd merge master to floor Matraf 2022-01-12 13:50:45 +0100
  • fe4bad6a19 Merge branch 'master' of https://git.wmi.amu.edu.pl/s452622/GRK-Projekt Thyme1 2022-01-12 13:29:57 +0100
  • 13298e75f6 Merge pull request 'bubbles' (#11) from bubbles into master Konrad Jasiński 2022-01-12 13:29:25 +0100
  • 8373fbf2c5 Merge branch 'master' into bubbles #11 Konrad Jasiński 2022-01-12 13:29:18 +0100
  • 551dc2e3e0 add phong for bubbles Thyme1 2022-01-12 13:28:22 +0100
  • 9ee4d45a9b smaller bubbles Thyme1 2022-01-10 21:43:19 +0100
  • 0c12d3adf3 clean bubble shaders Thyme1 2022-01-10 21:14:14 +0100
  • acd223d652 clean main Thyme1 2022-01-10 17:31:56 +0100
  • ffd6bfbb56 add different seabed Thyme1 2022-01-08 23:58:10 +0100
  • 0e5d73c49d add floor Thyme1 2022-01-08 23:38:26 +0100
  • 38f9de35fa Merge branch 'bubbles' Thyme1 2022-01-08 22:36:49 +0100
  • c11c78114f add transparency for bubbles Thyme1 2022-01-08 22:35:24 +0100
  • ce3acacbcf add transparency for bubbles Thyme1 2022-01-08 22:34:09 +0100
  • c14b1a6f34 Merge pull request 'bubbles' (#10) from bubbles into master Konrad Jasiński 2022-01-08 19:56:25 +0100
  • 8b3aa7a4ee add more bubbles #10 Thyme1 2022-01-08 19:49:33 +0100
  • 84074a4263 merge with fog Thyme1 2022-01-08 16:04:07 +0100
  • 9b0fed73c1 add fog on skybox Thyme1 2022-01-08 15:59:37 +0100
  • deec0c2300 add fog on objects Thyme1 2022-01-08 15:55:06 +0100
  • 1b7e6d9bb1 make skybox bigger Thyme1 2022-01-08 14:37:23 +0100
  • 128a22519e Merge pull request 'fish' (#9) from fish into master Konrad Jasiński 2022-01-08 14:22:36 +0100
  • 7b06f6b3a6 Merge branch 'master' into fish #9 Konrad Jasiński 2022-01-08 14:22:26 +0100
  • 102a842f71 Scalanie Matraf 2022-01-08 14:10:19 +0100
  • 8ba06e7539 Scalanie Matraf 2022-01-08 14:10:07 +0100
  • 39711ab8d9 comment out big bubble Thyme1 2022-01-08 14:07:56 +0100
  • 000296afe1 Merge pull request 'add specular lighting based on cw5 earlier shaders' (#6) from lighting into master Mateusz Walas 2022-01-08 14:04:47 +0100
  • 73e2bbff4a change bubble to refract Thyme1 2022-01-02 17:29:41 +0100
  • 62f81b5d34 create bubbles with good rotation Thyme1 2022-01-02 02:22:53 +0100
  • fb55f586f5 bubble is not upside down Thyme1 2022-01-02 01:26:44 +0100
  • 21615e0296 change bubble shaders Thyme1 2022-01-02 00:03:53 +0100
  • 78dbab04f5 change bubble.frag to reflective Thyme1 2022-01-01 14:05:58 +0100
  • 33a09475d2 minor changes Thyme1 2022-01-01 12:35:51 +0100
  • f03ed1fa4b create sphere with nice skybox texture Thyme1 2022-01-01 12:21:15 +0100
  • ce82c3f8ec change bubble texture Thyme1 2021-12-31 20:07:14 +0100
  • b80447f837 change bubble keypoints Thyme1 2021-12-31 19:54:17 +0100
  • d862125ec7 Merge branch 'lighting' into bubbles Thyme1 2021-12-31 19:30:47 +0100
  • bde06c173d create blue bubbles from floor to ceiling Thyme1 2021-12-31 17:01:42 +0100
  • 537681ccaa merge with fish Thyme1 2021-12-31 13:52:46 +0100
  • d5df497f92 Add cursos centering #8 Mateusz Walas 2021-12-31 13:45:16 +0100
  • e79f286293 add blue sphere Thyme1 2021-12-31 13:36:08 +0100
  • 960a6ef21d Add fish scaling Mateusz Walas 2021-12-31 13:30:36 +0100
  • e041b6fceb Changed keyPoints Mateusz Walas 2021-12-31 13:28:10 +0100
  • 3ee0d0d64e Add shoal Mateusz Walas 2021-12-31 12:57:26 +0100
  • 63be4af1be merge with master Thyme1 2021-12-30 18:34:27 +0100
  • 707c5557e4 add specular lighting based on cw5 earlier shaders #7 #6 #5 Thyme1 2021-12-30 18:06:40 +0100
  • c662b48305 change light Thyme1 2021-12-30 14:58:41 +0100
  • 8821c01e2f ryby robia wziu Mateusz Walas 2021-12-30 14:56:31 +0100
  • 1ffaf2b993 change light in shader_tex.frag Thyme1 2021-12-30 14:50:39 +0100
  • 94a77b45b4 add ambient lightning Thyme1 2021-12-30 14:42:41 +0100
  • 17eefb3324 change lightDir Thyme1 2021-12-30 14:27:10 +0100
  • 34c4b58a16 Solve fish error Mateusz Walas 2021-12-30 14:10:58 +0100
  • ac7f096101 Add moving fish with error Mateusz Walas 2021-12-30 13:05:52 +0100
  • fa6074be89 chore: remove debug folders matixezor 2021-12-30 12:49:00 +0100
  • ba468047ba testing refraction Thyme1 2021-12-30 12:14:47 +0100
  • 4ed9db4b96 Merge pull request 'submarine' (#4) from submarine into master Mateusz Walas 2021-12-30 12:11:44 +0100
  • 7dccc9d362 Minor changes #4 #3 Mateusz Walas 2021-12-30 12:08:05 +0100
  • 29872be109 change names from fish to submarine Thyme1 2021-12-29 21:47:09 +0100
  • cad4a437de merge master to fish Thyme1 2021-12-29 21:34:53 +0100