Compare commits
979 Commits
1.7
..
1.8.6511.1
| Author | SHA1 | Date | |
|---|---|---|---|
| c5520f2777 | |||
| 4414398f09 | |||
| 5e5497ff18 | |||
| aaadf3065d | |||
| b134a5567d | |||
| 740a31b7a9 | |||
| 75e25bf1f7 | |||
| 279c80a9ae | |||
| 4dbfc01715 | |||
| 45706be3a6 | |||
| 723423a3fa | |||
| 42de657629 | |||
| 16f1e8a3e1 | |||
| 2c1b2d2b7c | |||
| 19cc33b200 | |||
| 3641e156ee | |||
| 4413af5d20 | |||
| 8c2e7bccaa | |||
| 3e7ac04a88 | |||
| 9bc9d95a22 | |||
| b6e36c0014 | |||
| b6692b4747 | |||
| 62c2e3b8f0 | |||
| d4774a2bfe | |||
| 705856da24 | |||
| ab9cc16529 | |||
| 203f03a597 | |||
| 4fbe210730 | |||
| 6eb431d12c | |||
| 890569ea3b | |||
| d8a1de64d1 | |||
| b92fbcb3bc | |||
| 515ee96a31 | |||
| f19977a956 | |||
| 96f628429c | |||
| 3ecbbcd0a0 | |||
| a01495cde1 | |||
| b7dc0dd004 | |||
| 32b15f90ab | |||
| e795a8b037 | |||
| e551eae30d | |||
| 5f02b4173a | |||
| 568a69081d | |||
| 4dcdd8b5f7 | |||
| 1072b90c5b | |||
| 6aacea99ab | |||
| 5e086809ae | |||
| 361e9a2929 | |||
| b25ee23b14 | |||
| 41ffc16b66 | |||
| 560cf65121 | |||
| 93e26afa05 | |||
| 7653fba381 | |||
| 71fe280464 | |||
| 0845866c4d | |||
| a3b5f4b789 | |||
| 4b6b24f4c5 | |||
| d8079367fd | |||
| 83b9e6e32a | |||
| f8f1c02338 | |||
| 285710360c | |||
| 695c212cf0 | |||
| 05278ca418 | |||
| e31ce787aa | |||
| d379b4c046 | |||
| 261faad93e | |||
| 16554fe742 | |||
| 9f983cff49 | |||
| e53ab10145 | |||
| 692a61c948 | |||
| c83b74c85d | |||
| 171fc276fb | |||
| 446c1edafc | |||
| 03b498546d | |||
| 794b007170 | |||
| 26c2b33fc0 | |||
| 1a87e5a2ca | |||
| daf3671233 | |||
| 5fd808af19 | |||
| ce67c3a98d | |||
| cd2f96e3c0 | |||
| 9ad4997691 | |||
| 37a02e3a7e | |||
| ed732a0189 | |||
| 00492a33a3 | |||
| 56d3b4f012 | |||
| 85b9d93e91 | |||
| 8584d51d9f | |||
| 8714163ee4 | |||
| 525c3a0f29 | |||
| 5acdff02cc | |||
| 0728637ce1 | |||
| 9c3c4fbf54 | |||
| d2508ad902 | |||
| 8a0cd7c30f | |||
| d729eb2b24 | |||
| 36ad821734 | |||
| b66b85d5f4 | |||
| 778b967c61 | |||
| 3f6dd92a68 | |||
| 80d7ac2581 | |||
| af91ce7f3f | |||
| 5f7293d0a1 | |||
| 5cdf1c5764 | |||
| e701cdbee5 | |||
| dc45f46ff4 | |||
| 634b05fc16 | |||
| db28afb591 | |||
| 84c1f6b5de | |||
| 53689063b9 | |||
| c59e872ef2 | |||
| 2b95f11b1f | |||
| fbfe77e386 | |||
| 60ccac31b5 | |||
| d42e315e55 | |||
| 9c2c02c1cf | |||
| 8144db8e13 | |||
| 4ac6a292f7 | |||
| 3e475398e7 | |||
| 81d4501868 | |||
| 1bc7455e09 | |||
| 1e77f3aa5a | |||
| e47e91c223 | |||
| 734f1ee4aa | |||
| 6d38590ad4 | |||
| 76becec094 | |||
| e7a6f39a72 | |||
| 98c5cc2d0f | |||
| c8ad3e3a51 | |||
| 5b25aeda32 | |||
| e5d700692f | |||
| 495378c94d | |||
| bf9701e132 | |||
| 14881494b8 | |||
| c914e33462 | |||
| 35f33b6746 | |||
| e137d31839 | |||
| 2e643347ec | |||
| fb1685fe81 | |||
| 1ddf9ab0e1 | |||
| 8af8d50de1 | |||
| e3093e0e09 | |||
| 02d5609f66 | |||
| b2f9da4113 | |||
| a83b589e12 | |||
| 7578e1dbe3 | |||
| ae79f3ef0b | |||
| f164626c41 | |||
| 354972fd9c | |||
| 082733cb97 | |||
| 97bd90d4be | |||
| e788be46af | |||
| afd56974ef | |||
| 84e04de23d | |||
| 07c0b4567e | |||
| e25448e10e | |||
| d12630d815 | |||
| fb0d70d555 | |||
| c5e1abb08c | |||
| 294b4c4006 | |||
| e1944bce96 | |||
| 369c19bd5d | |||
| 55383c3fa4 | |||
| 926a81c84b | |||
| d331e6b848 | |||
| ce07edd1ec | |||
| 0b0115aa10 | |||
| 3696501050 | |||
| 08e88587e6 | |||
| 1017472957 | |||
| f8a845f813 | |||
| 551337f7a0 | |||
| 6929a91312 | |||
| 069445b94e | |||
| 09f5ac0ed6 | |||
| 9e962dcb89 | |||
| 5525e895cf | |||
| 21d5e63b93 | |||
| b8a287c4d5 | |||
| 24e56a825e | |||
| f60446c37b | |||
| ad7bdae5fa | |||
| 35e34997c9 | |||
| 6c2ed1ace7 | |||
| 1c0071ad85 | |||
| 0b801225e1 | |||
| 5f96a74ce2 | |||
| 07522823e5 | |||
| 981fe9482c | |||
| c08ca33a9a | |||
| 2c0d5e45f1 | |||
| 1f35f9536d | |||
| da9d8887b2 | |||
| 68acb33367 | |||
| 9392515b17 | |||
| 9a27ba3cdc | |||
| b821bb7a54 | |||
| 51504d0d92 | |||
| e5e675f089 | |||
| c366a9793c | |||
| 5633d1a18a | |||
| 96f76fb14f | |||
| 6709fcd95d | |||
| 495de38c48 | |||
| fd756f7bae | |||
| 4cd788cedc | |||
| 93d82f761a | |||
| 67c0c9bd9a | |||
| 33b8cca54b | |||
| 31939164c8 | |||
| 4b9f50add0 | |||
| 876c383af0 | |||
| 9251b80b78 | |||
| 1a9f21396a | |||
| 5660749f80 | |||
| 8398b35b0d | |||
| a3c088bb05 | |||
| 8f63f686c4 | |||
| 6ccec2f5ff | |||
| 3939444e05 | |||
| 70b2e4aa5a | |||
| 9e11d45c1c | |||
| d6f0062198 | |||
| 6b35c0a161 | |||
| 292694d89c | |||
| 57568d9cc3 | |||
| 4f1e8add76 | |||
| 5082fa3e51 | |||
| fc37cb3986 | |||
| 9e54827cb3 | |||
| bfbabbc395 | |||
| 127e8b077d | |||
| 35d1d97840 | |||
| 911251cb20 | |||
| fa8620a25b | |||
| 77850f91b8 | |||
| 82238c105e | |||
| eb11301a03 | |||
| 155b4a3ba9 | |||
| 71dad84908 | |||
| 388b64a46d | |||
| cf3145273f | |||
| 1a68a52611 | |||
| 41637232ea | |||
| 211da6d8e7 | |||
| be252b9293 | |||
| 26689439d5 | |||
| 29cd6e2dda | |||
| 4b9bfc5bb4 | |||
| cf44d6580d | |||
| 2b824ce22a | |||
| 24299dc5cc | |||
| eb8db60ead | |||
| 2d71a7a45d | |||
| 5e60d9d267 | |||
| 8c722d6bba | |||
| 12e2b8156f | |||
| 34f35ebaac | |||
| 3b502086f8 | |||
| ed21876bb8 | |||
| e606ccec57 | |||
| 91298fee19 | |||
| 795527576b | |||
| 19eea57bac | |||
| ae189db87e | |||
| 9c553a619a | |||
| 19405e71ed | |||
| dab5ad3f08 | |||
| d77586a771 | |||
| 8e6f526bd9 | |||
| 46abc136cf | |||
| 16aef0f705 | |||
| b847c2d056 | |||
| 700ed25d3d | |||
| c60244878d | |||
| c6aa18c47c | |||
| 8d149b94f1 | |||
| f81e89d7d4 | |||
| 7652feabfa | |||
| 7ec490443e | |||
| c6bb8f1784 | |||
| a549733811 | |||
| 13bf15198b | |||
| 8a7ddae76b | |||
| 3ba6867cd2 | |||
| 7545e49284 | |||
| 2b82da9511 | |||
| 574e0ab1f8 | |||
| 6d792f1f74 | |||
| f4033578c3 | |||
| 66b68bff27 | |||
| fc29d687b5 | |||
| 94520d30ad | |||
| e12919da98 | |||
| 83e8f8cb94 | |||
| b4d3eeb771 | |||
| a4e693b6a6 | |||
| 806fee7011 | |||
| 9d0b659520 | |||
| d719c381ea | |||
| 8f2bc17a94 | |||
| 4ee15f95bb | |||
| 0a9f746abb | |||
| 1bbb2727b8 | |||
| 4a5ded0849 | |||
| eac553a992 | |||
| b00b5bed00 | |||
| 92c109c003 | |||
| fc029b018e | |||
| d390938fb6 | |||
| 584c073df1 | |||
| fef2e09915 | |||
| f4a352ec8d | |||
| 41cff47ca3 | |||
| aca7913c93 | |||
| cee6aad0ef | |||
| 31c633d25c | |||
| a0e234ade1 | |||
| 9fe874cc5b | |||
| 816fb9da6f | |||
| 56a33e4c98 | |||
| d3b0da3fdd | |||
| 006a41b0da | |||
| 8de2249ed8 | |||
| 9518d77da9 | |||
| 6d98bc5ef8 | |||
| ed3ac0af8e | |||
| c561d684eb | |||
| 07e25bb24c | |||
| 2e305da286 | |||
| 28da656ed1 | |||
| f0c2e65b5c | |||
| d5f4254a73 | |||
| b506295b7b | |||
| 557d39aea4 | |||
| 8964b8907c | |||
| d4e0023925 | |||
| 5ec737ef80 | |||
| e20ddc83d8 | |||
| e4583907e2 | |||
| 0604a0393d | |||
| 21edb43bb1 | |||
| bbbf690640 | |||
| 32501101b1 | |||
| efd5561713 | |||
| 73cb792989 | |||
| b4fe3a44aa | |||
| 44ce444932 | |||
| 285fef97a2 | |||
| 25c1fcbf51 | |||
| 8e54a79470 | |||
| ab81cf17ad | |||
| 88bb8fae3a | |||
| 63d49adc19 | |||
| 33bd6a56ce | |||
| 294c25ae27 | |||
| 02d27b631b | |||
| dcafee530e | |||
| 01daa2d66a | |||
| 1d68662592 | |||
| 79f623a39e | |||
| b2f0dc2cc5 | |||
| b9b7c4433e | |||
| d7d9da5279 | |||
| d1a061a37e | |||
| bbe08be462 | |||
| 5fdf1789ce | |||
| 04761c69f1 | |||
| 84d3103278 | |||
| 2175f46a10 | |||
| b6879e7688 | |||
| 5fbbf4ae72 | |||
| a19ae042f8 | |||
| 760ef3b8ed | |||
| 1ff462461e | |||
| 23d1b3746d | |||
| 2100f56ecc | |||
| b25e932972 | |||
| 2873f1c4f9 | |||
| 161773a8be | |||
| 4df56cb506 | |||
| 508c07c5ea | |||
| dce0274a1c | |||
| 119a1e2b03 | |||
| 22a3f9565f | |||
| 53bd576ade | |||
| 901b043909 | |||
| e68c736607 | |||
| 511eb25451 | |||
| aabc9f51bb | |||
| fc4163524c | |||
| 735d65e14d | |||
| f1bc161ad2 | |||
| f1b133bd60 | |||
| 7428ecfe63 | |||
| 6905382310 | |||
| 470c108ed9 | |||
| 2d5d001a44 | |||
| 2f87b87b45 | |||
| 0a0bb997e4 | |||
| 14902dc29e | |||
| 7f935ab57a | |||
| f4d236d353 | |||
| 253f7cfce8 | |||
| 859c420d76 | |||
| e2dd9832ba | |||
| 0ee5ef8cf5 | |||
| f1fe83ca81 | |||
| 996a2cb09e | |||
| 607859c196 | |||
| 8898c20ad1 | |||
| 2df3d0f747 | |||
| 124832b076 | |||
| 1dfc8b0a47 | |||
| f771b0cd59 | |||
| 8bcf4fdaf0 | |||
| de4ee1372f | |||
| 84e7c096de | |||
| 696437d6d0 | |||
| e282717a0a | |||
| ee4fc7c201 | |||
| eb12c630a7 | |||
| 01d123b099 | |||
| a72d20e3ca | |||
| 8351a75676 | |||
| 387f84d9d7 | |||
| 50e75e4e7b | |||
| 318b00c617 | |||
| f20805e567 | |||
| fa606ce5f6 | |||
| d7dbc0fbdc | |||
| f3e6b74043 | |||
| 0a7662a37b | |||
| 8ee2bf8d76 | |||
| 97cb8d1b61 | |||
| 149a6a29f8 | |||
| 9a21cfd092 | |||
| e5cfd872b2 | |||
| 8fa8eeb094 | |||
| 9e747eb98a | |||
| 8e6bd07322 | |||
| e255778c07 | |||
| 1cb88bdc63 | |||
| de86ec0ecc | |||
| 8c1ff1e57a | |||
| 621281ab3a | |||
| 0e5bd425b2 | |||
| 008ed3fb03 | |||
| 85c7357b25 | |||
| b0270d016e | |||
| 9c9aabcae3 | |||
| e446ba69e5 | |||
| 3b39693c9e | |||
| 04da732da9 | |||
| 358220b0b5 | |||
| 10180de9c6 | |||
| e12446e951 | |||
| 528c51cf6a | |||
| d0dfff1287 | |||
| 45c331ba58 | |||
| db65b8037d | |||
| 8aaf7417cc | |||
| 4ad5eb26d6 | |||
| 504a997f12 | |||
| 668b03a409 | |||
| eedc348032 | |||
| c1400748b0 | |||
| 0c0c4e6136 | |||
| ec0849c908 | |||
| d1f0a52967 | |||
| b9a503c3bd | |||
| 832151223b | |||
| e985d10b62 | |||
| b41dc40c78 | |||
| f8d9817911 | |||
| 0035c347f4 | |||
| eba2dc295e | |||
| 643fc78dd4 | |||
| 91ba8458ee | |||
| 056deb58ad | |||
| dd9733fdf1 | |||
| 5cada42842 | |||
| 4ebfe5a38e | |||
| 2fd47f91e2 | |||
| e8e52da51c | |||
| 47d266a713 | |||
| 2de890ca6a | |||
| 0d1dbd8845 | |||
| cb0969893d | |||
| 4c082ef17f | |||
| ed30cd0238 | |||
| 7e10baf5ea | |||
| d2b8d14ca7 | |||
| 324b2e7f66 | |||
| ed3d2c2748 | |||
| 52642d4d6c | |||
| a061afd840 | |||
| a5a16c3192 | |||
| 71627f1bbd | |||
| 4b24b79e90 | |||
| 2cce7522de | |||
| ab07bab958 | |||
| dad3d185f1 | |||
| f344c68f48 | |||
| 9335925b48 | |||
| 0d6f85ba6c | |||
| f5be8e0e77 | |||
| a2b8312fba | |||
| 027d29c6cd | |||
| 45aa0e1b65 | |||
| 4df8a12666 | |||
| 7e43cb09e0 | |||
| a6d7400422 | |||
| 47313eacc8 | |||
| 2a1bd5cbe8 | |||
| d97772383e | |||
| 636b2c91cc | |||
| d76b5234c5 | |||
| dfbde5f8eb | |||
| b8044dff76 | |||
| 45241d63bd | |||
| 912437c456 | |||
| e165c87e5a | |||
| fcfde1e964 | |||
| 5e218c8da9 | |||
| f0f065f983 | |||
| cf07659757 | |||
| 7a21c37603 | |||
| c81ef9b26f | |||
| c305bed829 | |||
| 37dfdad7e2 | |||
| 6a11d4d10a | |||
| 0cf39c9f8d | |||
| 368dac5e4b | |||
| cc157b172d | |||
| 5de5e576e5 | |||
| 09532acf29 | |||
| 01c3dd8d09 | |||
| 9e269b8e58 | |||
| b931020e5c | |||
| c3faabaa0f | |||
| 12f7370caf | |||
| c140cc4e7c | |||
| 85f2910718 | |||
| 42b4443e14 | |||
| f04f1cc90e | |||
| f0f8da3c09 | |||
| 9a5db2ff8e | |||
| 0b2fcff4ea | |||
| c7a449fe1c | |||
| 5fc7c6e190 | |||
| b5e23f0096 | |||
| 7538296775 | |||
| fe7cc62728 | |||
| 43f344ee13 | |||
| f730657518 | |||
| 75b7eaf345 | |||
| 355835439a | |||
| defe7454ce | |||
| f1c0aea10f | |||
| db7dfdb0b1 | |||
| 42363e411e | |||
| ebcc864b06 | |||
| 3958a4740f | |||
| 31437e6dde | |||
| 6f4e599cc2 | |||
| 6548ca1148 | |||
| 07e93e261e | |||
| f044569b67 | |||
| 36beac5154 | |||
| f36dc0c5af | |||
| 04f1c9a59b | |||
| 46441f6a03 | |||
| 196a4ffe49 | |||
| 4a19657e75 | |||
| 9c5c9cb76f | |||
| c646007882 | |||
| 080202cf95 | |||
| 87c66b0168 | |||
| da1b2f0c07 | |||
| d08843900e | |||
| f9ca69d8a9 | |||
| 082768d08c | |||
| eed780a0b0 | |||
| cfb8350c65 | |||
| a38d1ad7cc | |||
| e75902e900 | |||
| d1f40d1c47 | |||
| 2042525e92 | |||
| 8441726da7 | |||
| c67d352065 | |||
| 25ce571637 | |||
| 17361d6bc1 | |||
| 9f279d4b5e | |||
| 6cd9895427 | |||
| a9259b20a4 | |||
| 169024ae47 | |||
| 13a3035094 | |||
| 7c9218840d | |||
| 876cb4f0c3 | |||
| 5fc768bbbd | |||
| 9da9a122b8 | |||
| 367569b7b1 | |||
| 6954a488ea | |||
| 0c762bb12f | |||
| c039980436 | |||
| 27f4451c0c | |||
| 83476b6c7a | |||
| c0e3b27880 | |||
| d6a51dc06c | |||
| 983ae8dcb7 | |||
| 6272caffa5 | |||
| 5a50ec592f | |||
| 873be6ac17 | |||
| 465c14c04a | |||
| d33ff4306f | |||
| 6528e14f37 | |||
| 0776529a57 | |||
| 74203e63c8 | |||
| 0d8464dbd9 | |||
| 40632a4a88 | |||
| 6d757946c5 | |||
| f1055aa0e3 | |||
| 479a917c59 | |||
| 060440195d | |||
| feebe4f59a | |||
| 2b63a8ae4c | |||
| b8d848bfc9 | |||
| e6d90f7371 | |||
| ee38227174 | |||
| b148303b7d | |||
| 9b7b9f4fdb | |||
| 84927c79fc | |||
| c196e704bb | |||
| b2621ff799 | |||
| 756a991c2c | |||
| 2be0765158 | |||
| cc2b2e5e17 | |||
| 84efd05e7e | |||
| b2d0afd4ef | |||
| 741682b5e7 | |||
| bc922c03e0 | |||
| f9448c3b42 | |||
| cff047998c | |||
| 647e25ea74 | |||
| 0793ebc132 | |||
| cde9fe8f9c | |||
| 532a23b4e0 | |||
| 5b8846c8f0 | |||
| d4a483e656 | |||
| 1d4bb7a4f4 | |||
| b69d54a5ca | |||
| 969d0390ce | |||
| dec9fbd74b | |||
| 7d4004a42a | |||
| 8488a8d387 | |||
| 8aa402bcb9 | |||
| 7f95dab511 | |||
| 54658cbb3b | |||
| 245cf63b0b | |||
| 7a802a2eee | |||
| 22600a2c29 | |||
| 7fd6c43f84 | |||
| fa58b171ec | |||
| 320024399d | |||
| 9bad65e359 | |||
| 1f8314b663 | |||
| 2a03206778 | |||
| 49beb2c7ba | |||
| e7b0375a0e | |||
| 9e5f866b75 | |||
| 3dc34e2d9c | |||
| 5bad7c79c4 | |||
| af8e1e527f | |||
| bb00d29098 | |||
| dcda7d96bb | |||
| a0741dd9de | |||
| ef41ad6074 | |||
| 20dbe15651 | |||
| 2625144945 | |||
| 1b33a2aa0d | |||
| 10bed94357 | |||
| d28b0ab2a6 | |||
| 9e38a01acc | |||
| 69b7a10c1f | |||
| ecf593e7a4 | |||
| 2a70d0c011 | |||
| 2853af20f6 | |||
| c60058758b | |||
| 74d348706c | |||
| 18fc6ebd39 | |||
| 9874b753cb | |||
| ee19bca7e4 | |||
| 39e7be6322 | |||
| b85f471fcb | |||
| f306d34a6e | |||
| 045f49d2d6 | |||
| d5e9ad2147 | |||
| ce658acb22 | |||
| 0d3b81b8ca | |||
| a0e127b9cc | |||
| 19ddcad16f | |||
| e5160f2885 | |||
| afe9b15899 | |||
| 34583d7a55 | |||
| 7f95748351 | |||
| 37fe11e19f | |||
| 8e3123a129 | |||
| b4186052df | |||
| 6d6b678b29 | |||
| 40e75465a3 | |||
| 3bdc70a4c6 | |||
| 64e3db3a98 | |||
| e6389511ff | |||
| 2c5095e0a1 | |||
| 503bcdcf27 | |||
| 0eb4e0205e | |||
| 2935b8ba10 | |||
| 82c8e39dfd | |||
| ec6fb459bb | |||
| 9a70f698b9 | |||
| 5b3e7f0bf8 | |||
| 52da42e62e | |||
| 1da803c5fb | |||
| 697db443ac | |||
| 76cf935583 | |||
| cae9ddfa36 | |||
| f1d6d71f6c | |||
| 361cb914f3 | |||
| 8922b5cd79 | |||
| d126f5bc55 | |||
| 2c76785bf0 | |||
| 1094abce5a | |||
| b7cc4c768f | |||
| d807e9bfe0 | |||
| fa0e2fe0be | |||
| e54cbbd5a3 | |||
| e98eed9f62 | |||
| a82ea17864 | |||
| 6289b9d15a | |||
| 1e061b77af | |||
| afb5edb824 | |||
| 9fd7a231ca | |||
| 0b7c187630 | |||
| 8c2a156e1f | |||
| 7f420c0131 | |||
| eca17c7799 | |||
| 14a4c92aa8 | |||
| a24a9d2094 | |||
| af0439f3ce | |||
| 6d58883454 | |||
| 0075184a99 | |||
| b6337c748c | |||
| 7f4d2d8db6 | |||
| 254ef30fea | |||
| 78b13ace5c | |||
| 8ec4030e1a | |||
| 60fd4702a6 | |||
| d9ca3e5b57 | |||
| 37da55896c | |||
| 976d0992df | |||
| 6fb6769574 | |||
| a3b3fd2efe | |||
| aeb741e032 | |||
| 6fb5c43e2a | |||
| b1087c162a | |||
| b4f5623537 | |||
| 6d847c12df | |||
| f145809765 | |||
| 9c917b2f4d | |||
| ba70f351ef | |||
| 284c971ec0 | |||
| 7e948de2db | |||
| a848fd027e | |||
| 28e64da4b4 | |||
| 7ddcf198bb | |||
| 70298e8ae8 | |||
| 15bbd13c72 | |||
| 7f5dd78349 | |||
| 2ba230609c | |||
| da7840cb6c | |||
| a231a6cac6 | |||
| 05d6767dd3 | |||
| ada90fa846 | |||
| 6f78a9775e | |||
| 57e306ea42 | |||
| 33d2dfc5c9 | |||
| 3de7b62dfc | |||
| 408c8fbdf0 | |||
| af91c13b5c | |||
| e04c98020c | |||
| 35832e5b1c | |||
| 8e331e4d13 | |||
| 7d07ed20ea | |||
| 1b9984c728 | |||
| c7baded2db | |||
| df33de7176 | |||
| 85afde43af | |||
| c49c875165 | |||
| a102bad87e | |||
| 42b20b4e76 | |||
| 5158de4ac6 | |||
| a5d0916f93 | |||
| 6178cb1bf4 | |||
| 329bab1102 | |||
| 31adfd2c9c | |||
| 8bd84e0616 | |||
| ab51ca6e70 | |||
| 8273656793 | |||
| 045943ef27 | |||
| e0cb94ec74 | |||
| a8913d89ac | |||
| 07de7a26dd | |||
| 8bcc526dd6 | |||
| 967569c3e2 | |||
| 5cf20b8eee | |||
| 6a2d7e9444 | |||
| 4839ef5ddc | |||
| 8bff9556de | |||
| 57d4f0ff7d | |||
| 826a330f63 | |||
| bf6cb90a78 | |||
| d016305690 | |||
| 9077e0cf22 | |||
| 4b6ada7289 | |||
| 1e797c244f | |||
| 343d7b4973 | |||
| 8841a603f6 | |||
| f10840efb4 | |||
| e851d18227 | |||
| 21c4667f8c | |||
| 8174e8ab77 | |||
| b275ffc146 | |||
| b4c23c969a | |||
| 78c27a8046 | |||
| ef930375b4 | |||
| 245eaef2b9 | |||
| 7d633865ac | |||
| 4a8c94e9d4 | |||
| 4d9ef32abc | |||
| 4a42aa8c44 | |||
| 55066cd738 | |||
| 35becc674a | |||
| f2d1b75d1f | |||
| 3c6ed303fe | |||
| fe711405ac | |||
| 4d8b8e5311 | |||
| 87addf8197 | |||
| 8c1f727d9b | |||
| 435341abd3 | |||
| 0d5d11e184 | |||
| 3133c6fb1b | |||
| 7eb0600549 | |||
| 25b69449bc | |||
| 101e33868b | |||
| c41d1aaec5 | |||
| bd34540086 | |||
| b2f9b9e14d | |||
| 53a2ebbd17 | |||
| e4c8639697 | |||
| 4e2f0cd22c | |||
| 4497b2ca7d | |||
| ac090d690e | |||
| e4df1fc756 | |||
| c6c53baff2 | |||
| 5958b2f4ea | |||
| 4726552d8b | |||
| 57dee19f75 | |||
| 3c19262574 | |||
| ed6220005f | |||
| 799fde1a26 | |||
| 3761eb5a1e | |||
| 8eb68a905e | |||
| 8c45659b2a | |||
| f65ded4501 | |||
| 52d4dff587 | |||
| 13cc45c3d7 | |||
| bcce52ca22 | |||
| eb30344e77 | |||
| d8f110793b | |||
| 2f11f5f5ab | |||
| 34ab33259b | |||
| 1746db60e6 | |||
| 3e0496122c | |||
| 74f5d14ec9 | |||
| 4fb2d3f7f3 | |||
| 1f6b63291d | |||
| 7d36cdb67d | |||
| 360c75355c | |||
| 6ab1663a14 | |||
| 23b71e7d3e | |||
| 74baffd76c | |||
| 666e6d880b | |||
| 0569b6dac8 | |||
| 2f019d4264 | |||
| 29eb3954c5 | |||
| 95f5e31e48 | |||
| 7b63c7016c | |||
| 3c5035d3e9 | |||
| 3d139a241a | |||
| 623f478b44 | |||
| cdbe59a3fb | |||
| d3840bb1f3 | |||
| 3365fb5afc | |||
| 41bbce56f6 | |||
| a3bc394e4e | |||
| b9f4d4120c | |||
| 47a25c7828 | |||
| 44f0b5a1de | |||
| 03d629f0e1 | |||
| f16406df8a | |||
| 06ad316f94 | |||
| 76f5712c79 | |||
| 37d4b0f863 | |||
| f5acba7d43 | |||
| 6c6e8be20e | |||
| aa4e1222d7 | |||
| e4dc6d7295 | |||
| 3824b19c8b | |||
| 9de408e4e8 | |||
| 2ac8480df4 | |||
| 44e55cc8b6 | |||
| c4c3a3a5e8 | |||
| de55ad90b7 | |||
| 1bc6842831 | |||
| 1bb68f2c0c | |||
| 640f380237 | |||
| 6af6edb4fe | |||
| 6cad1e3309 | |||
| ee6a311406 | |||
| 80a30f504a | |||
| 3904756e26 | |||
| 0556c30ac5 | |||
| 5df1d3ddfd | |||
| 2bcdb5b05b | |||
| 253c4c27ab | |||
| 41d513e5d2 | |||
| 1c23f0f5b4 | |||
| 5559d4f84d | |||
| 67a385a431 | |||
| 5afb00e2c6 | |||
| 0fea7aad92 | |||
| b88233a65d | |||
| 95735035f3 | |||
| e3364faf8e | |||
| e55cdd91d5 | |||
| 8cc7c5d3d9 | |||
| 0acf352d40 | |||
| 390621cb10 | |||
| ff64fdb503 | |||
| ec02058712 | |||
| 4fb35579b5 | |||
| 39aebc6c85 | |||
| f287ed6c30 | |||
| cf5f501ab7 | |||
| 9d1b287cd7 | |||
| fff8a1e8a6 | |||
| 6fb411cee3 | |||
| 040c9c20ac | |||
| 86c2406d52 | |||
| 9c60da278f | |||
| 0f5a177be2 | |||
| cfec5bb801 | |||
| 4f67d14261 | |||
| 0a12724974 | |||
| bfab9d68db | |||
| 7b601723c0 | |||
| 809b9e3a7a | |||
| 29e1d9855a | |||
| 4451f5feb2 | |||
| 0b3b32195a | |||
| 394a3696af | |||
| f71f214f36 | |||
| d107947ba9 | |||
| f11ea02550 | |||
| 78ffcc8ae5 | |||
| 3bfa37019e | |||
| c4c55bfb61 | |||
| 2607e0e187 |
@@ -19,7 +19,7 @@ jobs:
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
with:
|
||||
dotnet-version: 7.0.x
|
||||
dotnet-version: 8.0.x
|
||||
- name: Setup .NET Workload
|
||||
run: |
|
||||
dotnet workload install android
|
||||
@@ -33,4 +33,4 @@ jobs:
|
||||
git lfs pull
|
||||
- name: Build
|
||||
run: |
|
||||
.\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=7 -arch=ARM64 -platform=Android -configuration=Release -buildtargets=FlaxGame
|
||||
.\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=ARM64 -platform=Android -configuration=Release -buildtargets=FlaxGame
|
||||
|
||||
@@ -19,7 +19,7 @@ jobs:
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
with:
|
||||
dotnet-version: 7.0.x
|
||||
dotnet-version: 8.0.x
|
||||
- name: Setup .NET Workload
|
||||
run: |
|
||||
dotnet workload install ios
|
||||
@@ -33,4 +33,4 @@ jobs:
|
||||
git lfs pull
|
||||
- name: Build
|
||||
run: |
|
||||
./Development/Scripts/Mac/CallBuildTool.sh -build -log -dotnet=7 -arch=ARM64 -platform=iOS -configuration=Release -buildtargets=FlaxGame
|
||||
./Development/Scripts/Mac/CallBuildTool.sh -build -log -dotnet=8 -arch=ARM64 -platform=iOS -configuration=Release -buildtargets=FlaxGame
|
||||
|
||||
@@ -25,7 +25,7 @@ jobs:
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
with:
|
||||
dotnet-version: 7.0.x
|
||||
dotnet-version: 8.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
@@ -36,7 +36,7 @@ jobs:
|
||||
git lfs pull
|
||||
- name: Build
|
||||
run: |
|
||||
./Development/Scripts/Linux/CallBuildTool.sh -build -log -printSDKs -dotnet=7 -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxEditor
|
||||
./Development/Scripts/Linux/CallBuildTool.sh -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxEditor
|
||||
|
||||
# Game
|
||||
game-linux:
|
||||
@@ -53,7 +53,7 @@ jobs:
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
with:
|
||||
dotnet-version: 7.0.x
|
||||
dotnet-version: 8.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
@@ -64,4 +64,4 @@ jobs:
|
||||
git lfs pull
|
||||
- name: Build
|
||||
run: |
|
||||
./Development/Scripts/Linux/CallBuildTool.sh -build -log -printSDKs -dotnet=7 -arch=x64 -platform=Linux -configuration=Release -buildtargets=FlaxGame
|
||||
./Development/Scripts/Linux/CallBuildTool.sh -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Linux -configuration=Release -buildtargets=FlaxGame
|
||||
|
||||
@@ -9,7 +9,7 @@ jobs:
|
||||
|
||||
# Editor
|
||||
editor-mac:
|
||||
name: Editor (Mac, Development x64)
|
||||
name: Editor (Mac, Development ARM64)
|
||||
runs-on: "macos-latest"
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
@@ -19,7 +19,7 @@ jobs:
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
with:
|
||||
dotnet-version: 7.0.x
|
||||
dotnet-version: 8.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
@@ -30,11 +30,11 @@ jobs:
|
||||
git lfs pull
|
||||
- name: Build
|
||||
run: |
|
||||
./Development/Scripts/Mac/CallBuildTool.sh -build -log -printSDKs -dotnet=7 -arch=x64 -platform=Mac -configuration=Development -buildtargets=FlaxEditor
|
||||
./Development/Scripts/Mac/CallBuildTool.sh -build -log -printSDKs -dotnet=8 -arch=ARM64 -platform=Mac -configuration=Development -buildtargets=FlaxEditor
|
||||
|
||||
# Game
|
||||
game-mac:
|
||||
name: Game (Mac, Release x64)
|
||||
name: Game (Mac, Release ARM64)
|
||||
runs-on: "macos-latest"
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
@@ -44,7 +44,7 @@ jobs:
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
with:
|
||||
dotnet-version: 7.0.x
|
||||
dotnet-version: 8.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
@@ -55,4 +55,4 @@ jobs:
|
||||
git lfs pull
|
||||
- name: Build
|
||||
run: |
|
||||
./Development/Scripts/Mac/CallBuildTool.sh -build -log -printSDKs -dotnet=7 -arch=x64 -platform=Mac -configuration=Release -buildtargets=FlaxGame
|
||||
./Development/Scripts/Mac/CallBuildTool.sh -build -log -printSDKs -dotnet=8 -arch=ARM64 -platform=Mac -configuration=Release -buildtargets=FlaxGame
|
||||
|
||||
@@ -19,7 +19,7 @@ jobs:
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
with:
|
||||
dotnet-version: 7.0.x
|
||||
dotnet-version: 8.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
@@ -30,7 +30,7 @@ jobs:
|
||||
git lfs pull
|
||||
- name: Build
|
||||
run: |
|
||||
.\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=7 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxEditor
|
||||
.\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxEditor
|
||||
|
||||
# Game
|
||||
game-windows:
|
||||
@@ -44,7 +44,7 @@ jobs:
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
with:
|
||||
dotnet-version: 7.0.x
|
||||
dotnet-version: 8.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
@@ -55,4 +55,4 @@ jobs:
|
||||
git lfs pull
|
||||
- name: Build
|
||||
run: |
|
||||
.\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=7 -arch=x64 -platform=Windows -configuration=Release -buildtargets=FlaxGame
|
||||
.\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Release -buildtargets=FlaxGame
|
||||
|
||||
@@ -26,7 +26,7 @@ jobs:
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
with:
|
||||
dotnet-version: 7.0.x
|
||||
dotnet-version: 8.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
@@ -59,7 +59,7 @@ jobs:
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
with:
|
||||
dotnet-version: 7.0.x
|
||||
dotnet-version: 8.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
@@ -95,7 +95,7 @@ jobs:
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
with:
|
||||
dotnet-version: 7.0.x
|
||||
dotnet-version: 8.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
@@ -129,7 +129,7 @@ jobs:
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
with:
|
||||
dotnet-version: 7.0.x
|
||||
dotnet-version: 8.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
@@ -159,14 +159,14 @@ jobs:
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
with:
|
||||
dotnet-version: 7.0.x
|
||||
dotnet-version: 8.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
dotnet workload --info
|
||||
- name: Build
|
||||
run: |
|
||||
./PackageEditor.command -arch=x64 -platform=Mac -deployOutput=Output
|
||||
./PackageEditor.command -arch=ARM64 -platform=Mac -deployOutput=Output
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
@@ -187,14 +187,14 @@ jobs:
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
with:
|
||||
dotnet-version: 7.0.x
|
||||
dotnet-version: 8.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
dotnet workload --info
|
||||
- name: Build
|
||||
run: |
|
||||
./PackagePlatforms.command -arch=x64 -platform=Mac -deployOutput=Output
|
||||
./PackagePlatforms.command -arch=ARM64 -platform=Mac -deployOutput=Output
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
|
||||
+11
-11
@@ -17,7 +17,7 @@ jobs:
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
with:
|
||||
dotnet-version: 7.0.x
|
||||
dotnet-version: 8.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
@@ -34,21 +34,21 @@ jobs:
|
||||
sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev
|
||||
- name: Build
|
||||
run: |
|
||||
./GenerateProjectFiles.sh -vs2022 -log -verbose -printSDKs -dotnet=7
|
||||
./Development/Scripts/Linux/CallBuildTool.sh -build -log -dotnet=7 -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxTestsTarget
|
||||
./GenerateProjectFiles.sh -vs2022 -log -verbose -printSDKs -dotnet=8
|
||||
./Development/Scripts/Linux/CallBuildTool.sh -build -log -dotnet=8 -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxTestsTarget
|
||||
dotnet msbuild Source/Tools/Flax.Build.Tests/Flax.Build.Tests.csproj /m /t:Restore,Build /p:Configuration=Debug /p:Platform=AnyCPU /nologo
|
||||
dotnet msbuild Source/Tools/Flax.Build.Tests/Flax.Build.Tests.csproj /m /t:Restore,Build /p:Configuration=Debug /p:Platform=AnyCPU /nologo
|
||||
- name: Test
|
||||
run: |
|
||||
${GITHUB_WORKSPACE}/Binaries/Editor/Linux/Development/FlaxTests
|
||||
dotnet test -f net7.0 Binaries/Tests/Flax.Build.Tests.dll
|
||||
dotnet test -f net8.0 Binaries/Tests/Flax.Build.Tests.dll
|
||||
cp Binaries/Editor/Linux/Development/FlaxEngine.CSharp.dll Binaries/Tests
|
||||
cp Binaries/Editor/Linux/Development/FlaxEngine.CSharp.runtimeconfig.json Binaries/Tests
|
||||
cp Binaries/Editor/Linux/Development/Newtonsoft.Json.dll Binaries/Tests
|
||||
dotnet test -f net7.0 Binaries/Tests/FlaxEngine.CSharp.dll
|
||||
dotnet test -f net8.0 Binaries/Tests/FlaxEngine.CSharp.dll
|
||||
- name: Test UseLargeWorlds
|
||||
run: |
|
||||
./Development/Scripts/Linux/CallBuildTool.sh -build -log -dotnet=7 -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxTestsTarget -UseLargeWorlds=true
|
||||
./Development/Scripts/Linux/CallBuildTool.sh -build -log -dotnet=8 -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxTestsTarget -UseLargeWorlds=true
|
||||
${GITHUB_WORKSPACE}/Binaries/Editor/Linux/Development/FlaxTests
|
||||
|
||||
# Tests on Windows
|
||||
@@ -61,7 +61,7 @@ jobs:
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
with:
|
||||
dotnet-version: 7.0.x
|
||||
dotnet-version: 8.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
@@ -72,14 +72,14 @@ jobs:
|
||||
git lfs pull
|
||||
- name: Build
|
||||
run: |
|
||||
.\GenerateProjectFiles.bat -vs2022 -log -verbose -printSDKs -dotnet=7
|
||||
.\Development\Scripts\Windows\CallBuildTool.bat -build -log -dotnet=7 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxTestsTarget
|
||||
.\GenerateProjectFiles.bat -vs2022 -log -verbose -printSDKs -dotnet=8
|
||||
.\Development\Scripts\Windows\CallBuildTool.bat -build -log -dotnet=8 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxTestsTarget
|
||||
dotnet msbuild Source\Tools\Flax.Build.Tests\Flax.Build.Tests.csproj /m /t:Restore,Build /p:Configuration=Debug /p:Platform=AnyCPU /nologo
|
||||
- name: Test
|
||||
run: |
|
||||
.\Binaries\Editor\Win64\Development\FlaxTests.exe
|
||||
dotnet test -f net7.0 Binaries\Tests\Flax.Build.Tests.dll
|
||||
dotnet test -f net8.0 Binaries\Tests\Flax.Build.Tests.dll
|
||||
xcopy /y Binaries\Editor\Win64\Development\FlaxEngine.CSharp.dll Binaries\Tests
|
||||
xcopy /y Binaries\Editor\Win64\Development\FlaxEngine.CSharp.runtimeconfig.json Binaries\Tests
|
||||
xcopy /y Binaries\Editor\Win64\Development\Newtonsoft.Json.dll Binaries\Tests
|
||||
dotnet test -f net7.0 Binaries\Tests\FlaxEngine.CSharp.dll
|
||||
dotnet test -f net8.0 Binaries\Tests\FlaxEngine.CSharp.dll
|
||||
|
||||
@@ -11,7 +11,6 @@ Source/*.Gen.*
|
||||
Source/*.csproj
|
||||
/Package_*/
|
||||
!Source/Engine/Debug
|
||||
/Source/Platforms/Editor/Linux/Mono/etc/mono/registry
|
||||
PackageEditor_Cert.command
|
||||
PackageEditor_Cert.bat
|
||||
PackagePlatforms_Cert.bat
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
@0// Deferred Shading: Defines
|
||||
@1// Deferred Shading: Includes
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
@0// Distortion: Defines
|
||||
@1// Distortion: Includes
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
@0// Forward Shading: Defines
|
||||
#define MAX_LOCAL_LIGHTS 4
|
||||
@@ -133,6 +133,8 @@ void PS_Forward(
|
||||
// Add lighting (apply ambient occlusion)
|
||||
output.rgb += light.rgb * gBuffer.AO;
|
||||
|
||||
#endif
|
||||
|
||||
#if USE_FOG
|
||||
// Calculate exponential height fog
|
||||
float4 fog = GetExponentialHeightFog(ExponentialHeightFog, materialInput.WorldPosition, ViewPos, 0);
|
||||
@@ -148,7 +150,5 @@ void PS_Forward(
|
||||
output = float4(lerp(float3(1, 1, 1), output.rgb, fog.aaa * fog.aaa), output.a);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
@0// Global Illumination: Defines
|
||||
#define USE_GI 1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
@0// Lightmap: Defines
|
||||
#define CAN_USE_LIGHTMAP 1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
@0// Motion Vectors: Defines
|
||||
@1// Motion Vectors: Includes
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
@0// Tessellation: Defines
|
||||
#define TessalationProjectOntoPlane(planeNormal, planePosition, pointToProject) pointToProject - dot(pointToProject - planePosition, planeNormal) * planeNormal
|
||||
|
||||
@@ -430,7 +430,9 @@ float3x4 GetPrevBoneMatrix(int index)
|
||||
float3 SkinPrevPosition(ModelInput_Skinned input)
|
||||
{
|
||||
float4 position = float4(input.Position.xyz, 1);
|
||||
float3x4 boneMatrix = input.BlendWeights.x * GetPrevBoneMatrix(input.BlendIndices.x);
|
||||
float weightsSum = input.BlendWeights.x + input.BlendWeights.y + input.BlendWeights.z + input.BlendWeights.w;
|
||||
float mainWeight = input.BlendWeights.x + (1.0f - weightsSum); // Re-normalize to account for 16-bit weights encoding erros
|
||||
float3x4 boneMatrix = mainWeight * GetPrevBoneMatrix(input.BlendIndices.x);
|
||||
boneMatrix += input.BlendWeights.y * GetPrevBoneMatrix(input.BlendIndices.y);
|
||||
boneMatrix += input.BlendWeights.z * GetPrevBoneMatrix(input.BlendIndices.z);
|
||||
boneMatrix += input.BlendWeights.w * GetPrevBoneMatrix(input.BlendIndices.w);
|
||||
@@ -439,12 +441,6 @@ float3 SkinPrevPosition(ModelInput_Skinned input)
|
||||
|
||||
#endif
|
||||
|
||||
// Cached skinning data to avoid multiple calculation
|
||||
struct SkinningData
|
||||
{
|
||||
float3x4 BlendMatrix;
|
||||
};
|
||||
|
||||
// Calculates the transposed transform matrix for the given bone index
|
||||
float3x4 GetBoneMatrix(int index)
|
||||
{
|
||||
@@ -457,7 +453,9 @@ float3x4 GetBoneMatrix(int index)
|
||||
// Calculates the transposed transform matrix for the given vertex (uses blending)
|
||||
float3x4 GetBoneMatrix(ModelInput_Skinned input)
|
||||
{
|
||||
float3x4 boneMatrix = input.BlendWeights.x * GetBoneMatrix(input.BlendIndices.x);
|
||||
float weightsSum = input.BlendWeights.x + input.BlendWeights.y + input.BlendWeights.z + input.BlendWeights.w;
|
||||
float mainWeight = input.BlendWeights.x + (1.0f - weightsSum); // Re-normalize to account for 16-bit weights encoding erros
|
||||
float3x4 boneMatrix = mainWeight * GetBoneMatrix(input.BlendIndices.x);
|
||||
boneMatrix += input.BlendWeights.y * GetBoneMatrix(input.BlendIndices.y);
|
||||
boneMatrix += input.BlendWeights.z * GetBoneMatrix(input.BlendIndices.z);
|
||||
boneMatrix += input.BlendWeights.w * GetBoneMatrix(input.BlendIndices.w);
|
||||
@@ -465,13 +463,13 @@ float3x4 GetBoneMatrix(ModelInput_Skinned input)
|
||||
}
|
||||
|
||||
// Transforms the vertex position by weighted sum of the skinning matrices
|
||||
float3 SkinPosition(ModelInput_Skinned input, SkinningData data)
|
||||
float3 SkinPosition(ModelInput_Skinned input, float3x4 boneMatrix)
|
||||
{
|
||||
return mul(data.BlendMatrix, float4(input.Position.xyz, 1));
|
||||
return mul(boneMatrix, float4(input.Position.xyz, 1));
|
||||
}
|
||||
|
||||
// Transforms the vertex position by weighted sum of the skinning matrices
|
||||
float3x3 SkinTangents(ModelInput_Skinned input, SkinningData data)
|
||||
float3x3 SkinTangents(ModelInput_Skinned input, float3x4 boneMatrix)
|
||||
{
|
||||
// Unpack vertex tangent frame
|
||||
float bitangentSign = input.Tangent.w ? -1.0f : +1.0f;
|
||||
@@ -479,10 +477,10 @@ float3x3 SkinTangents(ModelInput_Skinned input, SkinningData data)
|
||||
float3 tangent = input.Tangent.xyz * 2.0 - 1.0;
|
||||
|
||||
// Apply skinning
|
||||
tangent = mul(data.BlendMatrix, float4(tangent, 0));
|
||||
normal = mul(data.BlendMatrix, float4(normal, 0));
|
||||
tangent = normalize(mul(boneMatrix, float4(tangent, 0)));
|
||||
normal = normalize(mul(boneMatrix, float4(normal, 0)));
|
||||
|
||||
float3 bitangent = cross(normal, tangent) * bitangentSign;
|
||||
float3 bitangent = normalize(cross(normal, tangent) * bitangentSign);
|
||||
return float3x3(tangent, bitangent, normal);
|
||||
}
|
||||
|
||||
@@ -501,10 +499,9 @@ VertexOutput VS_Skinned(ModelInput_Skinned input)
|
||||
VertexOutput output;
|
||||
|
||||
// Perform skinning
|
||||
SkinningData data;
|
||||
data.BlendMatrix = GetBoneMatrix(input);
|
||||
float3 position = SkinPosition(input, data);
|
||||
float3x3 tangentToLocal = SkinTangents(input, data);
|
||||
float3x4 boneMatrix = GetBoneMatrix(input);
|
||||
float3 position = SkinPosition(input, boneMatrix);
|
||||
float3x3 tangentToLocal = SkinTangents(input, boneMatrix);
|
||||
|
||||
// Compute world space vertex position
|
||||
CalculateInstanceTransform(input);
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
@@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
set -e
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved
|
||||
# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved
|
||||
|
||||
set -e
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved
|
||||
# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved
|
||||
|
||||
# Fix mono bin to be in a path
|
||||
#export PATH=/Library/Frameworks/Mono.framework/Versions/Current/Commands:$PATH
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
@echo off
|
||||
|
||||
rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
if not exist "Development\Scripts\Windows\GetMSBuildPath.bat" goto Error_InvalidLocation
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
@echo off
|
||||
|
||||
rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
set MSBUILD_PATH=
|
||||
|
||||
|
||||
+4
-4
@@ -2,12 +2,12 @@
|
||||
"Name": "Flax",
|
||||
"Version": {
|
||||
"Major": 1,
|
||||
"Minor": 7,
|
||||
"Revision": 2,
|
||||
"Build": 6407
|
||||
"Minor": 8,
|
||||
"Revision": 1,
|
||||
"Build": 6511
|
||||
},
|
||||
"Company": "Flax",
|
||||
"Copyright": "Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.",
|
||||
"Copyright": "Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.",
|
||||
"GameTarget": "FlaxGame",
|
||||
"EditorTarget": "FlaxEditor",
|
||||
"Configuration": {
|
||||
|
||||
@@ -73,8 +73,15 @@
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CppNaming/UserRules/=TYPEDEF/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CppNaming/UserRules/=UNION/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CppNaming/UserRules/=UNION_005FMEMBER/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AI/@EntryIndexedValue">AI</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LO/@EntryIndexedValue">LO</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RPC/@EntryIndexedValue">RPC</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SDK/@EntryIndexedValue">SDK</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VS/@EntryIndexedValue">VS</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue"><Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=15b5b1f1_002D457c_002D4ca6_002Db278_002D5615aedc07d3/@EntryIndexedValue"><Policy><Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static readonly fields (private)"><ElementKinds><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /></Policy></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=53eecf85_002Dd821_002D40e8_002Dac97_002Dfdb734542b84/@EntryIndexedValue"><Policy><Descriptor Staticness="Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Instance fields (not private)"><ElementKinds><Kind Name="FIELD" /><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"><ExtraRule Prefix="_" Suffix="" Style="aaBb" /></Policy></Policy></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=70345118_002D4b40_002D4ece_002D937c_002Dbbeb7a0b2e70/@EntryIndexedValue"><Policy><Descriptor Staticness="Static" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Static fields (not private)"><ElementKinds><Kind Name="FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"><ExtraRule Prefix="_" Suffix="" Style="aaBb" /></Policy></Policy></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
|
||||
@@ -216,6 +223,7 @@
|
||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EXml_002ECodeStyle_002EFormatSettingsUpgrade_002EXmlMoveToCommonFormatterSettingsUpgrade/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECpp_002ECodeStyle_002ESettingsUpgrade_002EFunctionReturnStyleSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECpp_002ECodeStyle_002ESettingsUpgrade_002ENamespaceIndentationSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
|
||||
@@ -228,6 +236,7 @@
|
||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:String x:Key="/Default/GrammarAndSpelling/GrammarChecking/RulesStates/=LanguageTool_002EEN_002EE_005FG/@EntryIndexedValue">DisabledByUser</s:String>
|
||||
<s:Boolean x:Key="/Default/PatternsAndTemplates/Todo/TodoPatterns/=EEA05B0ED8200E4BA9D2D3F1052EBFFD/@KeyIndexDefined">True</s:Boolean>
|
||||
<s:String x:Key="/Default/PatternsAndTemplates/Todo/TodoPatterns/=EEA05B0ED8200E4BA9D2D3F1052EBFFD/Color/@EntryValue">Blue</s:String>
|
||||
<s:Boolean x:Key="/Default/PatternsAndTemplates/Todo/TodoPatterns/=EEA05B0ED8200E4BA9D2D3F1052EBFFD/MatchComments/@EntryValue">True</s:Boolean>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@echo off
|
||||
:: Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
:: Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
setlocal
|
||||
pushd
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
set -e
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
set -e
|
||||
|
||||
|
||||
+2
-2
@@ -1,13 +1,13 @@
|
||||
@echo off
|
||||
|
||||
rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
setlocal
|
||||
pushd
|
||||
echo Performing the full package...
|
||||
|
||||
rem Run the build tool.
|
||||
call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployEditor -deployPlatforms -dotnet=7 -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
|
||||
call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployEditor -deployPlatforms -dotnet=8 -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
|
||||
if errorlevel 1 goto BuildToolFailed
|
||||
|
||||
popd
|
||||
|
||||
+2
-2
@@ -1,13 +1,13 @@
|
||||
@echo off
|
||||
|
||||
rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
setlocal
|
||||
pushd
|
||||
echo Building and packaging Flax Editor...
|
||||
|
||||
rem Run the build tool.
|
||||
call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployEditor -dotnet=7 -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
|
||||
call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployEditor -dotnet=8 -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
|
||||
if errorlevel 1 goto BuildToolFailed
|
||||
|
||||
popd
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
set -e
|
||||
|
||||
@@ -9,4 +9,4 @@ echo Building and packaging Flax Editor...
|
||||
cd "`dirname "$0"`"
|
||||
|
||||
# Run Flax.Build (also pass the arguments)
|
||||
bash ./Development/Scripts/Mac/CallBuildTool.sh --deploy --deployEditor --dotnet=7 --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"
|
||||
bash ./Development/Scripts/Mac/CallBuildTool.sh --deploy --deployEditor --dotnet=8 --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
set -e
|
||||
|
||||
@@ -9,4 +9,4 @@ echo Building and packaging Flax Editor...
|
||||
cd "`dirname "$0"`"
|
||||
|
||||
# Run Flax.Build (also pass the arguments)
|
||||
bash ./Development/Scripts/Linux/CallBuildTool.sh --deploy --deployEditor --dotnet=7 --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"
|
||||
bash ./Development/Scripts/Linux/CallBuildTool.sh --deploy --deployEditor --dotnet=8 --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
@echo off
|
||||
|
||||
rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
setlocal
|
||||
pushd
|
||||
echo Building and packaging platforms data...
|
||||
|
||||
rem Run the build tool.
|
||||
call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployPlatforms -dotnet=7 -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
|
||||
call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployPlatforms -dotnet=8 -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
|
||||
if errorlevel 1 goto BuildToolFailed
|
||||
|
||||
popd
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
set -e
|
||||
|
||||
@@ -9,4 +9,4 @@ echo Building and packaging platforms data...
|
||||
cd "`dirname "$0"`"
|
||||
|
||||
# Run Flax.Build (also pass the arguments)
|
||||
bash ./Development/Scripts/Mac/CallBuildTool.sh --deploy --deployPlatforms --dotnet=7 --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"
|
||||
bash ./Development/Scripts/Mac/CallBuildTool.sh --deploy --deployPlatforms --dotnet=8 --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
set -e
|
||||
|
||||
@@ -9,4 +9,4 @@ echo Building and packaging platforms data...
|
||||
cd "`dirname "$0"`"
|
||||
|
||||
# Run Flax.Build (also pass the arguments)
|
||||
bash ./Development/Scripts/Linux/CallBuildTool.sh --deploy --deployPlatforms --dotnet=7 --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"
|
||||
bash ./Development/Scripts/Linux/CallBuildTool.sh --deploy --deployPlatforms --dotnet=8 --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"
|
||||
|
||||
@@ -31,7 +31,7 @@ Follow the instructions below to compile and run the engine from source.
|
||||
* Install Visual Studio 2022 or newer
|
||||
* Install Windows 8.1 SDK or newer (via Visual Studio Installer)
|
||||
* Install Microsoft Visual C++ 2015 v140 toolset or newer (via Visual Studio Installer)
|
||||
* Install .NET 7 SDK for **Windows x64** (via Visual Studio Installer or [from web](https://dotnet.microsoft.com/en-us/download/dotnet/7.0))
|
||||
* Install .NET 8 SDK for **Windows x64** (via Visual Studio Installer or [from web](https://dotnet.microsoft.com/en-us/download/dotnet/8.0))
|
||||
* Install Git with LFS
|
||||
* Clone repo (with LFS)
|
||||
* Run **GenerateProjectFiles.bat**
|
||||
@@ -44,8 +44,8 @@ Follow the instructions below to compile and run the engine from source.
|
||||
## Linux
|
||||
|
||||
* Install Visual Studio Code
|
||||
* Install .NET 7 SDK ([https://dotnet.microsoft.com/en-us/download/dotnet/7.0](https://dotnet.microsoft.com/en-us/download/dotnet/7.0))
|
||||
* Ubuntu: `sudo apt install dotnet-sdk-7.0`
|
||||
* Install .NET 8 SDK ([https://dotnet.microsoft.com/en-us/download/dotnet/8.0](https://dotnet.microsoft.com/en-us/download/dotnet/8.0))
|
||||
* Ubuntu: `sudo apt install dotnet-sdk-8.0`
|
||||
* Install Vulkan SDK ([https://vulkan.lunarg.com/](https://vulkan.lunarg.com/))
|
||||
* Ubuntu: `sudo apt install vulkan-sdk`
|
||||
* Arch: `sudo pacman -S spirv-tools vulkan-headers vulkan-tools vulkan-validation-layers`
|
||||
@@ -67,7 +67,7 @@ Follow the instructions below to compile and run the engine from source.
|
||||
## Mac
|
||||
|
||||
* Install XCode
|
||||
* Install .NET 7 SDK ([https://dotnet.microsoft.com/en-us/download/dotnet/7.0](https://dotnet.microsoft.com/en-us/download/dotnet/7.0))
|
||||
* Install .NET 8 SDK ([https://dotnet.microsoft.com/en-us/download/dotnet/8.0](https://dotnet.microsoft.com/en-us/download/dotnet/8.0))
|
||||
* Install Vulkan SDK ([https://vulkan.lunarg.com/](https://vulkan.lunarg.com/))
|
||||
* Clone repo (with LFS)
|
||||
* Run `GenerateProjectFiles.command`
|
||||
@@ -80,9 +80,9 @@ Follow the instructions below to compile and run the engine from source.
|
||||
|
||||
Restart PC - ensure DotNet is added to PATH for command line tools execution.
|
||||
|
||||
* `Microsoft.NET.TargetFrameworkInference.targets(141,5): error NETSDK1045: The current .NET SDK does not support targeting .NET 7.0. Either target .NET 5.0 or lower, or use a version of the .NET SDK that supports .NET 7.0`
|
||||
* `Microsoft.NET.TargetFrameworkInference.targets(141,5): error NETSDK1045: The current .NET SDK does not support targeting .NET 8.0. Either target .NET 5.0 or lower, or use a version of the .NET SDK that supports .NET 8.0`
|
||||
|
||||
Use Visual Studio 2022, older versions are not supported by .NET SDK 7.
|
||||
Use Visual Studio 2022, older versions are not supported by .NET SDK 8.
|
||||
|
||||
* `Building for Windows without Vulkan rendering backend (Vulkan SDK is missing)`
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
@echo off
|
||||
|
||||
rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
setlocal
|
||||
pushd %~dp0
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user