Compare commits
1337 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 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 | |||
| 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 | |||
| 4e34524a08 | |||
| dfd3bcdcb7 | |||
| 3f1d851f82 | |||
| ceb564a5e2 | |||
| 4e2f0cd22c | |||
| 4497b2ca7d | |||
| ac090d690e | |||
| 8a94e053a8 | |||
| bc2e130281 | |||
| e4df1fc756 | |||
| c6c53baff2 | |||
| 5958b2f4ea | |||
| 4726552d8b | |||
| 72f45afa45 | |||
| 51c36223e6 | |||
| ea744ab4ac | |||
| 9ea5ed79f8 | |||
| 57dee19f75 | |||
| 3c19262574 | |||
| 59e2afd992 | |||
| aade14270e | |||
| d5a6083a55 | |||
| e448692eb9 | |||
| 7bcf78d0c0 | |||
| 9f460cd651 | |||
| b85ec46545 | |||
| 272a147c2e | |||
| 8418ca56e8 | |||
| 0dd7e86537 | |||
| 64e391df24 | |||
| c145042f52 | |||
| d8856ddaa7 | |||
| 4263f61e85 | |||
| fc8c29b982 | |||
| 4e0daab310 | |||
| 6d5d615894 | |||
| 2bef880e21 | |||
| f38245b834 | |||
| 639803480e | |||
| 84249b3b57 | |||
| d614232f8d | |||
| 074ad171ba | |||
| efebb29ac0 | |||
| c3dd05211b | |||
| b9c145b499 | |||
| c0ef2a1f58 | |||
| 141bec0259 | |||
| 9c4857a205 | |||
| ed6220005f | |||
| 799fde1a26 | |||
| 3761eb5a1e | |||
| 8eb68a905e | |||
| ae5fa9619b | |||
| 8c45659b2a | |||
| a5e072da31 | |||
| df8418da25 | |||
| d7b17ae0a6 | |||
| f65ded4501 | |||
| 60202a3add | |||
| 014c811903 | |||
| fe1a655654 | |||
| 190bafea28 | |||
| 51fc4c68cd | |||
| b87a7d16fb | |||
| 8a5a7851cf | |||
| a1e13cd2c8 | |||
| e0a085adfe | |||
| 1874382816 | |||
| 9454385683 | |||
| d26b9818d8 | |||
| b297b9f185 | |||
| 8aaa5710df | |||
| 778dd2d3f0 | |||
| ff195eeccb | |||
| a63abb534f | |||
| 2afdb5b978 | |||
| ea287e9fc5 | |||
| 14632ecb66 | |||
| 80b5e9d02a | |||
| 022c935eef | |||
| ad7d7f371e | |||
| 4725f51431 | |||
| 0bb1126f1b | |||
| 462eb9803f | |||
| b1d4d50d47 | |||
| 2ed79c9218 | |||
| 6dd72cdf32 | |||
| 865945806a | |||
| d974998528 | |||
| efad58370f | |||
| 51e92a49ad | |||
| 1195fe8507 | |||
| cbecd605e9 | |||
| 0bcbcdb912 | |||
| 0df00fd881 | |||
| fe19ffddd9 | |||
| 19dbd3c4e4 | |||
| 01b233af10 | |||
| c895e310cb | |||
| e508fb8cd0 | |||
| 2f50042523 | |||
| 4e54e945ef | |||
| 0cb064bfb3 | |||
| 52d4dff587 | |||
| 13cc45c3d7 | |||
| b8ce9e8c59 | |||
| bcce52ca22 | |||
| df83491313 | |||
| b1cbaf7e13 | |||
| f3497a2a55 | |||
| 86fbf05b09 | |||
| c17ff3926a | |||
| 4707f98fab | |||
| eb30344e77 | |||
| d8f110793b | |||
| a32effff1c | |||
| f346dbc9bf | |||
| f24b335c45 | |||
| 2f11f5f5ab | |||
| 34ab33259b | |||
| 1746db60e6 | |||
| 3e0496122c | |||
| 74f5d14ec9 | |||
| 306dd43b18 | |||
| c3b6dd9884 | |||
| f7e9465ce8 | |||
| f9ad6e00c2 | |||
| 73a3e147ca | |||
| 59fe448987 | |||
| 629ebacd64 | |||
| a6a94d5f77 | |||
| 4a50111f9b | |||
| 91033a6468 | |||
| 73074b6e44 | |||
| e9285410e2 | |||
| 4fb2d3f7f3 | |||
| 526edb83de | |||
| 7db0ae59bb | |||
| eb7d5e5df3 | |||
| 83ef9791d4 | |||
| 228239632a | |||
| 3749b35aba | |||
| d847dfda61 | |||
| cb92110976 | |||
| 1f6b63291d | |||
| 7d36cdb67d | |||
| 74b77bfa4c | |||
| 32ced6e68a | |||
| 23a72f2ade | |||
| af4c662738 | |||
| af4a6b80a8 | |||
| 84e25a9e90 | |||
| 1eca03e50c | |||
| 0cd5627845 | |||
| 49c21082a1 | |||
| 96e64b2d0a | |||
| 19db8c04ad | |||
| a5ffde8863 | |||
| 9e593195c0 | |||
| 9dc3889631 | |||
| 3328c678c1 | |||
| 4f3c7a43ab | |||
| 727ff155c2 | |||
| 8faaaaaf54 | |||
| 7a7a43b897 | |||
| 63773f2ddf | |||
| 3f632b7d15 | |||
| bcbc1cd413 | |||
| 7886069783 | |||
| 4a3be5a743 | |||
| fdfca5156b | |||
| 38a0718b70 | |||
| 2285116bae | |||
| 5575917c4b | |||
| 63ddf53ad3 | |||
| 3e940c28df | |||
| f654d507e5 | |||
| d6dc1f9998 | |||
| 1843689a88 | |||
| 022a69aaf2 | |||
| 360c75355c | |||
| 6ab1663a14 | |||
| 23b71e7d3e | |||
| 74baffd76c | |||
| 666e6d880b | |||
| a6caa9dbfa | |||
| 73d33e4af0 | |||
| c5c20c8e28 | |||
| 9bde0f9f9b | |||
| 7d15944381 | |||
| 58bfd1954e | |||
| f67c0d2ac0 | |||
| 9a712ba3cf | |||
| 3ab7d7fcc4 | |||
| 0569b6dac8 | |||
| 2f019d4264 | |||
| 29eb3954c5 | |||
| 78d9262b05 | |||
| c8dd2c045c | |||
| a808bcdbf6 | |||
| 95f5e31e48 | |||
| 7b63c7016c | |||
| 3c5035d3e9 | |||
| 640e01262f | |||
| 3d139a241a | |||
| 623f478b44 | |||
| cdbe59a3fb | |||
| 6e92d3103c | |||
| c5df7ad689 | |||
| d3840bb1f3 | |||
| 3365fb5afc | |||
| 41bbce56f6 | |||
| 712c400e43 | |||
| 7f87e9794b | |||
| cebd28c3a7 | |||
| eb508fdc73 | |||
| b7e4fe3e85 | |||
| a3bc394e4e | |||
| b9f4d4120c | |||
| c6017a21f3 | |||
| d3a77c7a55 | |||
| 8ff4f95cef | |||
| 4f8aff4352 | |||
| 0aeac36f09 | |||
| cf8b7a20c2 | |||
| 47b8c9978f | |||
| a909b57e82 | |||
| 35ebdb0ffe | |||
| fd938e8284 | |||
| 17dca8c5c7 | |||
| 8ffc86ef88 | |||
| a3f1dc2694 | |||
| 84f3d50925 | |||
| a06a079804 | |||
| 47a25c7828 | |||
| 475453aa60 | |||
| 44f0b5a1de | |||
| 39dc5939e3 | |||
| 437819bfce | |||
| fa972a3c77 | |||
| 926297a63f | |||
| fd76c63a24 | |||
| 2f4b956d78 | |||
| 03d629f0e1 | |||
| c577c78f3f | |||
| ef8bb33105 | |||
| aab88a746d | |||
| 0bcd0154e1 | |||
| e5b1a10d34 | |||
| f16406df8a | |||
| 06ad316f94 | |||
| 76f5712c79 | |||
| b3a18883ca | |||
| 98b42d3e2e | |||
| 71f30f18a6 | |||
| 9e74f3ae22 | |||
| f4f49f63bc | |||
| eaabd56cae | |||
| 3fc0a3dc84 | |||
| cf155a4df4 | |||
| 40d6e18e7e | |||
| 2cef368282 | |||
| 40d8d3b972 | |||
| 2ddef2c6be | |||
| 6eb738bc58 | |||
| 91629d7a28 | |||
| cfef59d851 | |||
| 5f3fc38de2 | |||
| 49bc7d3dcc | |||
| d0f7a04c58 | |||
| 53aae90d45 | |||
| 297cdc5bfd | |||
| f61f35b259 | |||
| aa1b779463 | |||
| 359d4ba8ef | |||
| 6cf7d49a10 | |||
| d5075d845c | |||
| d99a92fd13 | |||
| 5b7a3f9700 | |||
| 94f1dff497 | |||
| fe53317ec7 | |||
| 317886e893 | |||
| eba4b9bcc1 | |||
| d01990e3bb | |||
| 0db259e300 | |||
| ce905fbe86 | |||
| 5fb82dd290 | |||
| ea81ac6a71 | |||
| 88f751eda7 | |||
| 33115fca0c | |||
| 4e37aafe6a | |||
| 9a091799fc | |||
| 37d4b0f863 | |||
| b14d88f8f8 | |||
| f5acba7d43 | |||
| da0dc7f11c | |||
| 6c6e8be20e | |||
| aa4e1222d7 | |||
| 98012eb192 | |||
| e9a1be481f | |||
| 5573f5bb4a | |||
| 822c25af7d | |||
| 70a540da4a | |||
| 201a1f0264 | |||
| 9aa4421bfd | |||
| d90a0aa3f4 | |||
| fc2d9a745f | |||
| 4e190c2e3c | |||
| 6dcfe32979 | |||
| 389bf89e2a | |||
| 31aafeb0d1 | |||
| f9799f8ef3 | |||
| 017e7cbc60 | |||
| 4eaac4ab2f | |||
| ddcb792767 | |||
| 8bcb984180 | |||
| 038a4e6f90 | |||
| 3799674b83 | |||
| 25246de791 | |||
| e76fffc95a | |||
| 06c56d0a4b | |||
| e4dc6d7295 | |||
| 6c32e4a842 | |||
| 84f6e2f90f | |||
| f77f8fbb39 | |||
| 15aaf5043a | |||
| b7f2196784 | |||
| d9b90c9520 | |||
| 719498e99b | |||
| 0beb389012 | |||
| e177aec5fa | |||
| a1ef635a2c | |||
| 3824b19c8b | |||
| 9de408e4e8 | |||
| 2ac8480df4 | |||
| 44e55cc8b6 | |||
| c4c3a3a5e8 | |||
| de55ad90b7 | |||
| ca64867f3c | |||
| 027fcbfd36 | |||
| bec878cc11 | |||
| f0865c3989 | |||
| 9738fd4354 | |||
| d33bf2fa6a | |||
| 307129b4a1 | |||
| 1bc6842831 | |||
| 1bb68f2c0c | |||
| 640f380237 | |||
| 6af6edb4fe | |||
| 6cad1e3309 | |||
| ee6a311406 | |||
| 6aea001e94 | |||
| 3a59cfcf20 | |||
| 385693afff | |||
| e7ef3ebef2 | |||
| c45d606f69 | |||
| 2555b07edf | |||
| 80a30f504a | |||
| d533cf554a | |||
| bc3107d1db | |||
| 3f5c92e2fa | |||
| 8d3cb8953c | |||
| 3904756e26 | |||
| 6fd34bf5cc | |||
| 0360f7786d | |||
| 3320c76e14 | |||
| e0de6744e2 | |||
| 7c53b1e99a | |||
| dd579eb099 | |||
| 0d8868e5bb | |||
| c0f0bd87aa | |||
| f7fb366233 | |||
| b2f49e2791 | |||
| b848c12802 | |||
| 45cb4eb66d | |||
| a42d54e401 | |||
| ab5534da7f | |||
| 05ea803582 | |||
| eaafb72ca9 | |||
| 4ceed361e2 | |||
| a9e1568edc | |||
| 348ed463fc | |||
| 618273977c | |||
| 13881c7d97 | |||
| 97a28d4431 | |||
| 46f82aabcd | |||
| c328eabd2a | |||
| 422fb34c69 | |||
| c7eaed6c65 | |||
| 418918920e | |||
| 930b1b978c | |||
| 95180f4aa9 | |||
| 0f14672e3b | |||
| 0fe9f6f439 | |||
| cc1e98db3c | |||
| 31ce41c5a4 | |||
| 0556c30ac5 | |||
| 5df1d3ddfd | |||
| be90f47585 | |||
| ddaa5f9161 | |||
| dc7170c51e | |||
| 43ae0bcd4c | |||
| 252bb680fa | |||
| beab66e42e | |||
| c2c0ad8067 | |||
| 057d1fbcc6 | |||
| 626cde118b | |||
| 36daa38e0f | |||
| ed69f11121 | |||
| 9cd8c02911 | |||
| 7d70a15034 | |||
| 39a5b8e635 | |||
| 2ae290491e | |||
| 3c71dc99e0 | |||
| ea3f02f810 | |||
| 4ae57e7769 | |||
| 22c8ec5342 | |||
| 710b9275fd | |||
| e7844bb5b2 | |||
| d8a54692f0 | |||
| 30ca7d52d0 | |||
| 888a8ee7b9 | |||
| d90b723487 | |||
| 67c22cf3d4 | |||
| 6497f3109a | |||
| 6dcadb5131 | |||
| 2bcdb5b05b | |||
| d6f449820b | |||
| a6c47ae17b | |||
| b3c15d6562 | |||
| 0fe46457c6 | |||
| bcaa42dda2 | |||
| 22fa7a89ac | |||
| e572f75b06 | |||
| 11b60390b6 | |||
| 1a7770fba2 | |||
| 966fb0275b | |||
| 785d3e8648 | |||
| 2f9343c236 | |||
| 52a1175f96 | |||
| 77b6a4a68b | |||
| 74bcf7d9e5 | |||
| 22d754e797 | |||
| 0d85094ebb | |||
| 7d43a0cc8b | |||
| 4c413cb146 | |||
| 4238c43f27 | |||
| f163edfb7e | |||
| fd4a5595c0 | |||
| f6645e5600 | |||
| b72849eafe | |||
| d6e93a7fab | |||
| 6648481d12 | |||
| 87a9dedba4 | |||
| 4fdeb773a5 | |||
| a90cf7c28f | |||
| 4b2595e904 | |||
| 42e8311736 | |||
| a685918e10 | |||
| 47ca4228dd | |||
| 7dc645c114 | |||
| c78ce9697c | |||
| c3d74b690e | |||
| ae85a94261 | |||
| e7b1fce3eb | |||
| b47420f232 | |||
| c025b4414c | |||
| 51c0a6e100 | |||
| 9a9e32d4c5 | |||
| 1e9ded55b0 | |||
| e22fa20dc1 | |||
| fe69a52cf2 | |||
| 9eb9294e84 | |||
| c53fce18a8 | |||
| 8500667817 | |||
| 40a3911453 | |||
| e57e86cde1 | |||
| ad290d0140 | |||
| 0930671e90 | |||
| 855122672f | |||
| e68330f5b5 | |||
| a0d4714a0f | |||
| f703e7de77 | |||
| 7e6c8b7b32 | |||
| a55dcf42da | |||
| 23369c2ff3 | |||
| 7855049509 | |||
| d79dd4aaf7 | |||
| 2c5a5acf33 | |||
| 342360f537 | |||
| 3ba8875121 | |||
| 655afb4b90 | |||
| f9a9912895 | |||
| bc91b1ed44 | |||
| 6fbf7fa07b | |||
| ea48056699 | |||
| 82d5130261 | |||
| b7e0994932 | |||
| d13b30304a | |||
| abc340b52c | |||
| 2dd16c1fb0 | |||
| 77e6aafc79 | |||
| c23f8f2b30 | |||
| 267e8daba5 | |||
| c5d3954bc8 | |||
| a7bb236344 | |||
| 0387f7df8a | |||
| ca2106ff5d | |||
| 4a10878b45 | |||
| 22e34cb2b4 | |||
| 585b6bacad | |||
| f736aae75d | |||
| 880e13865f | |||
| 7072839254 | |||
| 45060721e7 | |||
| 87d67a78f4 | |||
| 0ab43dd301 | |||
| 8c34fe7933 | |||
| fe3f64f06a | |||
| 8af3cfd90b | |||
| 3bf7b57dbd | |||
| 19752e4f3b | |||
| 50bcbf980e | |||
| 236e5772ce | |||
| 253c4c27ab | |||
| 41d513e5d2 | |||
| 6ddf241ea4 | |||
| e429e85aae | |||
| 224e43ea55 | |||
| 6f1ee382b5 | |||
| 1c23f0f5b4 | |||
| da72dd4806 | |||
| 087cfd7a8c | |||
| 5559d4f84d | |||
| 151c6bc6c3 | |||
| c0a8d29453 | |||
| 1a254afd4f | |||
| f6e9d0431b | |||
| 6cfc8c1b1a | |||
| 536be6c6cf | |||
| b0fe99f1ec | |||
| df5dc0c284 | |||
| f9614a4879 | |||
| 4e2ee897bc | |||
| 357148f973 | |||
| 67a385a431 | |||
| 5afb00e2c6 | |||
| 1fa03a0de2 | |||
| 590f3f7493 | |||
| 0fea7aad92 | |||
| b88233a65d | |||
| 95735035f3 | |||
| e3364faf8e | |||
| 90642b8862 | |||
| 900e6338d6 | |||
| e55cdd91d5 | |||
| 8cc7c5d3d9 | |||
| 0acf352d40 | |||
| 390621cb10 | |||
| ff64fdb503 | |||
| 18c119c155 | |||
| 8c6ced4bb9 | |||
| 66a709f09e | |||
| bfaae46c7e | |||
| b8921fd990 | |||
| 73694cba6c | |||
| ec02058712 | |||
| 4fb35579b5 | |||
| 39aebc6c85 | |||
| 1f8da14780 | |||
| cfe717969b | |||
| 210c5a5bb2 | |||
| 137c82a387 | |||
| b2db1330c0 | |||
| 06f37794c2 | |||
| 081648ef06 | |||
| f287ed6c30 | |||
| cf5f501ab7 | |||
| 9d1b287cd7 | |||
| 8982961254 | |||
| 2e85ff0fb3 | |||
| fbaf14b6fa | |||
| fff8a1e8a6 | |||
| ea00a448ef | |||
| 7b2058d1b2 | |||
| ba31627ae0 | |||
| ec7840f36b | |||
| fa8b92a456 | |||
| 432f6d5402 | |||
| 571f8febf4 | |||
| c371a5b78c | |||
| 70ccc79d54 | |||
| 7cb4d27979 | |||
| fdda42e504 | |||
| 4efbed91a4 | |||
| ad6affc863 | |||
| aafdc64b68 | |||
| 41a7aff6d7 | |||
| 9bd002ea33 | |||
| 3afb6cc88e | |||
| b2ba40b082 | |||
| 6fb411cee3 | |||
| 2537855aa3 | |||
| 040c9c20ac | |||
| 447030f53a | |||
| a96445d8bb | |||
| 86c2406d52 | |||
| 9c60da278f | |||
| bcdd6c0551 | |||
| ff7e6d82f8 | |||
| 5b3e09baec | |||
| 0d7e7c30ca | |||
| 0f5a177be2 | |||
| cfec5bb801 | |||
| dcec847d50 | |||
| 4f67d14261 | |||
| 0a12724974 | |||
| bfab9d68db | |||
| 004e2ab5e8 | |||
| d7095957d0 | |||
| 4e2870e90c | |||
| 1736aaeb6a | |||
| 7b601723c0 | |||
| d5c0ad0487 | |||
| d07a5e9823 | |||
| 329910ae0d | |||
| d7b9056d94 | |||
| 367eaf2f89 | |||
| 70ca1996c5 | |||
| 809b9e3a7a | |||
| b7b8213179 | |||
| ad28a3fdbf | |||
| 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 -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 -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 -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 -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
|
||||
|
||||
@@ -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/Mac/CallBuildTool.sh -build -log -printSDKs -arch=x64 -platform=Mac -configuration=Development -buildtargets=FlaxEditor
|
||||
./Development/Scripts/Mac/CallBuildTool.sh -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Mac -configuration=Development -buildtargets=FlaxEditor
|
||||
|
||||
# Game
|
||||
game-mac:
|
||||
@@ -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 -arch=x64 -platform=Mac -configuration=Release -buildtargets=FlaxGame
|
||||
./Development/Scripts/Mac/CallBuildTool.sh -build -log -printSDKs -dotnet=8 -arch=x64 -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 -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 -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,7 +159,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
|
||||
@@ -187,7 +187,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
|
||||
|
||||
+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
|
||||
./Development/Scripts/Linux/CallBuildTool.sh -build -log -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 -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
|
||||
.\Development\Scripts\Windows\CallBuildTool.bat -build -log -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.
@@ -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
|
||||
|
||||
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=
|
||||
|
||||
|
||||
+3
-3
@@ -2,12 +2,12 @@
|
||||
"Name": "Flax",
|
||||
"Version": {
|
||||
"Major": 1,
|
||||
"Minor": 7,
|
||||
"Minor": 8,
|
||||
"Revision": 0,
|
||||
"Build": 6404
|
||||
"Build": 6510
|
||||
},
|
||||
"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,12 @@
|
||||
<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/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>
|
||||
|
||||
@@ -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 -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 -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 --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 --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 -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 --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 --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
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
#include "EditorAnalytics.h"
|
||||
#include "Editor/Editor.h"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
@@ -0,0 +1,292 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using FlaxEditor.Scripting;
|
||||
using FlaxEngine;
|
||||
using FlaxEngine.Utilities;
|
||||
|
||||
namespace FlaxEditor.Content;
|
||||
|
||||
/// <summary>
|
||||
/// Manages and converts the selected content item to the appropriate types. Useful for drag operations.
|
||||
/// </summary>
|
||||
public class AssetPickerValidator : IContentItemOwner
|
||||
{
|
||||
private Asset _selected;
|
||||
private ContentItem _selectedItem;
|
||||
private ScriptType _type;
|
||||
private string _fileExtension;
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the selected item.
|
||||
/// </summary>
|
||||
public ContentItem SelectedItem
|
||||
{
|
||||
get => _selectedItem;
|
||||
set
|
||||
{
|
||||
if (_selectedItem == value)
|
||||
return;
|
||||
if (value == null)
|
||||
{
|
||||
if (_selected == null && _selectedItem is SceneItem)
|
||||
{
|
||||
// Deselect scene reference
|
||||
_selectedItem.RemoveReference(this);
|
||||
_selectedItem = null;
|
||||
_selected = null;
|
||||
OnSelectedItemChanged();
|
||||
return;
|
||||
}
|
||||
|
||||
// Deselect
|
||||
_selectedItem?.RemoveReference(this);
|
||||
_selectedItem = null;
|
||||
_selected = null;
|
||||
OnSelectedItemChanged();
|
||||
}
|
||||
else if (value is SceneItem item)
|
||||
{
|
||||
if (_selectedItem == item)
|
||||
return;
|
||||
if (!IsValid(item))
|
||||
item = null;
|
||||
|
||||
// Change value to scene reference (cannot load asset because scene can be already loaded - duplicated ID issue)
|
||||
_selectedItem?.RemoveReference(this);
|
||||
_selectedItem = item;
|
||||
_selected = null;
|
||||
_selectedItem?.AddReference(this);
|
||||
OnSelectedItemChanged();
|
||||
}
|
||||
else if (value is AssetItem assetItem)
|
||||
{
|
||||
SelectedAsset = FlaxEngine.Content.LoadAsync(assetItem.ID);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Change value
|
||||
_selectedItem?.RemoveReference(this);
|
||||
_selectedItem = value;
|
||||
_selected = null;
|
||||
OnSelectedItemChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the selected asset identifier.
|
||||
/// </summary>
|
||||
public Guid SelectedID
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_selected != null)
|
||||
return _selected.ID;
|
||||
if (_selectedItem is AssetItem assetItem)
|
||||
return assetItem.ID;
|
||||
return Guid.Empty;
|
||||
}
|
||||
set => SelectedItem = Editor.Instance.ContentDatabase.FindAsset(value);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the selected content item path.
|
||||
/// </summary>
|
||||
public string SelectedPath
|
||||
{
|
||||
get
|
||||
{
|
||||
string path = _selectedItem?.Path ?? _selected?.Path;
|
||||
if (path != null)
|
||||
{
|
||||
// Convert into path relative to the project (cross-platform)
|
||||
var projectFolder = Globals.ProjectFolder;
|
||||
if (path.StartsWith(projectFolder))
|
||||
path = path.Substring(projectFolder.Length + 1);
|
||||
}
|
||||
return path;
|
||||
}
|
||||
set
|
||||
{
|
||||
if (string.IsNullOrEmpty(value))
|
||||
{
|
||||
SelectedItem = null;
|
||||
}
|
||||
else
|
||||
{
|
||||
var path = StringUtils.IsRelative(value) ? Path.Combine(Globals.ProjectFolder, value) : value;
|
||||
SelectedItem = Editor.Instance.ContentDatabase.Find(path);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the selected asset object.
|
||||
/// </summary>
|
||||
public Asset SelectedAsset
|
||||
{
|
||||
get => _selected;
|
||||
set
|
||||
{
|
||||
// Check if value won't change
|
||||
if (value == _selected)
|
||||
return;
|
||||
|
||||
// Find item from content database and check it
|
||||
var item = value ? Editor.Instance.ContentDatabase.FindAsset(value.ID) : null;
|
||||
if (item != null && !IsValid(item))
|
||||
item = null;
|
||||
|
||||
// Change value
|
||||
_selectedItem?.RemoveReference(this);
|
||||
_selectedItem = item;
|
||||
_selected = value;
|
||||
_selectedItem?.AddReference(this);
|
||||
OnSelectedItemChanged();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the assets types that this picker accepts (it supports types derived from the given type). Use <see cref="ScriptType.Null"/> for generic file picker.
|
||||
/// </summary>
|
||||
public ScriptType AssetType
|
||||
{
|
||||
get => _type;
|
||||
set
|
||||
{
|
||||
if (_type != value)
|
||||
{
|
||||
_type = value;
|
||||
|
||||
// Auto deselect if the current value is invalid
|
||||
if (_selectedItem != null && !IsValid(_selectedItem))
|
||||
SelectedItem = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the content items extensions filter. Null if unused.
|
||||
/// </summary>
|
||||
public string FileExtension
|
||||
{
|
||||
get => _fileExtension;
|
||||
set
|
||||
{
|
||||
if (_fileExtension != value)
|
||||
{
|
||||
_fileExtension = value;
|
||||
|
||||
// Auto deselect if the current value is invalid
|
||||
if (_selectedItem != null && !IsValid(_selectedItem))
|
||||
SelectedItem = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Occurs when selected item gets changed.
|
||||
/// </summary>
|
||||
public event Action SelectedItemChanged;
|
||||
|
||||
/// <summary>
|
||||
/// The custom callback for assets validation. Cane be used to implement a rule for assets to pick.
|
||||
/// </summary>
|
||||
public Func<ContentItem, bool> CheckValid;
|
||||
|
||||
/// <summary>
|
||||
/// Returns whether item is valid.
|
||||
/// </summary>
|
||||
/// <param name="item"></param>
|
||||
/// <returns></returns>
|
||||
public bool IsValid(ContentItem item)
|
||||
{
|
||||
if (_fileExtension != null && !item.Path.EndsWith(_fileExtension))
|
||||
return false;
|
||||
if (CheckValid != null && !CheckValid(item))
|
||||
return false;
|
||||
if (_type == ScriptType.Null)
|
||||
return true;
|
||||
|
||||
if (item is AssetItem assetItem)
|
||||
{
|
||||
// Faster path for binary items (in-built)
|
||||
if (assetItem is BinaryAssetItem binaryItem)
|
||||
return _type.IsAssignableFrom(new ScriptType(binaryItem.Type));
|
||||
|
||||
// Type filter
|
||||
var type = TypeUtils.GetType(assetItem.TypeName);
|
||||
if (_type.IsAssignableFrom(type))
|
||||
return true;
|
||||
|
||||
// Json assets can contain any type of the object defined by the C# type (data oriented design)
|
||||
if (assetItem is JsonAssetItem && (_type.Type == typeof(JsonAsset) || _type.Type == typeof(Asset)))
|
||||
return true;
|
||||
|
||||
// Special case for scene asset references
|
||||
if (_type.Type == typeof(SceneReference) && assetItem is SceneItem)
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="AssetPickerValidator"/> class.
|
||||
/// </summary>
|
||||
public AssetPickerValidator()
|
||||
: this(new ScriptType(typeof(Asset)))
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="AssetPickerValidator"/> class.
|
||||
/// </summary>
|
||||
/// <param name="assetType">The assets types that this picker accepts.</param>
|
||||
public AssetPickerValidator(ScriptType assetType)
|
||||
{
|
||||
_type = assetType;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Called when selected item gets changed.
|
||||
/// </summary>
|
||||
protected virtual void OnSelectedItemChanged()
|
||||
{
|
||||
SelectedItemChanged?.Invoke();
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public void OnItemDeleted(ContentItem item)
|
||||
{
|
||||
// Deselect item
|
||||
SelectedItem = null;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public void OnItemRenamed(ContentItem item)
|
||||
{
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public void OnItemReimported(ContentItem item)
|
||||
{
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public void OnItemDispose(ContentItem item)
|
||||
{
|
||||
// Deselect item
|
||||
SelectedItem = null;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Call to remove reference from the selected item.
|
||||
/// </summary>
|
||||
public void OnDestroy()
|
||||
{
|
||||
_selectedItem?.RemoveReference(this);
|
||||
_selectedItem = null;
|
||||
_selected = null;
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
namespace FlaxEditor.Content.Create
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using System.IO;
|
||||
@@ -81,7 +81,7 @@ namespace FlaxEditor.Content.Create
|
||||
switch (_options.Template)
|
||||
{
|
||||
case Templates.Empty:
|
||||
return Editor.CreateAsset(Editor.NewAssetType.ParticleEmitter, ResultUrl);
|
||||
return Editor.CreateAsset("ParticleEmitter", ResultUrl);
|
||||
case Templates.ConstantBurst:
|
||||
templateName = "Constant Burst";
|
||||
break;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using FlaxEngine;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
using FlaxEditor.GUI;
|
||||
using FlaxEditor.GUI.ContextMenu;
|
||||
@@ -161,7 +161,7 @@ namespace FlaxEditor.Content.GUI
|
||||
{
|
||||
var style = Style.Current;
|
||||
var rect = new Rectangle(Float2.Zero, Size);
|
||||
var color = IsDragOver ? style.BackgroundSelected * 0.6f : (_mouseDown ? style.BackgroundSelected : (IsMouseOver ? style.BackgroundHighlighted : Color.Transparent));
|
||||
var color = IsDragOver ? Color.Transparent : (_mouseDown ? style.BackgroundSelected : (IsMouseOver ? style.BackgroundHighlighted : Color.Transparent));
|
||||
Render2D.FillRectangle(rect, color);
|
||||
Render2D.DrawSprite(Editor.Instance.Icons.ArrowRight12, new Rectangle(rect.Location.X, rect.Y + rect.Size.Y * 0.25f, rect.Size.X, rect.Size.X), EnabledInHierarchy ? style.Foreground : style.ForegroundDisabled);
|
||||
}
|
||||
|
||||
@@ -1,123 +0,0 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
|
||||
using FlaxEditor.GUI.Drag;
|
||||
using FlaxEditor.SceneGraph;
|
||||
using FlaxEngine;
|
||||
using FlaxEngine.GUI;
|
||||
|
||||
namespace FlaxEditor.Content.GUI
|
||||
{
|
||||
public partial class ContentView
|
||||
{
|
||||
private bool _validDragOver;
|
||||
private DragActors _dragActors;
|
||||
|
||||
/// <inheritdoc />
|
||||
public override DragDropEffect OnDragEnter(ref Float2 location, DragData data)
|
||||
{
|
||||
var result = base.OnDragEnter(ref location, data);
|
||||
if (result != DragDropEffect.None)
|
||||
return result;
|
||||
|
||||
// Check if drop file(s)
|
||||
if (data is DragDataFiles)
|
||||
{
|
||||
_validDragOver = true;
|
||||
return DragDropEffect.Copy;
|
||||
}
|
||||
|
||||
// Check if drop actor(s)
|
||||
if (_dragActors == null)
|
||||
_dragActors = new DragActors(ValidateDragActors);
|
||||
if (_dragActors.OnDragEnter(data))
|
||||
{
|
||||
_validDragOver = true;
|
||||
return DragDropEffect.Move;
|
||||
}
|
||||
|
||||
return DragDropEffect.None;
|
||||
}
|
||||
|
||||
private bool ValidateDragActors(ActorNode actor)
|
||||
{
|
||||
return actor.CanCreatePrefab && Editor.Instance.Windows.ContentWin.CurrentViewFolder.CanHaveAssets;
|
||||
}
|
||||
|
||||
private void ImportActors(DragActors actors, ContentFolder location)
|
||||
{
|
||||
foreach (var actorNode in actors.Objects)
|
||||
{
|
||||
var actor = actorNode.Actor;
|
||||
if (actors.Objects.Contains(actorNode.ParentNode as ActorNode))
|
||||
continue;
|
||||
|
||||
Editor.Instance.Prefabs.CreatePrefab(actor, false);
|
||||
}
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override DragDropEffect OnDragMove(ref Float2 location, DragData data)
|
||||
{
|
||||
_validDragOver = false;
|
||||
var result = base.OnDragMove(ref location, data);
|
||||
if (result != DragDropEffect.None)
|
||||
return result;
|
||||
|
||||
if (data is DragDataFiles)
|
||||
{
|
||||
_validDragOver = true;
|
||||
result = DragDropEffect.Copy;
|
||||
}
|
||||
else if (_dragActors != null && _dragActors.HasValidDrag)
|
||||
{
|
||||
_validDragOver = true;
|
||||
result = DragDropEffect.Move;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override DragDropEffect OnDragDrop(ref Float2 location, DragData data)
|
||||
{
|
||||
var result = base.OnDragDrop(ref location, data);
|
||||
if (result != DragDropEffect.None)
|
||||
return result;
|
||||
|
||||
// Check if drop file(s)
|
||||
if (data is DragDataFiles files)
|
||||
{
|
||||
// Import files
|
||||
var currentFolder = Editor.Instance.Windows.ContentWin.CurrentViewFolder;
|
||||
if (currentFolder != null)
|
||||
Editor.Instance.ContentImporting.Import(files.Files, currentFolder);
|
||||
result = DragDropEffect.Copy;
|
||||
}
|
||||
// Check if drop actor(s)
|
||||
else if (_dragActors != null && _dragActors.HasValidDrag)
|
||||
{
|
||||
// Import actors
|
||||
var currentFolder = Editor.Instance.Windows.ContentWin.CurrentViewFolder;
|
||||
if (currentFolder != null)
|
||||
ImportActors(_dragActors, currentFolder);
|
||||
|
||||
_dragActors.OnDragDrop();
|
||||
result = DragDropEffect.Move;
|
||||
}
|
||||
|
||||
// Clear cache
|
||||
_validDragOver = false;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override void OnDragLeave()
|
||||
{
|
||||
_validDragOver = false;
|
||||
_dragActors?.OnDragLeave();
|
||||
|
||||
base.OnDragLeave();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,11 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using FlaxEditor.GUI.Drag;
|
||||
using FlaxEditor.Options;
|
||||
using FlaxEditor.SceneGraph;
|
||||
using FlaxEditor.Windows;
|
||||
using FlaxEngine;
|
||||
using FlaxEngine.GUI;
|
||||
@@ -52,10 +54,16 @@ namespace FlaxEditor.Content.GUI
|
||||
public partial class ContentView : ContainerControl, IContentItemOwner
|
||||
{
|
||||
private readonly List<ContentItem> _items = new List<ContentItem>(256);
|
||||
private readonly List<ContentItem> _selection = new List<ContentItem>(16);
|
||||
private readonly List<ContentItem> _selection = new List<ContentItem>();
|
||||
|
||||
private float _viewScale = 1.0f;
|
||||
private ContentViewType _viewType = ContentViewType.Tiles;
|
||||
private bool _isRubberBandSpanning;
|
||||
private Float2 _mousePressLocation;
|
||||
private Rectangle _rubberBandRectangle;
|
||||
|
||||
private bool _validDragOver;
|
||||
private DragActors _dragActors;
|
||||
|
||||
#region External Events
|
||||
|
||||
@@ -190,6 +198,7 @@ namespace FlaxEditor.Content.GUI
|
||||
OnDelete?.Invoke(_selection);
|
||||
}),
|
||||
new InputActionsContainer.Binding(options => options.SelectAll, SelectAll),
|
||||
new InputActionsContainer.Binding(options => options.DeselectAll, DeselectAll),
|
||||
new InputActionsContainer.Binding(options => options.Rename, () =>
|
||||
{
|
||||
if (HasSelection && _selection[0].CanRename)
|
||||
@@ -394,10 +403,7 @@ namespace FlaxEditor.Content.GUI
|
||||
PerformLayout();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Selects all the items.
|
||||
/// </summary>
|
||||
public void SelectAll()
|
||||
private void BulkSelectUpdate(bool select = true)
|
||||
{
|
||||
// Lock layout
|
||||
var wasLayoutLocked = IsLayoutLocked;
|
||||
@@ -405,13 +411,30 @@ namespace FlaxEditor.Content.GUI
|
||||
|
||||
// Select items
|
||||
_selection.Clear();
|
||||
_selection.AddRange(_items);
|
||||
if (select)
|
||||
_selection.AddRange(_items);
|
||||
|
||||
// Unload and perform UI layout
|
||||
IsLayoutLocked = wasLayoutLocked;
|
||||
PerformLayout();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Selects all the items.
|
||||
/// </summary>
|
||||
public void SelectAll()
|
||||
{
|
||||
BulkSelectUpdate(true);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Deselects all the items.
|
||||
/// </summary>
|
||||
public void DeselectAll()
|
||||
{
|
||||
BulkSelectUpdate(false);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Deselects the specified item.
|
||||
/// </summary>
|
||||
@@ -592,7 +615,9 @@ namespace FlaxEditor.Content.GUI
|
||||
// Check if drag is over
|
||||
if (IsDragOver && _validDragOver)
|
||||
{
|
||||
Render2D.FillRectangle(new Rectangle(Float2.Zero, Size), style.BackgroundSelected * 0.4f);
|
||||
var bounds = new Rectangle(Float2.One, Size - Float2.One * 2);
|
||||
Render2D.FillRectangle(bounds, style.Selection);
|
||||
Render2D.DrawRectangle(bounds, style.SelectionBorder);
|
||||
}
|
||||
|
||||
// Check if it's an empty thing
|
||||
@@ -600,6 +625,13 @@ namespace FlaxEditor.Content.GUI
|
||||
{
|
||||
Render2D.DrawText(style.FontSmall, IsSearching ? "No results" : "Empty", new Rectangle(Float2.Zero, Size), style.ForegroundDisabled, TextAlignment.Center, TextAlignment.Center);
|
||||
}
|
||||
|
||||
// Selection
|
||||
if (_isRubberBandSpanning)
|
||||
{
|
||||
Render2D.FillRectangle(_rubberBandRectangle, style.Selection);
|
||||
Render2D.DrawRectangle(_rubberBandRectangle, style.SelectionBorder);
|
||||
}
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
@@ -607,9 +639,56 @@ namespace FlaxEditor.Content.GUI
|
||||
{
|
||||
if (base.OnMouseDown(location, button))
|
||||
return true;
|
||||
|
||||
if (button == MouseButton.Left)
|
||||
{
|
||||
_mousePressLocation = location;
|
||||
_rubberBandRectangle = new Rectangle(_mousePressLocation, 0, 0);
|
||||
_isRubberBandSpanning = true;
|
||||
StartMouseCapture();
|
||||
return true;
|
||||
}
|
||||
|
||||
return AutoFocus && Focus(this);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override void OnMouseMove(Float2 location)
|
||||
{
|
||||
if (_isRubberBandSpanning)
|
||||
{
|
||||
_rubberBandRectangle.Width = location.X - _mousePressLocation.X;
|
||||
_rubberBandRectangle.Height = location.Y - _mousePressLocation.Y;
|
||||
}
|
||||
|
||||
base.OnMouseMove(location);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override bool OnMouseUp(Float2 location, MouseButton button)
|
||||
{
|
||||
if (_isRubberBandSpanning)
|
||||
{
|
||||
_isRubberBandSpanning = false;
|
||||
EndMouseCapture();
|
||||
if (_rubberBandRectangle.Width < 0 || _rubberBandRectangle.Height < 0)
|
||||
{
|
||||
// make sure we have a well-formed rectangle i.e. size is positive and X/Y is upper left corner
|
||||
var size = _rubberBandRectangle.Size;
|
||||
_rubberBandRectangle.X = Mathf.Min(_rubberBandRectangle.X, _rubberBandRectangle.X + _rubberBandRectangle.Width);
|
||||
_rubberBandRectangle.Y = Mathf.Min(_rubberBandRectangle.Y, _rubberBandRectangle.Y + _rubberBandRectangle.Height);
|
||||
size.X = Mathf.Abs(size.X);
|
||||
size.Y = Mathf.Abs(size.Y);
|
||||
_rubberBandRectangle.Size = size;
|
||||
}
|
||||
var itemsInRectangle = _items.Where(t => _rubberBandRectangle.Intersects(t.Bounds)).ToList();
|
||||
Select(itemsInRectangle, Input.GetKey(KeyboardKeys.Shift) || Input.GetKey(KeyboardKeys.Control));
|
||||
return true;
|
||||
}
|
||||
|
||||
return base.OnMouseUp(location, button);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override bool OnMouseWheel(Float2 location, float delta)
|
||||
{
|
||||
@@ -714,6 +793,114 @@ namespace FlaxEditor.Content.GUI
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override DragDropEffect OnDragEnter(ref Float2 location, DragData data)
|
||||
{
|
||||
var result = base.OnDragEnter(ref location, data);
|
||||
if (result != DragDropEffect.None)
|
||||
return result;
|
||||
|
||||
// Check if drop file(s)
|
||||
if (data is DragDataFiles)
|
||||
{
|
||||
_validDragOver = true;
|
||||
return DragDropEffect.Copy;
|
||||
}
|
||||
|
||||
// Check if drop actor(s)
|
||||
if (_dragActors == null)
|
||||
_dragActors = new DragActors(ValidateDragActors);
|
||||
if (_dragActors.OnDragEnter(data))
|
||||
{
|
||||
_validDragOver = true;
|
||||
return DragDropEffect.Move;
|
||||
}
|
||||
|
||||
return DragDropEffect.None;
|
||||
}
|
||||
|
||||
private bool ValidateDragActors(ActorNode actor)
|
||||
{
|
||||
return actor.CanCreatePrefab && Editor.Instance.Windows.ContentWin.CurrentViewFolder.CanHaveAssets;
|
||||
}
|
||||
|
||||
private void ImportActors(DragActors actors, ContentFolder location)
|
||||
{
|
||||
foreach (var actorNode in actors.Objects)
|
||||
{
|
||||
var actor = actorNode.Actor;
|
||||
if (actors.Objects.Contains(actorNode.ParentNode as ActorNode))
|
||||
continue;
|
||||
|
||||
Editor.Instance.Prefabs.CreatePrefab(actor, false);
|
||||
}
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override DragDropEffect OnDragMove(ref Float2 location, DragData data)
|
||||
{
|
||||
_validDragOver = false;
|
||||
var result = base.OnDragMove(ref location, data);
|
||||
if (result != DragDropEffect.None)
|
||||
return result;
|
||||
|
||||
if (data is DragDataFiles)
|
||||
{
|
||||
_validDragOver = true;
|
||||
result = DragDropEffect.Copy;
|
||||
}
|
||||
else if (_dragActors != null && _dragActors.HasValidDrag)
|
||||
{
|
||||
_validDragOver = true;
|
||||
result = DragDropEffect.Move;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override DragDropEffect OnDragDrop(ref Float2 location, DragData data)
|
||||
{
|
||||
var result = base.OnDragDrop(ref location, data);
|
||||
if (result != DragDropEffect.None)
|
||||
return result;
|
||||
|
||||
// Check if drop file(s)
|
||||
if (data is DragDataFiles files)
|
||||
{
|
||||
// Import files
|
||||
var currentFolder = Editor.Instance.Windows.ContentWin.CurrentViewFolder;
|
||||
if (currentFolder != null)
|
||||
Editor.Instance.ContentImporting.Import(files.Files, currentFolder);
|
||||
result = DragDropEffect.Copy;
|
||||
}
|
||||
// Check if drop actor(s)
|
||||
else if (_dragActors != null && _dragActors.HasValidDrag)
|
||||
{
|
||||
// Import actors
|
||||
var currentFolder = Editor.Instance.Windows.ContentWin.CurrentViewFolder;
|
||||
if (currentFolder != null)
|
||||
ImportActors(_dragActors, currentFolder);
|
||||
|
||||
_dragActors.OnDragDrop();
|
||||
result = DragDropEffect.Move;
|
||||
}
|
||||
|
||||
// Clear cache
|
||||
_validDragOver = false;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override void OnDragLeave()
|
||||
{
|
||||
_validDragOver = false;
|
||||
_dragActors?.OnDragLeave();
|
||||
|
||||
base.OnDragLeave();
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void PerformLayoutBeforeChildren()
|
||||
{
|
||||
@@ -779,6 +966,9 @@ namespace FlaxEditor.Content.GUI
|
||||
/// <inheritdoc />
|
||||
public override void OnDestroy()
|
||||
{
|
||||
if (IsDisposing)
|
||||
return;
|
||||
|
||||
// Ensure to unlink all items
|
||||
ClearItems();
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
using FlaxEngine;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
namespace FlaxEditor.Content.Import
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
using System.Collections.Generic;
|
||||
using FlaxEditor.CustomEditors.Editors;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
using System.IO;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
using System.Collections.Generic;
|
||||
using FlaxEditor.CustomEditors.Editors;
|
||||
@@ -12,13 +12,15 @@ namespace FlaxEngine.Tools
|
||||
{
|
||||
partial struct Options
|
||||
{
|
||||
private bool ShowGeometry => Type == ModelTool.ModelType.Model || Type == ModelTool.ModelType.SkinnedModel;
|
||||
private bool ShowModel => Type == ModelTool.ModelType.Model;
|
||||
private bool ShowSkinnedModel => Type == ModelTool.ModelType.SkinnedModel;
|
||||
private bool ShowAnimation => Type == ModelTool.ModelType.Animation;
|
||||
private bool ShowGeometry => Type == ModelType.Model || Type == ModelType.SkinnedModel || Type == ModelType.Prefab;
|
||||
private bool ShowModel => Type == ModelType.Model || Type == ModelType.Prefab;
|
||||
private bool ShowSkinnedModel => Type == ModelType.SkinnedModel || Type == ModelType.Prefab;
|
||||
private bool ShowAnimation => Type == ModelType.Animation || Type == ModelType.Prefab;
|
||||
private bool ShowRootMotion => ShowAnimation && RootMotion != RootMotionMode.None;
|
||||
private bool ShowSmoothingNormalsAngle => ShowGeometry && CalculateNormals;
|
||||
private bool ShowSmoothingTangentsAngle => ShowGeometry && CalculateTangents;
|
||||
private bool ShowFramesRange => ShowAnimation && Duration == ModelTool.AnimationDuration.Custom;
|
||||
private bool ShowFramesRange => ShowAnimation && Duration == AnimationDuration.Custom;
|
||||
private bool ShowSplitting => Type != ModelType.Prefab;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
using FlaxEngine;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user