Compare commits
1681 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b84ccc2cbc | |||
| 775e978fed | |||
| e450658834 | |||
| 1a8827ba76 | |||
| eed227aa79 | |||
| 27ee42b0a1 | |||
| fd8ae9bc2b | |||
| e0f234c667 | |||
| bdeb89538c | |||
| 0f86537099 | |||
| f6f7bbb3d0 | |||
| 422300adbd | |||
| 89a1f00c57 | |||
| f4be035f04 | |||
| c2ec3fe2cb | |||
| fca6ed43cc | |||
| 84ccb9df0c | |||
| 777602fee6 | |||
| 24654e5b02 | |||
| 44117084c8 | |||
| 2531a4b918 | |||
| 9ce6026192 | |||
| a12c5e2203 | |||
| ff526ecafb | |||
| 1badeda31c | |||
| 018c7cf33d | |||
| a544cbcfde | |||
| 45f7c1f0a0 | |||
| 13aa6ce4a0 | |||
| c2b2d6973b | |||
| 96835b856d | |||
| caeecf2aea | |||
| db963f9191 | |||
| 4b6c22c43f | |||
| d3be79fdc4 | |||
| 8231bae16b | |||
| f55ac81fe4 | |||
| d181f8d726 | |||
| 2a37a529b9 | |||
| 7f370a7c5b | |||
| 0f38fca0b1 | |||
| 0b47e63ba3 | |||
| a0663666bb | |||
| 6daec81db1 | |||
| c36c39df37 | |||
| b7a59447a3 | |||
| 6fa38b75d5 | |||
| de1b515f1e | |||
| b004e90606 | |||
| b7185bfe72 | |||
| 7a41e7d6d8 | |||
| 3e670f5e80 | |||
| 7e19ffbe40 | |||
| 80e20744aa | |||
| 16effd8328 | |||
| e7c5f257e9 | |||
| 320d37d9a2 | |||
| 791fb785cf | |||
| ab6b5927f8 | |||
| 7c1df5c980 | |||
| 14ad3f892e | |||
| bd3129e9e7 | |||
| 45cc04d434 | |||
| f78954c174 | |||
| e43a12a9a8 | |||
| 1e6fdb7f02 | |||
| 067c8ae5b8 | |||
| 95aa04c334 | |||
| efd6bc27b8 | |||
| 3140c711a4 | |||
| 848e9c92aa | |||
| 6dad8259d6 | |||
| 9f72c465fe | |||
| 285762bfdb | |||
| 571821bf3d | |||
| 96a081bf93 | |||
| 637f3dc176 | |||
| 5010597bd2 | |||
| 17ff4623e7 | |||
| 0a39d88221 | |||
| 92a0a40d16 | |||
| 4d4d1a589f | |||
| 1176dc515d | |||
| 96d670efb7 | |||
| 8d8d69b847 | |||
| 5dac5d3f2d | |||
| 03126e1840 | |||
| 9e96206d67 | |||
| 00e4b09e7e | |||
| 3bf3264f48 | |||
| ec73cc6b0d | |||
| 5058bfc296 | |||
| f83488355d | |||
| b043490413 | |||
| 3542f20787 | |||
| 25dd989749 | |||
| d4402c7f8e | |||
| 43511a96b0 | |||
| 48f302b4fd | |||
| d9c787a661 | |||
| 97bcdacd9a | |||
| 253442abd1 | |||
| c8912ad100 | |||
| 40413edbab | |||
| c10cfc8e45 | |||
| 5739c0bef4 | |||
| 4f97225c46 | |||
| 2c8da4ea04 | |||
| d697bd7402 | |||
| 0bcc01c3c7 | |||
| de76d3623e | |||
| 33caae6935 | |||
| 75d9e36bd2 | |||
| 72f2c8f5cd | |||
| 9cfb3dd220 | |||
| 62d6658444 | |||
| 66818802b1 | |||
| cc4fdf5cc2 | |||
| fde40949b2 | |||
| 65c1a8258e | |||
| 6e89f152ef | |||
| e71f43ea79 | |||
| d33ebc3105 | |||
| 0de61ba218 | |||
| 283a3e6bf9 | |||
| 2a95e8e970 | |||
| 746bd2273f | |||
| ec9f05fe11 | |||
| b039e3779d | |||
| fc8a9b69d2 | |||
| b38f6c5721 | |||
| 8281e743cd | |||
| dcccc4687d | |||
| 834cb94110 | |||
| 0c1af2f243 | |||
| 4ce06c8242 | |||
| 7289baae48 | |||
| ba48b2e4f3 | |||
| 64708a14d9 | |||
| 7f2ba7a81e | |||
| fb21ffd3be | |||
| 7127ccda37 | |||
| af3836d611 | |||
| ead71e6836 | |||
| a421effd1b | |||
| 241441d5b9 | |||
| 14b0fb355a | |||
| 4489f43777 | |||
| c17a9f653e | |||
| e7fd901807 | |||
| bdabcd5e43 | |||
| 6cc8f693f3 | |||
| 811bf0d630 | |||
| 1079791bed | |||
| 627f3a2dec | |||
| 2f05a0987e | |||
| 6335bcdc93 | |||
| 9957166723 | |||
| 378ce066cd | |||
| 650fa781d3 | |||
| 000d786d49 | |||
| 3eb85000aa | |||
| 9c5daf419b | |||
| 9a85ae7142 | |||
| fad0f7a345 | |||
| aac399c6a1 | |||
| 864f3a3d42 | |||
| 4c5035e433 | |||
| b14c2cfc74 | |||
| cbcfa4013b | |||
| 429f8e5336 | |||
| 6cc0edf0eb | |||
| f7d8f36add | |||
| da716dde6a | |||
| 2e98300693 | |||
| 83de99877c | |||
| 94e529e801 | |||
| 7a569d4f14 | |||
| 24675ace93 | |||
| 3a5d831e71 | |||
| 0aecb35ab1 | |||
| c4bb39aeac | |||
| 61431a6400 | |||
| d4da1d80d0 | |||
| 3bede1d6bc | |||
| ce4ad8aa71 | |||
| 75bd206416 | |||
| 578af12f2b | |||
| acbbd34ecf | |||
| c8b06ba7ec | |||
| ad46b74f6a | |||
| 47a9d76938 | |||
| 442cb8f2dd | |||
| 45e121bf77 | |||
| 8e76d0d9d8 | |||
| f4905cfccc | |||
| bf9a015959 | |||
| 4fd7f51fdf | |||
| f5e483069d | |||
| caef258e1a | |||
| a39b3f486b | |||
| 913892f3c1 | |||
| 0bd28ecb65 | |||
| 9eec54171c | |||
| 486781661e | |||
| b201897ae6 | |||
| c33ada2715 | |||
| dcb9b5150f | |||
| f905b4013b | |||
| b0033a35b7 | |||
| f47a2909fe | |||
| b1c76ec7f9 | |||
| e6c0836b09 | |||
| db2130f340 | |||
| edb3badcb3 | |||
| c33b2cc11e | |||
| 135110387d | |||
| 6b3502675a | |||
| 615e847e01 | |||
| 881bc4d629 | |||
| 468e05c6e8 | |||
| a46402df6b | |||
| 1fa9aadebd | |||
| c0f52235c6 | |||
| c782f07b76 | |||
| dc9a8a2f84 | |||
| 49943e13de | |||
| 1988fae929 | |||
| 804315bb3e | |||
| 0cacc58b53 | |||
| 7437b69d52 | |||
| f5f4fb29f2 | |||
| 33617a702a | |||
| 84b53bb9c8 | |||
| d6113be58c | |||
| c3ea883b21 | |||
| f41d01f4a9 | |||
| 141a8de0da | |||
| 63b6fafa1b | |||
| 527b0acfa9 | |||
| 83538e4385 | |||
| 2ce1103530 | |||
| 6121a6fadf | |||
| df059f79c7 | |||
| 11aeaba92a | |||
| 9264a6e011 | |||
| c7d40c0dc6 | |||
| 7d7dba41f2 | |||
| c130928e7a | |||
| 6a5742352c | |||
| c23ac8782b | |||
| 0592816ef1 | |||
| fc864cb504 | |||
| 3cea8621a7 | |||
| 21cac2ad6e | |||
| 633f2fa901 | |||
| e90dde491d | |||
| 7014f40965 | |||
| 0ba611e57f | |||
| f85836d090 | |||
| c474f2e522 | |||
| 635ef0ad66 | |||
| 8553785397 | |||
| b79335c920 | |||
| 54e5e6895d | |||
| d2cdb85678 | |||
| 28ea7f134d | |||
| 248d883a8b | |||
| 3c6b448ba9 | |||
| 0ef35ce257 | |||
| 641f70d4ac | |||
| 36157fb01e | |||
| b6dfd1351d | |||
| 925b83e095 | |||
| e65cd3799f | |||
| cf319876e6 | |||
| 421e8d5b43 | |||
| 6c8c1aed45 | |||
| fe90f4954e | |||
| 22964255e4 | |||
| cf65c442de | |||
| d0ac31c02b | |||
| f1f17c8289 | |||
| bfc2b276e1 | |||
| fa01d2d8a3 | |||
| f5b5228ddf | |||
| c1de97b77b | |||
| 915f655e2c | |||
| 0754ea85a9 | |||
| e9d61ebf9f | |||
| cb2f2bf644 | |||
| 9350a4a706 | |||
| b6c7358953 | |||
| 6db9116047 | |||
| 1f5fcdc7c7 | |||
| 4e72be1604 | |||
| 7b5b688c68 | |||
| f87515305b | |||
| 145134f145 | |||
| a8165f58bc | |||
| 712420cca7 | |||
| 232db03427 | |||
| 51af51d008 | |||
| 3892bf96e2 | |||
| 9280cb0036 | |||
| 2636c5e82f | |||
| 7fde883c3f | |||
| 591706d7fd | |||
| e43c22acfe | |||
| cdf82df326 | |||
| 3f55833939 | |||
| a14599bb15 | |||
| 9bb7733b33 | |||
| 5b7af2e10c | |||
| 04260f4551 | |||
| 78f1f3ebdd | |||
| f4cf822b3c | |||
| 99d71cdf4a | |||
| 3830267a1e | |||
| 330049d732 | |||
| 5aa936f69f | |||
| 01ab0ba14d | |||
| ffa54b2135 | |||
| 956b0d85b1 | |||
| 9d3a2bc778 | |||
| 1d3d20e6c5 | |||
| 095cfcdde2 | |||
| a2fadb94fd | |||
| 60881a74c9 | |||
| ad90e39447 | |||
| 2f825652e5 | |||
| f542f77cd2 | |||
| c59e13b614 | |||
| 8ff1c4856e | |||
| b3ceda5a6e | |||
| 5b922e069e | |||
| 21decf6790 | |||
| 9e48cc4156 | |||
| 96301f20c6 | |||
| 963b2f327f | |||
| 6a8d6af17e | |||
| 79d1d0c109 | |||
| 737cac559c | |||
| bc30d67c3f | |||
| f2cf5ce1ab | |||
| 85c134ce2a | |||
| 4b0aafa1de | |||
| a56d200230 | |||
| ff6b7ee9cf | |||
| 47508150c2 | |||
| 73ade7588c | |||
| 3954a97734 | |||
| 403b5fe09a | |||
| 59e46077fc | |||
| 088ab759da | |||
| 057d6c67f7 | |||
| 76fbeba67a | |||
| 862fc69460 | |||
| e501d10ac1 | |||
| 1676f41744 | |||
| 1ec58e3563 | |||
| 0505135d7e | |||
| ee32422796 | |||
| 8342596133 | |||
| 30ad7b611a | |||
| 2ab69e4503 | |||
| 9838c1c014 | |||
| 22ef92e984 | |||
| d7ba0180d2 | |||
| f38f6dd0ed | |||
| 42b4131b1f | |||
| 741af05159 | |||
| e4df5320bd | |||
| 6606e1356e | |||
| ec69c733ee | |||
| 1d214b20e4 | |||
| 4e6fde17ea | |||
| dccfa76994 | |||
| 9ffa1abb54 | |||
| 6be0b48270 | |||
| d108e59a84 | |||
| ebdf7074d3 | |||
| 7193f8dcab | |||
| 0e161c6ec1 | |||
| 93e748a981 | |||
| 2afca52a41 | |||
| 5e894ea45c | |||
| d48d40fc41 | |||
| 121ef2f244 | |||
| 2fc95bdf57 | |||
| 9a7abd751f | |||
| cabae8142d | |||
| 2d0da37907 | |||
| 42ec33bd9a | |||
| 806027408a | |||
| dc6d53de7c | |||
| 70f2eee172 | |||
| 7737dbc77f | |||
| 9d9d582598 | |||
| f1796dc8c8 | |||
| ebb4ff1dc2 | |||
| ea5e7f1416 | |||
| 917e62621d | |||
| a88e3265cd | |||
| b2d1d0f1d9 | |||
| c6204fc274 | |||
| 8b383d4dbe | |||
| 7b695bf6bf | |||
| 327547a895 | |||
| e2fbd83086 | |||
| d96e1297f7 | |||
| 2748216190 | |||
| b2457b6ee6 | |||
| bf20f5d2bf | |||
| 767854a2af | |||
| 243173df3c | |||
| 408c6d96b1 | |||
| 039407b6ee | |||
| 71ff0c6362 | |||
| b3aeab777f | |||
| b8110e9db3 | |||
| f500fcd6fd | |||
| bda0dee371 | |||
| ec756fe626 | |||
| b78ff57f6a | |||
| 9fa9e75e08 | |||
| 095f7277e2 | |||
| f26dbf530c | |||
| 76378156f7 | |||
| c12948c6cc | |||
| e99dc8dce4 | |||
| 258ba233d5 | |||
| 2b538e4864 | |||
| a0dc300a7b | |||
| 9f54bca831 | |||
| bb2ee7260f | |||
| 1bef4d00ad | |||
| 81176c98a1 | |||
| 6c4fc44163 | |||
| a41f2e9260 | |||
| cc9e41fe44 | |||
| 4d77ced41d | |||
| 54202eeb8a | |||
| 0e1c5cd6f8 | |||
| 8f50d9faec | |||
| 5249864af4 | |||
| 3e5ceb1e1e | |||
| ed46025a11 | |||
| 706b24e1c8 | |||
| f5651de725 | |||
| 51ff2969e1 | |||
| 5773dc47f4 | |||
| c30c56e8eb | |||
| eab7794e3b | |||
| b347cd2f54 | |||
| 78052fbaec | |||
| 557dc9b649 | |||
| 9fbcce13b3 | |||
| 6d433d4ef7 | |||
| 7531b1fdbd | |||
| 58586ca4f0 | |||
| 09a0573932 | |||
| b6789ee523 | |||
| f1b6c13ba9 | |||
| ccc8d209da | |||
| e624e1ba69 | |||
| d0cc88f82a | |||
| a48ce78733 | |||
| d1f6440a76 | |||
| 5ccc33719e | |||
| 0f09cad1cf | |||
| f92ec30e1b | |||
| a9fbbaa88e | |||
| 3db3eb58a3 | |||
| e455c874c6 | |||
| 32af903a2d | |||
| c12553812c | |||
| c9df03d293 | |||
| c71e1d78e0 | |||
| a84109df2c | |||
| 9d0e4e9768 | |||
| 3f2e6d82c9 | |||
| 56b208ad85 | |||
| 842b25f80f | |||
| 27a1db617c | |||
| 8356009526 | |||
| 0cbb2f0525 | |||
| 0ac5e85cd9 | |||
| 9b5dbe858c | |||
| 914e0869b1 | |||
| 2c742bee41 | |||
| a9ac4d427f | |||
| 0f332e331d | |||
| be69453bfd | |||
| 5e6723aa22 | |||
| c7449c8f95 | |||
| e23cbd1de9 | |||
| 0fe297c390 | |||
| b10303cd8d | |||
| 9e9715a2ea | |||
| a04995174f | |||
| e4a97258f3 | |||
| 912f5fb4f3 | |||
| 4d9898770a | |||
| 508ccb714c | |||
| 0c1da8e13b | |||
| d40573df5b | |||
| 707d19284d | |||
| 5a6b07e4c5 | |||
| 935645d553 | |||
| d9f2931b9e | |||
| 0770f4a216 | |||
| ecc9406968 | |||
| d06be3d1d6 | |||
| aeecadffb0 | |||
| f3e23b6420 | |||
| 7c5b1942e6 | |||
| 9850761b5c | |||
| 1e1f7ce56d | |||
| 64005c2774 | |||
| 22ad2d1fab | |||
| 9d478b570f | |||
| 35fb320ff0 | |||
| e000a6727e | |||
| 3a3b997e97 | |||
| f3c957481c | |||
| e8134803c4 | |||
| 7b3cfd989f | |||
| 13f5222ec7 | |||
| 29abfbcdc9 | |||
| a63e05d444 | |||
| f0f1c57ff1 | |||
| d2ef0671e3 | |||
| 5383de10b8 | |||
| 1318dde3ca | |||
| 90e96678a6 | |||
| 2e13c6043d | |||
| 32d0241f54 | |||
| e8fe1cd044 | |||
| 956a9b8fab | |||
| 5732290c29 | |||
| 601b40dd86 | |||
| 7f1add4bdd | |||
| fa17d83501 | |||
| 99d3da467e | |||
| b54794255a | |||
| ce5dd6bc16 | |||
| 45feda8f07 | |||
| bd4c20d9ce | |||
| cc89a1e1ca | |||
| df6b550c3d | |||
| 0cb5e3421a | |||
| 4d5bf4ec0c | |||
| 88fe9ba186 | |||
| b756c16018 | |||
| 1e44bb1832 | |||
| 3baec506e2 | |||
| 90a0cc0e03 | |||
| a7c9eff959 | |||
| a346e258d3 | |||
| c673e9f52d | |||
| 1bd86ca28b | |||
| 4594a84753 | |||
| a1af870874 | |||
| a831e15bf7 | |||
| d77e1e9a53 | |||
| 699fb12604 | |||
| 9505be310f | |||
| 503a0e6763 | |||
| b8d5ea595e | |||
| 5404dff5c2 | |||
| a5ec8565e4 | |||
| 65b35a4b8a | |||
| e5d526c9af | |||
| cb9e09c21b | |||
| 750fd1f941 | |||
| 1308465280 | |||
| a38633c453 | |||
| 3949cba83c | |||
| e10d784e83 | |||
| 0f5c5dcf3e | |||
| ed3a827b5f | |||
| 7f49cae9af | |||
| 427f4647fc | |||
| d5d10aa329 | |||
| 5b2b1930d2 | |||
| 5655cc8f42 | |||
| 8bad080d59 | |||
| 0237235dcb | |||
| a5bbf0dbde | |||
| 5ec018b904 | |||
| f2a13b64d4 | |||
| 44ecac7ffc | |||
| 60076d48c7 | |||
| 2fbeac6077 | |||
| 57355a741e | |||
| 14d6273a2f | |||
| 0cec65f35f | |||
| fcdd05dede | |||
| e008c7e2b4 | |||
| f42a9a760a | |||
| 80767d65ae | |||
| 21b2e59fbb | |||
| 5fb1ad078b | |||
| 1fc5316d12 | |||
| 1ceb781903 | |||
| d3891688f0 | |||
| f876068086 | |||
| 6ae68bc6cc | |||
| a8e7faec3c | |||
| ab6e291976 | |||
| 2cb12e3c0f | |||
| c91c209974 | |||
| 45a8d82a83 | |||
| b41d25cbce | |||
| 3d201ec73f | |||
| fa91e3e3ab | |||
| 38c87c158a | |||
| 241d37130a | |||
| 21981f666f | |||
| afe917a7f3 | |||
| d2a03b90ec | |||
| 88587fb6a4 | |||
| 895758d27d | |||
| 48d86ac7ae | |||
| bc3cddc774 | |||
| d784fddf95 | |||
| fc7abbf541 | |||
| 8b4f8de988 | |||
| 549ed76e7c | |||
| e7016564b1 | |||
| 8318a9c1d0 | |||
| 6b1490dac4 | |||
| 5c51652e16 | |||
| 6736f2f77a | |||
| ab685ccc8c | |||
| b5d841ffc9 | |||
| cb17bcd2ff | |||
| f17b7b3c79 | |||
| 1374a0440b | |||
| 7fa40eba83 | |||
| 62e492452d | |||
| 30d7588d9c | |||
| e736048fab | |||
| 14e59281e4 | |||
| 895dcf4aa6 | |||
| 6d9d606085 | |||
| a94b9f9426 | |||
| ace84ae29f | |||
| 22c88eb59d | |||
| 96bbae8e28 | |||
| 479c5f896c | |||
| 0d3642f39d | |||
| e47e1998a1 | |||
| 62492c7607 | |||
| c3aecc1a11 | |||
| 6629ead842 | |||
| 14dd70fb3d | |||
| 2000a95fa7 | |||
| 68ac2f4c79 | |||
| 05aaf0dc99 | |||
| f33db8647a | |||
| 0ade65036e | |||
| b8bb40fcf8 | |||
| 0d133cfbdc | |||
| 337fea0f69 | |||
| ee23196548 | |||
| 394dc31bb0 | |||
| deadb6f6d0 | |||
| a6c6be9c2e | |||
| 93a38566ea | |||
| 2a2f046f30 | |||
| 73b4b0dcee | |||
| b930ae0ca9 | |||
| 8cdb6d77ab | |||
| afc4d0f3d3 | |||
| 3bbaa7025a | |||
| 5509bc4989 | |||
| 3cfa110a48 | |||
| 1ab3917332 | |||
| 2fb1e5bef7 | |||
| a4cb839c6f | |||
| 3b1960b977 | |||
| 116f15f4ae | |||
| a0bb8efc2b | |||
| 90ffc4e5f9 | |||
| bf11575346 | |||
| 8dc8371a7f | |||
| ee38f88562 | |||
| e90de5d815 | |||
| 7fe7a8dd0e | |||
| 8afc25b19c | |||
| 37a39e750f | |||
| 59a9137a54 | |||
| f4c1e81f64 | |||
| 7391af1c37 | |||
| c376f220ca | |||
| 5ce0a1535f | |||
| 06bf9def8e | |||
| 57489abc3a | |||
| 200aca93d3 | |||
| f8eae517f0 | |||
| 3a651bc660 | |||
| 4b7828f686 | |||
| befb74297a | |||
| c0e16cd34a | |||
| e710a6e2d1 | |||
| c378cd1d47 | |||
| cd74b300f1 | |||
| 26cd07933e | |||
| c4342b0a20 | |||
| 3038c56af4 | |||
| 3dc3e25649 | |||
| e7071fbe43 | |||
| 01670ec6ae | |||
| 4d4571ee55 | |||
| 83bbb4f6ba | |||
| a406d6dba2 | |||
| 72bd624384 | |||
| 82a02698df | |||
| befac36a4f | |||
| 1282dffca9 | |||
| b291cd93c3 | |||
| 28257296b9 | |||
| 164e380672 | |||
| 438a9e4c3d | |||
| 5942209114 | |||
| 06788055fe | |||
| 26838609db | |||
| b408a8ce21 | |||
| 6fcc963cf6 | |||
| 0fa3472f24 | |||
| c0056f3d9d | |||
| b8fcb51aa3 | |||
| 341dc08f7c | |||
| f0873411df | |||
| 94789712e8 | |||
| d163064f95 | |||
| 64c2d64d84 | |||
| a9c510c296 | |||
| 1ef35c3f94 | |||
| 23c3edcab9 | |||
| 2c98d80506 | |||
| ac36840037 | |||
| dfdcd47ad7 | |||
| 414c650550 | |||
| 2d9ca4c335 | |||
| 6c19996f95 | |||
| 377d5c00aa | |||
| 93ca9f1cb0 | |||
| c62b3f7624 | |||
| 5fb9cf3be1 | |||
| ceebc68d18 | |||
| 66b4c64f98 | |||
| aff8090adb | |||
| cee1b72f2f | |||
| b9b11b3c2a | |||
| feca1c7994 | |||
| bd39e449d7 | |||
| 836e1d4f39 | |||
| 792393345d | |||
| 66be7ebc50 | |||
| f8b161c04e | |||
| bac361baf6 | |||
| 10bcf9c9a3 | |||
| 075727ab53 | |||
| 5a4e94d263 | |||
| ad3c2be510 | |||
| 5641bf63e8 | |||
| 79a17d8fe3 | |||
| 6814a43418 | |||
| 6891256afe | |||
| 17b097b1a3 | |||
| a96c7e631e | |||
| 9df5da2a88 | |||
| 3e63551e90 | |||
| 2a426e2812 | |||
| c4f4983f6d | |||
| a925c7410a | |||
| f7e2f3a4d5 | |||
| b1befacb84 | |||
| 23ebb0e754 | |||
| 5f9e8dedec | |||
| 3b2015e816 | |||
| f1e851e1b8 | |||
| b191d3918e | |||
| db46050b16 | |||
| 24a11ac2a8 | |||
| 1cf69361a1 | |||
| 689fab2ba4 | |||
| b36c757753 | |||
| 63f19aa4d6 | |||
| 8728d88dde | |||
| f6888b099e | |||
| 239ceb75a9 | |||
| 20c9ed27fb | |||
| ac4526744a | |||
| d2a8ac54cf | |||
| 153b16ebd7 | |||
| b535791c66 | |||
| 6ed7e8fa40 | |||
| 9d95bbaa8c | |||
| e41ec4ebfd | |||
| 195d5b1aa2 | |||
| 7ea3fb1500 | |||
| 9be8589437 | |||
| ff81d339ef | |||
| 7858225565 | |||
| 83bd1deafd | |||
| 9158e1c270 | |||
| f0d182771d | |||
| 6081ed35bc | |||
| 4ca10c7869 | |||
| 9fc31b1021 | |||
| 366a5162b7 | |||
| 6fd58c418e | |||
| 08d9ae0ae6 | |||
| 27eb53e1a1 | |||
| 31b5685251 | |||
| 894cf2c886 | |||
| 5b3079acde | |||
| 0f49503abd | |||
| be4e1edc3e | |||
| 1982694ef0 | |||
| 8b475e9f54 | |||
| 2b546eb4b3 | |||
| 69cefb6822 | |||
| 9772227146 | |||
| 34bddc7db1 | |||
| 7ff4ce18ff | |||
| 6e7a7c9350 | |||
| 2a9c6bbd1d | |||
| 0835a6559c | |||
| 489c4a3661 | |||
| 43dca143fa | |||
| 6bd13feba6 | |||
| d1557e5292 | |||
| c9fbafe014 | |||
| 0612b923e1 | |||
| 6f13a33be2 | |||
| 4ccf969f7a | |||
| 3d206e06d0 | |||
| 25e90deed6 | |||
| 7bc687194f | |||
| d3bd377264 | |||
| 974c55418b | |||
| 0870a86a3a | |||
| dd2e2c5b3a | |||
| 75a1b14beb | |||
| 8a760dc1e2 | |||
| fc0b885a14 | |||
| f12ad5c874 | |||
| fd0584b406 | |||
| 374f6e40bb | |||
| 9c9e17a9d9 | |||
| 865a26cbbe | |||
| 56e825cad4 | |||
| 1df608e902 | |||
| 07f031e4c5 | |||
| 06c31a39f2 | |||
| 2a6e38e020 | |||
| cc69e5d966 | |||
| d68969dbe2 | |||
| c4d20f06ee | |||
| 3c5c6f9883 | |||
| 8e7dc2a91e | |||
| 4ddbc8ba5c | |||
| 15f379e87f | |||
| d4a7b3074e | |||
| a3492e59ef | |||
| 515ad56fa2 | |||
| ebd20dd816 | |||
| 019a9f6089 | |||
| 273b110db4 | |||
| 0bea701a83 | |||
| ee22b9dc25 | |||
| a1096aaf92 | |||
| c631c37a34 | |||
| 885ee15767 | |||
| c978ab2b84 | |||
| f045b5b6b6 | |||
| c51a023e61 | |||
| 645df4fb06 | |||
| b53028782f | |||
| ef551c36ae | |||
| e851efa0a8 | |||
| 0084bc051c | |||
| 07b6d3558a | |||
| 9c8023d64f | |||
| 6d02f5d9da | |||
| 1f9f281c31 | |||
| 846b64048f | |||
| 55f73b6cf7 | |||
| 0f6c1aea62 | |||
| d2ee61ef8d | |||
| a1399c5157 | |||
| 7b7a92758f | |||
| 2a21141dd4 | |||
| eac9f67bc1 | |||
| bd300651ec | |||
| a2b0d0714e | |||
| 3d66316716 | |||
| 9c32f978fb | |||
| b19611e3d2 | |||
| 37e776e407 | |||
| ed5ad91a32 | |||
| ecddb8aae5 | |||
| a855b17cc0 | |||
| 27dd1bda25 | |||
| 4afd9fd8df | |||
| 73c19b278f | |||
| b4cb1028ed | |||
| 4a7f1a5fde | |||
| 5d0fdc8313 | |||
| 70b324cdec | |||
| 20516bb8bc | |||
| c18b9163ca | |||
| db5b65beac | |||
| 78e5baf6a5 | |||
| 05a0a6b539 | |||
| 4833c19366 | |||
| 65fd22f5b6 | |||
| f57df83d26 | |||
| 66894b71fa | |||
| 7e9ee0610a | |||
| 3adda3629e | |||
| f733611213 | |||
| a57fe6c04d | |||
| 29b043342a | |||
| 8d8bf87c69 | |||
| ca54313bd8 | |||
| 780e78f056 | |||
| 4d447b7544 | |||
| 7a96c1ff76 | |||
| 83c15c05bb | |||
| 9a44902949 | |||
| e84b5410ec | |||
| 9ac19cbd2f | |||
| 39a2bc2535 | |||
| 15771355cb | |||
| ab88a6339a | |||
| f3111e855d | |||
| 3c6838ee35 | |||
| 36ab08e60d | |||
| 834c4553b2 | |||
| 5a95336601 | |||
| f26fae2daf | |||
| 20df4289c2 | |||
| 217701ae05 | |||
| f1509bab28 | |||
| 30fdd7336e | |||
| 3b120cc5a4 | |||
| 4cf0c38940 | |||
| 0f383d2fc6 | |||
| 483df22929 | |||
| 07f21a1520 | |||
| f870fc3ae2 | |||
| bbb5354e9c | |||
| 21e2c830e5 | |||
| c828c90161 | |||
| f725f4c0b9 | |||
| 1535f95cf1 | |||
| b1f85b7462 | |||
| 3a0af54f48 | |||
| 4e3e9386cc | |||
| b27e556363 | |||
| 449fc597b5 | |||
| b0a0c5b66c | |||
| f1d5c0257f | |||
| ae46520edf | |||
| 0e91a2d25b | |||
| aba995a42f | |||
| bf0c7fe0dc | |||
| 2ab8b9dd55 | |||
| e1ffdee57a | |||
| 7c44767d4d | |||
| 87ccaa9dd8 | |||
| e8c2f18a4d | |||
| 6b36543717 | |||
| bb2a883dc7 | |||
| be7e88de36 | |||
| 4a1490f0b1 | |||
| e0d0acc33c | |||
| e2f2d3e6f6 | |||
| afc04dc41c | |||
| bdfa503c05 | |||
| 205a8b2ebe | |||
| d18c245730 | |||
| e4eb064562 | |||
| 9fc9382e58 | |||
| 2bf9efaf30 | |||
| 528b4c89ce | |||
| 277dabc8b4 | |||
| 9a5bc444ba | |||
| e834fc5a42 | |||
| 6b87985a44 | |||
| a65a74b866 | |||
| b2124201d5 | |||
| 29b8326042 | |||
| 81bfa6edc9 | |||
| 8ed6a92022 | |||
| c9d16e16cc | |||
| d9f9401c5a | |||
| 1e9918b9cc | |||
| 6c84b7a259 | |||
| 43b337e163 | |||
| 45306ca20e | |||
| 259d93f95c | |||
| 61b6aeb252 | |||
| d694c35db4 | |||
| f105d6f84f | |||
| b1b6953200 | |||
| fa428e343b | |||
| 5d9d64e6e7 | |||
| dbbb67f398 | |||
| a9bddfa784 | |||
| f9b784a42a | |||
| d47bd5d6e7 | |||
| e1013aec94 | |||
| 1c294059df | |||
| 305296883d | |||
| a7016d1186 | |||
| 004e02af73 | |||
| 143d714037 | |||
| da8376bba1 | |||
| 4e8f54bb61 | |||
| 0eac545271 | |||
| f773a0755d | |||
| d8343dae8e | |||
| b09fbe2d9b | |||
| 6dbfd25bdb | |||
| ecfd03f79c | |||
| 66a295d5af | |||
| d7458d81a5 | |||
| cc5e4c19e1 | |||
| 0c5cb59875 | |||
| 85ed0ecb06 | |||
| 95b9392f51 | |||
| c7c1bbe35f | |||
| 192d3d1a8e | |||
| 877d57681d | |||
| 0a9bc084f4 | |||
| ec4f8ce239 | |||
| d049a16882 | |||
| ee75cab73e | |||
| 0072e21ffa | |||
| f44dde89db | |||
| e6fd761b80 | |||
| 62a378e01a | |||
| e67b705397 | |||
| 847f6411e7 | |||
| 0d7c04682d | |||
| baf068330c | |||
| 593646061e | |||
| 9ac231c403 | |||
| d2d7a871ce | |||
| b172b08782 | |||
| 18778aa511 | |||
| b7e32e13ab | |||
| 610c76578b | |||
| e721fbd89f | |||
| ff2c5290b5 | |||
| 2b4dc97a97 | |||
| 14842183f2 | |||
| b4b13d8dd4 | |||
| e3d1e8a5ea | |||
| d9f90f726b | |||
| e0062a6ff1 | |||
| e494c9ec76 | |||
| 2501095500 | |||
| ec0877004c | |||
| 3cfc5db54a | |||
| 840835fad2 | |||
| 41f136ce0f | |||
| 32cae3aacd | |||
| 832c524c3c | |||
| a18ca9a4ad | |||
| 05e7e6630c | |||
| 788d8660b8 | |||
| ab806b2a9b | |||
| 610ba00915 | |||
| e60bd165f4 | |||
| 223d4f64eb | |||
| 827ad85651 | |||
| 69c5d65318 | |||
| b834dddb11 | |||
| baddfec6d1 | |||
| fc2f56aca6 | |||
| 0364fd629b | |||
| 5dbaf3f94e | |||
| c5b7ea9c44 | |||
| 7b856fdc95 | |||
| 890df65970 | |||
| ab6dfca36e | |||
| 72bb2dd932 | |||
| ca09852898 | |||
| e21cb9154a | |||
| af124ce163 | |||
| c28381fb09 | |||
| 973ff0efa0 | |||
| 27896b6410 | |||
| 4bb9de21b4 | |||
| 890538c667 | |||
| 4b9fa0dcf5 | |||
| 14d1b7dd24 | |||
| 6788844270 | |||
| b2f2537338 | |||
| 450b998a29 | |||
| 688d9c77cb | |||
| d71ea5a72b | |||
| 01e3ece2af | |||
| afc65f7557 | |||
| d60484b917 | |||
| feceb4e00f | |||
| 67b33a575a | |||
| 76b869146d | |||
| 32e725392b | |||
| 0975ac2a25 | |||
| cf3bcc4549 | |||
| 11ea889fa9 | |||
| c5a28a5734 | |||
| b171071893 | |||
| 6c79a17c7a | |||
| b24d98df9e | |||
| 400e2f1b0e | |||
| 22e6139ca3 | |||
| 859fa16a74 | |||
| 8facb46def | |||
| b87f8b96e1 | |||
| 37df16a3e4 | |||
| ce45fa3d54 | |||
| 7f56d9456b | |||
| 91fd32b708 | |||
| 1cad2489a3 | |||
| 7cdc2456cd | |||
| 6b0ee3eeed | |||
| 57330e39ca | |||
| af29f2f3dc | |||
| 1bdb577b60 | |||
| 329ea1c9b4 | |||
| 728da6354f | |||
| d5456d6eb3 | |||
| e65714988f | |||
| 4e4df736f9 | |||
| 5bfe5b0035 | |||
| b30553ea65 | |||
| 2550763808 | |||
| 6f6dd2f4a3 | |||
| c30d457b1c | |||
| b786fa1c22 | |||
| bbcbe305a8 | |||
| 222df16f11 | |||
| 8b924d13c1 | |||
| 66e25c81b0 | |||
| e12f99ee53 | |||
| 387f0cf457 | |||
| f11acdf5db | |||
| 3af7dddcc2 | |||
| 543e2ecd13 | |||
| 35f8051a62 | |||
| 4453453d46 | |||
| 23f5f4d85f | |||
| 90a21696f6 | |||
| fa38f0ac91 | |||
| 3279016067 | |||
| a92d2b6ca2 | |||
| a98a76f6e5 | |||
| e3f5af530b | |||
| 564c9ff0ca | |||
| 38d8832468 | |||
| c68aa3b371 | |||
| d031649bbd | |||
| 21b8d1838d | |||
| c8ee2fc155 | |||
| dc22fa4061 | |||
| 3eb690fe58 | |||
| 52e2327527 | |||
| f95cbb0e52 | |||
| 518a19c857 | |||
| c0b54be692 | |||
| c2c92eba82 | |||
| d64c28f672 | |||
| 21d46dad07 | |||
| 71b222e0b0 | |||
| 5921f60af2 | |||
| 39269583c3 | |||
| cba3899c62 | |||
| cfda18ea9d | |||
| 31b1ceb9f0 | |||
| d3d67fddcc | |||
| e272870803 | |||
| d8c90184b9 | |||
| 2a959d0531 | |||
| 5b1ca13225 | |||
| 0d8ac5b7ac | |||
| b714668f4c | |||
| f6e9cf644a | |||
| 604bfb5fe6 | |||
| b3ea47b989 | |||
| 5d368e59a0 | |||
| 3afd3ce2d5 | |||
| 4504d0ae96 | |||
| f14ba6ace6 | |||
| 518f9dc9dc | |||
| 8db29a30e0 | |||
| 1b9f6ed20f | |||
| 2c5cc7fcc0 | |||
| b9f177d1ab | |||
| 0e76585709 | |||
| 8bf51512ac | |||
| 779e8e7169 | |||
| 3c8b80152b | |||
| f280412ef4 | |||
| 9708601d3b | |||
| d671f57952 | |||
| 56e6df261d | |||
| 88b02105b3 | |||
| 1327fa40cb | |||
| b70ab01308 | |||
| 46fd5a5855 | |||
| 74c1e200ce | |||
| 31945a53a2 | |||
| 3e91ba3fb2 | |||
| 0094216ff8 | |||
| 298ee284e1 | |||
| 7f2f73afd8 | |||
| e257f9e4a0 | |||
| 056de752ed | |||
| 76700c0b24 | |||
| 9fdcff657d | |||
| 2b6339c05c | |||
| bb91202439 | |||
| f25e9f262a | |||
| ee51077f49 | |||
| 950e958a58 | |||
| 5fdbed2b56 | |||
| 0e627577fc | |||
| 4846d4b024 | |||
| 5e5293bf7b | |||
| d88477dcae | |||
| ae03bc2dd2 | |||
| 5cd27032b4 | |||
| 7445064d97 | |||
| 9f8b15f0d5 | |||
| bb2e22ecf2 | |||
| bd58bd91b4 | |||
| 7ce0d88bdc | |||
| 98bb2d40d6 | |||
| f4bc620bbd | |||
| 0313bf32c9 | |||
| 0c887cd29e | |||
| 5bd9bce634 | |||
| 2a53d0a462 | |||
| b5b1d84b3f | |||
| 82bd915274 | |||
| e47fc5a54a | |||
| 26e24769be | |||
| 71391cf1cc | |||
| b5286af526 | |||
| 9f07a2a54e | |||
| 4b62395d69 | |||
| c39c642b60 | |||
| 02cff3973a | |||
| a63b97d31d | |||
| ca52122656 | |||
| 20a7fcf6a0 | |||
| 43665aa7eb | |||
| 3b9b49950c | |||
| 0a8752ec0a | |||
| 47685dc2be | |||
| 517ee5bb25 | |||
| 3ab01d3576 | |||
| 31b6d4d658 | |||
| 08f840d642 | |||
| 776b6259cd | |||
| 5c81c71116 | |||
| 188b635ea0 | |||
| 56066a3212 | |||
| ed50ce9c90 | |||
| a7e77f6e21 | |||
| 56278b17ee | |||
| bd78db72b9 | |||
| 32bd72fecd | |||
| 3a798a70fa | |||
| 02429266b1 | |||
| 77aea0c69c | |||
| 6a3ce862cb | |||
| 93217da619 | |||
| bbaa2dfc73 | |||
| ab22b88a53 | |||
| 63def54dad | |||
| 00f9a28729 | |||
| 092beb6ae9 | |||
| eb69186271 | |||
| 56beca0db4 | |||
| 64cd898a65 | |||
| 394860656a | |||
| 90472a4b31 | |||
| a1999183f2 | |||
| 1e3ce48024 | |||
| 0007185b5f | |||
| 403d2cedc0 | |||
| c8839b8587 | |||
| cf048c9804 | |||
| bea75f51bd | |||
| 1bf6612002 | |||
| d9a18b1d31 | |||
| 465f30661f | |||
| a62ca5452e | |||
| b07d74d28d | |||
| dacb3b0891 | |||
| 92254eefcc | |||
| 2d56411e5f | |||
| f8dc8ab903 | |||
| 2a55cda583 | |||
| 7c91c03adf | |||
| caa902ea9b | |||
| fb07071e24 | |||
| a1cb7dcbe7 | |||
| a8db0086b1 | |||
| e46b6d5b06 | |||
| dfc8c1fac2 | |||
| f8de118288 | |||
| 032f698c7b | |||
| 0ac3ab2329 | |||
| e2aaef9b88 | |||
| ee0303bcfb | |||
| 1523c7b4ce | |||
| a16a8eaded | |||
| 9ff9d48ffd | |||
| dfb1fb91a5 | |||
| 8f56ab9534 | |||
| c0dda45c7b | |||
| 3efb981f00 | |||
| ed408917c6 | |||
| 2ca435a414 | |||
| de9e282bad | |||
| c437daf9be | |||
| 1e4f96486f | |||
| e03d0f3322 | |||
| 5f0e1253cc | |||
| 7e6b040258 | |||
| 329ebb6482 | |||
| 7a9c58003d | |||
| 371a16e37b | |||
| 95629e792d | |||
| e79af2fd60 | |||
| 4aba0153f8 | |||
| f91c33e17c | |||
| 6c29877b20 | |||
| 3abde6ecfc | |||
| b42168eee5 | |||
| ac3b2c0ef2 | |||
| f640452b7b | |||
| 2f670495ac | |||
| 2a36edf528 | |||
| 5e690abd76 | |||
| 4008e19ca9 | |||
| e9070b30a0 | |||
| 636a1ff930 | |||
| 887311d1f1 | |||
| 3888c4ba21 | |||
| 69173803bf | |||
| 13e31650be | |||
| 3563287f17 | |||
| 91ee9f5e05 | |||
| 49918a1067 | |||
| 466f9a4797 | |||
| c7997e0c2f | |||
| 4805dfbdba | |||
| 62424215c1 | |||
| 97ae13759e | |||
| 108678d94f | |||
| 66dbba5c16 | |||
| d84cef0c18 | |||
| 077cefc60e | |||
| 35acc668c9 | |||
| ebbe0f12ed | |||
| 6a8b76278a | |||
| 8ac99ef28f | |||
| 547cf7f600 | |||
| b8b8b118c9 | |||
| 76247323eb | |||
| 0ff20c7c85 | |||
| dd690e7495 | |||
| ca500548a3 | |||
| c0b73375b1 | |||
| 9c6d6a0b07 | |||
| 179f6014bf | |||
| b580c6ec8e | |||
| dd60cf0040 | |||
| cc851b29fc | |||
| 59643b2fb9 | |||
| 3a5bb81d39 | |||
| 5ec860015d | |||
| 0f701ec08e | |||
| 387c3ea2f4 | |||
| 85b134b7be | |||
| 5d17d2509d | |||
| 036d4b2f4b | |||
| f8e4f54c77 | |||
| 206b948ee1 | |||
| fbad6ba75c | |||
| bf3403449d | |||
| d13b98b205 | |||
| 1188150163 | |||
| e78191cc82 | |||
| eb978c767e | |||
| 661dc8ea1c | |||
| 93f12b73d8 | |||
| 1091bc6e2c | |||
| 594c0fb8e7 | |||
| b6696564f5 | |||
| 316e5b2845 | |||
| c1738bcb0a | |||
| 7b3e41efae | |||
| ea20dc6da0 | |||
| 9becddd84f | |||
| b08c765400 | |||
| afd59d7eb3 | |||
| 47cdd0582c | |||
| af54d04f9d | |||
| 1d2b3bc858 | |||
| 4b552563be | |||
| ebd929176c | |||
| 430e685a7c | |||
| d5bd857c45 | |||
| b8b9ba3069 | |||
| 84c79d5192 | |||
| 028f3a7871 | |||
| 0c462315f0 | |||
| 26261a2090 | |||
| 3fc1895b56 | |||
| a70d7cf1f9 | |||
| 1f592ba1a1 | |||
| a43daf025d | |||
| 296a2afa95 | |||
| a7e879a3a4 | |||
| 27b160b464 | |||
| 7c3c4f1a63 | |||
| c61ecc0545 | |||
| fbae93b532 | |||
| 35d6e5fd21 | |||
| 114828adcb | |||
| b5de4d78ad | |||
| 0913e6f738 | |||
| 5a587a8582 | |||
| 3cef8cfd61 | |||
| 09964df198 | |||
| dd8e6bf694 | |||
| 58cd3e82f6 | |||
| 22ba7f2ee5 | |||
| 99c26ff9af | |||
| a2d91d989d | |||
| 881154e9f4 | |||
| f52f3920cb | |||
| f99a244b8e | |||
| 5dd9171316 | |||
| 5ec2476aec | |||
| a9fc5f720d | |||
| d323b1c7e2 | |||
| d6b1478bf1 | |||
| 79351f0c4d | |||
| e5bd90f58b | |||
| 7377bad721 | |||
| 25744986a3 | |||
| 668a4dbb4d | |||
| d1972a56e2 | |||
| df28b0d977 | |||
| 48100cf9fc | |||
| 69a7e1f25c | |||
| b43ed886b9 | |||
| 59fb83a469 | |||
| 76f0768b99 | |||
| 7544500be1 | |||
| b2b855200f | |||
| 241a8bc764 | |||
| 18a0e8d612 | |||
| ec08a6ca72 | |||
| 7b7d7aaf3d | |||
| 2d4843b1f4 | |||
| 7ba01a413f | |||
| 2516820e4a | |||
| 0917a743cd | |||
| 13dd80d429 | |||
| 6e9902a966 | |||
| fd1e0a4e80 | |||
| b130b81863 | |||
| 1dd96ae9cb | |||
| 07c1dfc613 | |||
| fb5cedc575 | |||
| b38a7e6eb2 | |||
| 4f3f1cd163 | |||
| 4d77646f26 | |||
| 187592b673 | |||
| 215467ae42 | |||
| facd7d39dc | |||
| 6810e5f2a4 | |||
| ee6fae8956 | |||
| bb6c3233d2 | |||
| 499228cc98 | |||
| 05f08db66e | |||
| 52ee8b3953 | |||
| a8768f918e | |||
| 1d8f221f1b | |||
| d70a003617 | |||
| b443b74d18 | |||
| e52b7170ce | |||
| dd7233aaf7 | |||
| cd0878f810 | |||
| f588d6da51 | |||
| 9a363e2882 | |||
| 2901e3898c | |||
| fc341a86e7 | |||
| f2699892e0 | |||
| c63200cba0 | |||
| c8a02ac607 | |||
| 09a304c214 | |||
| 68da28ffe8 | |||
| 427e76e76e | |||
| b183b5bcfc | |||
| 51feaa0730 | |||
| 8e69aa8bd6 | |||
| 90b2fded48 | |||
| 9125ffeb9e | |||
| 28980e5fbf | |||
| aab0d772a4 | |||
| 6296e1a9eb | |||
| 1586bb0702 | |||
| edeaf6af09 | |||
| 951edd95db | |||
| 9951211596 | |||
| 6d337464f7 | |||
| d0b552d74a | |||
| 83512822b1 | |||
| ccb78103ec | |||
| 6e79ffea34 | |||
| 4f03d37a17 | |||
| 6fb8419b3c | |||
| a4272d6ca9 | |||
| 4654117d5e | |||
| 6ff260d052 | |||
| 88d2b72822 | |||
| 4bacceb19f | |||
| 846065007b | |||
| 29868531ad | |||
| 95dfb6fdc6 | |||
| 8df3999f85 | |||
| 149b189629 | |||
| b1fd86e6b5 | |||
| 5e8fdf879d | |||
| c45cba18a6 | |||
| fccd43502b | |||
| c2e8e492d7 | |||
| c916fb1844 | |||
| 004339b81e | |||
| 84ada18299 | |||
| 635fe8017e | |||
| 834380ff05 | |||
| dd65fc2289 | |||
| 86125bb625 | |||
| 09a9d8b380 | |||
| 86b223ec93 | |||
| 78f6080321 | |||
| c7be6f6e0e | |||
| c40c31fbb7 | |||
| f5fbc1e32d | |||
| 0a20378acd | |||
| d4e87877b6 | |||
| 7eb7236b8a | |||
| dc0e4ffce2 | |||
| 86fe93943d | |||
| 3258113ef8 | |||
| ebf3999cfe | |||
| a1ccbbb5b9 | |||
| 35072c40d8 | |||
| 5c51021388 | |||
| 95fd527515 | |||
| 113d851cea | |||
| 72f0c460f9 | |||
| 13ddd15b44 | |||
| c9e24aaf5f | |||
| 68c0ac0ffc | |||
| bebda275a9 | |||
| 287eaae850 | |||
| 7e59c3b9a7 | |||
| 38658a5b8c | |||
| 88c75b8672 | |||
| 17ab1e6830 | |||
| 1f45110e5f | |||
| 5401166a07 | |||
| bfa8188782 | |||
| e777a71784 | |||
| c13e91a0d0 | |||
| aac5d57352 | |||
| ceca13c7b6 | |||
| 2905470330 | |||
| 2c17033822 | |||
| 0a4cb9e9b1 | |||
| 096651f4c1 | |||
| 275a08506b | |||
| 4cd61cb381 | |||
| 9ad1147581 | |||
| 35e09def1b | |||
| 0469607a71 | |||
| d115d22ee6 | |||
| 8120ae621d | |||
| f873c2fa9f | |||
| c3ffbe2f42 | |||
| 55a0a39881 | |||
| 592215dd30 | |||
| ef0c2a2785 | |||
| 37979e452a | |||
| e9671bb727 | |||
| aa328bd591 | |||
| 188e4313f9 | |||
| df02c70e31 | |||
| 257f54b323 | |||
| fb4b5b2575 | |||
| 4e1251276d | |||
| a7b200dc57 | |||
| 8cadbae80e | |||
| c3bae49aae | |||
| 6fa4fc6149 | |||
| f1ffe1acaa | |||
| 5c9ddf7f00 | |||
| 431767a150 | |||
| 8ba4e442a6 | |||
| 2f8d19c267 | |||
| f2fd98f742 | |||
| 3ce35d6e81 | |||
| 796dbaa836 | |||
| 84b209ec7f | |||
| fa976b34dc | |||
| e7cda362b7 | |||
| a41a09c162 | |||
| e82f84f0ab | |||
| f1d387ceea | |||
| 3893d4d1f8 | |||
| cf7ac50faf | |||
| 3f6bf15554 | |||
| dac74829b4 | |||
| 94d6f213a0 | |||
| 8f2550ef61 | |||
| b622a1cc5e | |||
| c83a3c32c7 | |||
| e7dcf7f7e7 | |||
| 398785a2be | |||
| 05dba0f1f5 | |||
| 39dbd32b2e | |||
| 23a34a455a | |||
| 4308328b48 | |||
| 3f78e47918 | |||
| 7b4a9f1a63 | |||
| 561d40fd71 | |||
| d2dba124df | |||
| 133340b2ea | |||
| 344665e34f | |||
| 5d188c8c2d | |||
| 9447f3d569 | |||
| df8dc9173a | |||
| b186d19faa | |||
| ea749f12a3 | |||
| 74750fd604 | |||
| b52e8bad4c | |||
| 44f8e86245 | |||
| b036692154 | |||
| 5d050ca020 | |||
| 1b6a31b6e5 | |||
| ab4743fdb1 | |||
| 49629222c1 | |||
| 9d6778ff1e | |||
| ce73394531 | |||
| 463c8dba0d | |||
| 9bb6104cf7 | |||
| 151f4a4923 | |||
| 36f588a792 | |||
| 07c7a250cc | |||
| eab4a8c404 | |||
| cde3e3d710 | |||
| a8dc67a1b2 |
@@ -5,7 +5,7 @@ body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Thanks for taking the time to fill out this bug report! Please attach any minimal reproduction projects!
|
||||
Thanks for taking the time to fill out this bug report! Please attach a minimal reproduction project if available!
|
||||
- type: textarea
|
||||
id: description-area
|
||||
attributes:
|
||||
@@ -17,21 +17,21 @@ body:
|
||||
id: steps-area
|
||||
attributes:
|
||||
label: Steps to reproduce
|
||||
description: Please provide reproduction steps if possible.
|
||||
description: Please provide reproduction steps if available.
|
||||
validations:
|
||||
required: true
|
||||
- type: dropdown
|
||||
id: version
|
||||
attributes:
|
||||
label: Version
|
||||
description: What version of Flax are you running?
|
||||
description: What version of Flax did you experience the bug in?
|
||||
options:
|
||||
- '1.8'
|
||||
- '1.9'
|
||||
- '1.10'
|
||||
- '1.11'
|
||||
- '1.12'
|
||||
- master branch
|
||||
default: 2
|
||||
default: 3
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
|
||||
@@ -5,7 +5,7 @@ body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Thanks for taking the time to fill out a feature request!
|
||||
Thank you for taking the time to submit this feature request!
|
||||
- type: textarea
|
||||
id: description-area
|
||||
attributes:
|
||||
@@ -17,6 +17,6 @@ body:
|
||||
id: benefits-area
|
||||
attributes:
|
||||
label: Benefits
|
||||
description: Please provide what benefits this feature would provide to the engine!
|
||||
description: Please list what benefits this feature would provide to the engine!
|
||||
validations:
|
||||
required: true
|
||||
@@ -3,7 +3,7 @@ description: Downloads and installs Vulkan SDK.
|
||||
inputs:
|
||||
vulkan-version:
|
||||
description: 'Vulkan SDK release version (e.g. 1.2.198.1).'
|
||||
default: '1.3.290.0'
|
||||
default: '1.4.350.0'
|
||||
required: false
|
||||
runs:
|
||||
using: "composite"
|
||||
@@ -24,13 +24,13 @@ runs:
|
||||
;;
|
||||
Darwin)
|
||||
export VULKAN_SDK_ROOT=`pwd`/../VulkanSDK
|
||||
curl -LO "https://sdk.lunarg.com/sdk/download/$VULKAN_SDK_VER/mac/vulkan-sdk.dmg"
|
||||
hdiutil attach vulkan-sdk.dmg -mountpoint /Volumes/vulkan-sdk
|
||||
sudo "/Volumes/vulkan-sdk/InstallVulkan.app/Contents/MacOS/InstallVulkan" --root $VULKAN_SDK_ROOT --accept-licenses --default-answer --confirm-command install
|
||||
curl -LO "https://sdk.lunarg.com/sdk/download/$VULKAN_SDK_VER/mac/vulkansdk-macos-$VULKAN_SDK_VER.zip"
|
||||
unzip vulkansdk-macos-$VULKAN_SDK_VER.zip
|
||||
sudo "vulkansdk-macos-$VULKAN_SDK_VER.app/Contents/MacOS/vulkansdk-macOS-$VULKAN_SDK_VER" --root $VULKAN_SDK_ROOT --accept-licenses --default-answer --confirm-command install
|
||||
export VULKAN_SDK=$VULKAN_SDK_ROOT/macOS
|
||||
;;
|
||||
*) # Windows
|
||||
curl -L -o vulkan-sdk.exe https://sdk.lunarg.com/sdk/download/$VULKAN_SDK_VER/windows/VulkanSDK-$VULKAN_SDK_VER-Installer.exe
|
||||
curl -L -o vulkan-sdk.exe https://sdk.lunarg.com/sdk/download/$VULKAN_SDK_VER/windows/vulkansdk-windows-X64-$VULKAN_SDK_VER.exe
|
||||
./vulkan-sdk.exe --root "C:\VulkanSDK" --accept-licenses --default-answer --confirm-command install
|
||||
export VULKAN_SDK="C:\VulkanSDK"
|
||||
;;
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
#!/bin/sh
|
||||
# https://gist.github.com/ongardie/aa15f1f0d0e6b59890a9
|
||||
gdb -q --batch \
|
||||
-ex 'handle SIGHUP nostop pass' \
|
||||
-ex 'handle SIGQUIT nostop pass' \
|
||||
-ex 'handle SIGPIPE nostop pass' \
|
||||
-ex 'handle SIGALRM nostop pass' \
|
||||
-ex 'handle SIGTERM nostop pass' \
|
||||
-ex 'handle SIGUSR1 nostop pass' \
|
||||
-ex 'handle SIGUSR2 nostop pass' \
|
||||
-ex 'handle SIGCHLD nostop pass' \
|
||||
-ex 'handle SIG34 nostop pass' \
|
||||
-ex 'set print thread-events off' \
|
||||
-return-child-result \
|
||||
-ex 'run' \
|
||||
-ex 'thread apply all bt' \
|
||||
--tty=/dev/stdout \
|
||||
--args $*
|
||||
@@ -4,6 +4,7 @@ on: [push, pull_request]
|
||||
env:
|
||||
DOTNET_NOLOGO: true
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT: false
|
||||
DOTNET_ROLL_FORWARD: 'minor'
|
||||
|
||||
jobs:
|
||||
|
||||
@@ -13,13 +14,13 @@ jobs:
|
||||
runs-on: "windows-2022"
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v6
|
||||
- name: Setup Vulkan
|
||||
uses: ./.github/actions/vulkan
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
uses: actions/setup-dotnet@v5
|
||||
with:
|
||||
dotnet-version: 8.0.x
|
||||
dotnet-version: 10.0.x
|
||||
- name: Setup .NET Workload
|
||||
run: |
|
||||
dotnet workload install android
|
||||
@@ -33,4 +34,7 @@ jobs:
|
||||
git lfs pull
|
||||
- name: Build
|
||||
run: |
|
||||
.\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=ARM64 -platform=Android -configuration=Release -buildtargets=FlaxGame
|
||||
PowerShell "(Get-Content global.json).Replace('latestMajor', 'minor') | Set-Content global.json"
|
||||
PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'minor') | Set-Content Source/Tools/Flax.Build/global.json"
|
||||
PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Minor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
|
||||
.\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=10 -arch=ARM64 -platform=Android -configuration=Release -buildtargets=FlaxGame
|
||||
|
||||
@@ -10,16 +10,16 @@ jobs:
|
||||
# Game
|
||||
game-windows:
|
||||
name: Game (iOS, Release ARM64)
|
||||
runs-on: "macos-14"
|
||||
runs-on: "macos-15"
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v6
|
||||
- name: Setup Vulkan
|
||||
uses: ./.github/actions/vulkan
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
uses: actions/setup-dotnet@v5
|
||||
with:
|
||||
dotnet-version: 9.0.x
|
||||
dotnet-version: 10.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=9 -arch=ARM64 -platform=iOS -configuration=Release -buildtargets=FlaxGame
|
||||
./Development/Scripts/Mac/CallBuildTool.sh -build -log -dotnet=10 -arch=ARM64 -platform=iOS -configuration=Release -buildtargets=FlaxGame
|
||||
|
||||
@@ -13,16 +13,17 @@ jobs:
|
||||
runs-on: "ubuntu-24.04"
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v6
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y --fix-missing libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev libwayland-dev
|
||||
- name: Setup Vulkan
|
||||
uses: ./.github/actions/vulkan
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
uses: actions/setup-dotnet@v5
|
||||
with:
|
||||
dotnet-version: 8.0.x
|
||||
dotnet-version: 10.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
@@ -33,7 +34,7 @@ jobs:
|
||||
git lfs pull
|
||||
- name: Build
|
||||
run: |
|
||||
./Development/Scripts/Linux/CallBuildTool.sh -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxEditor
|
||||
./Development/Scripts/Linux/CallBuildTool.sh -build -log -printSDKs -dotnet=10 -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxEditor
|
||||
|
||||
# Game
|
||||
game-linux:
|
||||
@@ -41,16 +42,17 @@ jobs:
|
||||
runs-on: "ubuntu-24.04"
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v6
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y --fix-missing libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev libwayland-dev
|
||||
- name: Setup Vulkan
|
||||
uses: ./.github/actions/vulkan
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
uses: actions/setup-dotnet@v5
|
||||
with:
|
||||
dotnet-version: 8.0.x
|
||||
dotnet-version: 10.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
@@ -61,4 +63,4 @@ jobs:
|
||||
git lfs pull
|
||||
- name: Build
|
||||
run: |
|
||||
./Development/Scripts/Linux/CallBuildTool.sh -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Linux -configuration=Release -buildtargets=FlaxGame
|
||||
./Development/Scripts/Linux/CallBuildTool.sh -build -log -printSDKs -dotnet=10 -arch=x64 -platform=Linux -configuration=Release -buildtargets=FlaxGame
|
||||
|
||||
@@ -10,16 +10,16 @@ jobs:
|
||||
# Editor
|
||||
editor-mac:
|
||||
name: Editor (Mac, Development ARM64)
|
||||
runs-on: "macos-14"
|
||||
runs-on: "macos-15"
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v6
|
||||
- name: Setup Vulkan
|
||||
uses: ./.github/actions/vulkan
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
uses: actions/setup-dotnet@v5
|
||||
with:
|
||||
dotnet-version: 8.0.x
|
||||
dotnet-version: 10.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
@@ -30,21 +30,21 @@ jobs:
|
||||
git lfs pull
|
||||
- name: Build
|
||||
run: |
|
||||
./Development/Scripts/Mac/CallBuildTool.sh -build -log -printSDKs -dotnet=8 -arch=ARM64 -platform=Mac -configuration=Development -buildtargets=FlaxEditor
|
||||
./Development/Scripts/Mac/CallBuildTool.sh -build -log -printSDKs -dotnet=10 -arch=ARM64 -platform=Mac -configuration=Development -buildtargets=FlaxEditor
|
||||
|
||||
# Game
|
||||
game-mac:
|
||||
name: Game (Mac, Release ARM64)
|
||||
runs-on: "macos-14"
|
||||
runs-on: "macos-15"
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v6
|
||||
- name: Setup Vulkan
|
||||
uses: ./.github/actions/vulkan
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
uses: actions/setup-dotnet@v5
|
||||
with:
|
||||
dotnet-version: 8.0.x
|
||||
dotnet-version: 10.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=8 -arch=ARM64 -platform=Mac -configuration=Release -buildtargets=FlaxGame
|
||||
./Development/Scripts/Mac/CallBuildTool.sh -build -log -printSDKs -dotnet=10 -arch=ARM64 -platform=Mac -configuration=Release -buildtargets=FlaxGame
|
||||
|
||||
@@ -4,6 +4,7 @@ on: [push, pull_request]
|
||||
env:
|
||||
DOTNET_NOLOGO: true
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT: false
|
||||
DOTNET_ROLL_FORWARD: 'minor'
|
||||
|
||||
jobs:
|
||||
|
||||
@@ -13,13 +14,13 @@ jobs:
|
||||
runs-on: "windows-2022"
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v6
|
||||
- name: Setup Vulkan
|
||||
uses: ./.github/actions/vulkan
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
uses: actions/setup-dotnet@v5
|
||||
with:
|
||||
dotnet-version: 8.0.x
|
||||
dotnet-version: 10.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
@@ -30,7 +31,10 @@ jobs:
|
||||
git lfs pull
|
||||
- name: Build
|
||||
run: |
|
||||
.\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxEditor
|
||||
PowerShell "(Get-Content global.json).Replace('latestMajor', 'minor') | Set-Content global.json"
|
||||
PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'minor') | Set-Content Source/Tools/Flax.Build/global.json"
|
||||
PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Minor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
|
||||
.\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=10 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxEditor
|
||||
|
||||
# Game
|
||||
game-windows:
|
||||
@@ -38,13 +42,13 @@ jobs:
|
||||
runs-on: "windows-2022"
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v6
|
||||
- name: Setup Vulkan
|
||||
uses: ./.github/actions/vulkan
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
uses: actions/setup-dotnet@v5
|
||||
with:
|
||||
dotnet-version: 8.0.x
|
||||
dotnet-version: 10.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
@@ -55,4 +59,7 @@ jobs:
|
||||
git lfs pull
|
||||
- name: Build
|
||||
run: |
|
||||
.\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Release -buildtargets=FlaxGame
|
||||
PowerShell "(Get-Content global.json).Replace('latestMajor', 'minor') | Set-Content global.json"
|
||||
PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'minor') | Set-Content Source/Tools/Flax.Build/global.json"
|
||||
PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Minor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
|
||||
.\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=10 -arch=x64 -platform=Windows -configuration=Release -buildtargets=FlaxGame
|
||||
|
||||
+45
-36
@@ -1,12 +1,13 @@
|
||||
name: Continuous Deployment
|
||||
on:
|
||||
schedule:
|
||||
- cron: '15 6 * * *'
|
||||
- cron: '15 4 * * *'
|
||||
workflow_dispatch:
|
||||
|
||||
env:
|
||||
DOTNET_NOLOGO: true
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT: false
|
||||
DOTNET_ROLL_FORWARD: 'minor'
|
||||
GIT_LFS_PULL_OPTIONS: '-c lfs.concurrenttransfers=1 -c lfs.transfer.maxretries=2 -c http.version="HTTP/1.1" -c lfs.activitytimeout=60'
|
||||
|
||||
jobs:
|
||||
@@ -17,7 +18,7 @@ jobs:
|
||||
runs-on: "windows-2022"
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v6
|
||||
- name: Checkout LFS
|
||||
run: |
|
||||
git lfs version
|
||||
@@ -25,23 +26,26 @@ jobs:
|
||||
- name: Setup Vulkan
|
||||
uses: ./.github/actions/vulkan
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
uses: actions/setup-dotnet@v5
|
||||
with:
|
||||
dotnet-version: 8.0.x
|
||||
dotnet-version: 10.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
dotnet workload --info
|
||||
- name: Build
|
||||
run: |
|
||||
.\PackageEditor.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
|
||||
PowerShell "(Get-Content global.json).Replace('latestMajor', 'minor') | Set-Content global.json"
|
||||
PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'minor') | Set-Content Source/Tools/Flax.Build/global.json"
|
||||
PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Minor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
|
||||
.\PackageEditor.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=10
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: Windows-Editor
|
||||
path: Output/Editor.zip
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: Windows-EditorDebugSymbols
|
||||
path: Output/EditorDebugSymbols.zip
|
||||
@@ -50,7 +54,7 @@ jobs:
|
||||
runs-on: "windows-2022"
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v6
|
||||
- name: Checkout LFS
|
||||
run: |
|
||||
git lfs version
|
||||
@@ -58,18 +62,21 @@ jobs:
|
||||
- name: Setup Vulkan
|
||||
uses: ./.github/actions/vulkan
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
uses: actions/setup-dotnet@v5
|
||||
with:
|
||||
dotnet-version: 8.0.x
|
||||
dotnet-version: 10.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
dotnet workload --info
|
||||
- name: Build
|
||||
run: |
|
||||
.\PackagePlatforms.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
|
||||
PowerShell "(Get-Content global.json).Replace('latestMajor', 'minor') | Set-Content global.json"
|
||||
PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'minor') | Set-Content Source/Tools/Flax.Build/global.json"
|
||||
PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Minor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
|
||||
.\PackagePlatforms.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=10
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: Windows-Game
|
||||
path: Output/Windows.zip
|
||||
@@ -80,29 +87,30 @@ jobs:
|
||||
runs-on: "ubuntu-24.04"
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v6
|
||||
- name: Checkout LFS
|
||||
run: |
|
||||
git lfs version
|
||||
git ${{ env.GIT_LFS_PULL_OPTIONS }} lfs pull
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y --fix-missing libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev libwayland-dev
|
||||
- name: Setup Vulkan
|
||||
uses: ./.github/actions/vulkan
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
uses: actions/setup-dotnet@v5
|
||||
with:
|
||||
dotnet-version: 8.0.x
|
||||
dotnet-version: 10.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
dotnet workload --info
|
||||
- name: Build
|
||||
run: |
|
||||
./PackageEditor.sh -arch=x64 -platform=Linux -deployOutput=Output -dotnet=8
|
||||
./PackageEditor.sh -arch=x64 -platform=Linux -deployOutput=Output -dotnet=10
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: Linux-Editor
|
||||
path: Output/FlaxEditorLinux.zip
|
||||
@@ -111,29 +119,30 @@ jobs:
|
||||
runs-on: "ubuntu-24.04"
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v6
|
||||
- name: Checkout LFS
|
||||
run: |
|
||||
git lfs version
|
||||
git ${{ env.GIT_LFS_PULL_OPTIONS }} lfs pull
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y --fix-missing libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev libwayland-dev
|
||||
- name: Setup Vulkan
|
||||
uses: ./.github/actions/vulkan
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
uses: actions/setup-dotnet@v5
|
||||
with:
|
||||
dotnet-version: 8.0.x
|
||||
dotnet-version: 10.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
dotnet workload --info
|
||||
- name: Build
|
||||
run: |
|
||||
./PackagePlatforms.sh -arch=x64 -platform=Linux -deployOutput=Output -dotnet=8
|
||||
./PackagePlatforms.sh -arch=x64 -platform=Linux -deployOutput=Output -dotnet=10
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: Linux-Game
|
||||
path: Output/Linux.zip
|
||||
@@ -141,10 +150,10 @@ jobs:
|
||||
# Mac
|
||||
package-mac-editor:
|
||||
name: Editor (Mac)
|
||||
runs-on: "macos-14"
|
||||
runs-on: "macos-15"
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v6
|
||||
- name: Checkout LFS
|
||||
run: |
|
||||
git lfs version
|
||||
@@ -152,27 +161,27 @@ jobs:
|
||||
- name: Setup Vulkan
|
||||
uses: ./.github/actions/vulkan
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
uses: actions/setup-dotnet@v5
|
||||
with:
|
||||
dotnet-version: 8.0.x
|
||||
dotnet-version: 10.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
dotnet workload --info
|
||||
- name: Build
|
||||
run: |
|
||||
./PackageEditor.command -arch=ARM64 -platform=Mac -deployOutput=Output -dotnet=8
|
||||
./PackageEditor.command -arch=ARM64 -platform=Mac -deployOutput=Output -dotnet=10
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: Mac-Editor
|
||||
path: Output/FlaxEditorMac.zip
|
||||
package-mac-game:
|
||||
name: Game (Mac)
|
||||
runs-on: "macos-14"
|
||||
runs-on: "macos-15"
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v6
|
||||
- name: Checkout LFS
|
||||
run: |
|
||||
git lfs version
|
||||
@@ -180,18 +189,18 @@ jobs:
|
||||
- name: Setup Vulkan
|
||||
uses: ./.github/actions/vulkan
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
uses: actions/setup-dotnet@v5
|
||||
with:
|
||||
dotnet-version: 8.0.x
|
||||
dotnet-version: 10.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
dotnet workload --info
|
||||
- name: Build
|
||||
run: |
|
||||
./PackagePlatforms.command -arch=ARM64 -platform=Mac -deployOutput=Output -dotnet=8
|
||||
./PackagePlatforms.command -arch=ARM64 -platform=Mac -deployOutput=Output -dotnet=10
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: Mac-Game
|
||||
path: Output/Mac.zip
|
||||
|
||||
@@ -9,16 +9,16 @@ jobs:
|
||||
# Cook on Mac
|
||||
cook-mac:
|
||||
name: Cook (Mac)
|
||||
runs-on: "macos-14"
|
||||
runs-on: "macos-15"
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v6
|
||||
- name: Setup Vulkan
|
||||
uses: ./.github/actions/vulkan
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
uses: actions/setup-dotnet@v5
|
||||
with:
|
||||
dotnet-version: 8.0.x
|
||||
dotnet-version: 10.0.x
|
||||
- name: Setup .NET Workload
|
||||
run: |
|
||||
dotnet workload install ios
|
||||
@@ -31,7 +31,7 @@ jobs:
|
||||
git lfs version
|
||||
git lfs pull
|
||||
- name: Get Flax Samples
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
fetch-depth: 1
|
||||
repository: FlaxEngine/FlaxSamples
|
||||
@@ -42,7 +42,7 @@ jobs:
|
||||
cp ".github/data/Build Settings.json" "FlaxSamples/MaterialsFeaturesTour/Content/Settings"
|
||||
- name: Build Editor
|
||||
run: |
|
||||
./Development/Scripts/Mac/CallBuildTool.sh -build -log -printSDKs -dotnet=8 -arch=ARM64 -platform=Mac -configuration=Development -buildtargets=FlaxEditor
|
||||
./Development/Scripts/Mac/CallBuildTool.sh -build -log -printSDKs -dotnet=10 -arch=ARM64 -platform=Mac -configuration=Development -buildtargets=FlaxEditor
|
||||
- name: Cook Game (iOS)
|
||||
run: |
|
||||
./Binaries/Editor/Mac/Development/FlaxEditor -std -headless -mute -null -project "FlaxSamples/MaterialsFeaturesTour" -build "Development.iOS"
|
||||
|
||||
+23
-21
@@ -4,6 +4,7 @@ on: [push, pull_request]
|
||||
env:
|
||||
DOTNET_NOLOGO: true
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT: false
|
||||
DOTNET_ROLL_FORWARD: 'minor'
|
||||
|
||||
jobs:
|
||||
|
||||
@@ -13,11 +14,11 @@ jobs:
|
||||
runs-on: "ubuntu-24.04"
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v6
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
uses: actions/setup-dotnet@v5
|
||||
with:
|
||||
dotnet-version: 8.0.x
|
||||
dotnet-version: 10.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
@@ -28,25 +29,23 @@ jobs:
|
||||
git lfs pull
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y --fix-missing libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev libwayland-dev gdb
|
||||
chmod +x .github/data/bt.sh
|
||||
- name: Build
|
||||
run: |
|
||||
./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
|
||||
./GenerateProjectFiles.sh -vs2026 -log -verbose -printSDKs -dotnet=10
|
||||
./Development/Scripts/Linux/CallBuildTool.sh -build -log -dotnet=10 -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxTestsTarget -UseLargeWorlds=true
|
||||
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 net8.0 Binaries/Tests/Flax.Build.Tests.dll
|
||||
${GITHUB_WORKSPACE}/.github/data/bt.sh ./Binaries/Editor/Linux/Development/FlaxTests -headless
|
||||
dotnet test -f net10.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 net8.0 Binaries/Tests/FlaxEngine.CSharp.dll
|
||||
- name: Test UseLargeWorlds
|
||||
run: |
|
||||
./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
|
||||
dotnet test -f net10.0 Binaries/Tests/FlaxEngine.CSharp.dll
|
||||
|
||||
# Tests on Windows
|
||||
tests-windows:
|
||||
@@ -54,11 +53,11 @@ jobs:
|
||||
runs-on: "windows-2022"
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v6
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v3
|
||||
uses: actions/setup-dotnet@v5
|
||||
with:
|
||||
dotnet-version: 8.0.x
|
||||
dotnet-version: 10.0.x
|
||||
- name: Print .NET info
|
||||
run: |
|
||||
dotnet --info
|
||||
@@ -69,17 +68,20 @@ jobs:
|
||||
git lfs pull
|
||||
- name: Build
|
||||
run: |
|
||||
.\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
|
||||
PowerShell "(Get-Content global.json).Replace('latestMajor', 'minor') | Set-Content global.json"
|
||||
PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'minor') | Set-Content Source/Tools/Flax.Build/global.json"
|
||||
PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Minor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
|
||||
.\GenerateProjectFiles.bat -vs2026 -log -verbose -printSDKs -dotnet=10
|
||||
.\Development\Scripts\Windows\CallBuildTool.bat -build -log -dotnet=10 -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
|
||||
shell: pwsh
|
||||
run: |
|
||||
$ErrorActionPreference = "Stop"
|
||||
.\Binaries\Editor\Win64\Development\FlaxTests.exe
|
||||
.\Binaries\Editor\Win64\Development\FlaxTests.exe -headless
|
||||
if(!$?) { Write-Host "Tests failed with exit code $LastExitCode" -ForegroundColor Red; Exit $LastExitCode }
|
||||
dotnet test -f net8.0 Binaries\Tests\Flax.Build.Tests.dll
|
||||
dotnet test -f net10.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 net8.0 Binaries\Tests\FlaxEngine.CSharp.dll
|
||||
dotnet test -f net10.0 Binaries\Tests\FlaxEngine.CSharp.dll
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
# Redirect to our own Git LFS server
|
||||
[lfs]
|
||||
url="https://gitlab.flaxengine.com/flax/flaxengine.git/info/lfs"
|
||||
url="https://git.flaxengine.com/flax/flaxengine.git/info/lfs"
|
||||
locksverify = false
|
||||
|
||||
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -42,10 +42,10 @@ struct MaterialInput
|
||||
float2 SvPositionToDecalUV(float4 svPosition)
|
||||
{
|
||||
float2 screenUV = svPosition.xy * ScreenSize.zw;
|
||||
svPosition.z = SAMPLE_RT(DepthBuffer, screenUV).r;
|
||||
float4 positionHS = mul(float4(svPosition.xyz, 1), SvPositionToWorld);
|
||||
svPosition.z = SAMPLE_RT_DEPTH(DepthBuffer, screenUV);
|
||||
float4 positionHS = PROJECT_POINT(float4(svPosition.xyz, 1), SvPositionToWorld);
|
||||
float3 positionWS = positionHS.xyz / positionHS.w;
|
||||
float3 positionOS = mul(float4(positionWS, 1), InvWorld).xyz;
|
||||
float3 positionOS = PROJECT_POINT(float4(positionWS, 1), InvWorld).xyz;
|
||||
return positionOS.xz + 0.5f;
|
||||
}
|
||||
|
||||
@@ -182,10 +182,10 @@ META_VS_IN_ELEMENT(POSITION, 0, R32G32B32_FLOAT, 0, 0, PER_VERTEX, 0, true)
|
||||
void VS_Decal(in float3 Position : POSITION0, out float4 SvPosition : SV_Position)
|
||||
{
|
||||
// Compute world space vertex position
|
||||
float3 worldPosition = mul(float4(Position.xyz, 1), WorldMatrix).xyz;
|
||||
float3 worldPosition = PROJECT_POINT(float4(Position.xyz, 1), WorldMatrix).xyz;
|
||||
|
||||
// Compute clip space position
|
||||
SvPosition = mul(float4(worldPosition.xyz, 1), ViewProjectionMatrix);
|
||||
SvPosition = PROJECT_POINT(float4(worldPosition.xyz, 1), ViewProjectionMatrix);
|
||||
}
|
||||
|
||||
// Pixel Shader function for decals rendering
|
||||
@@ -213,11 +213,11 @@ void PS_Decal(
|
||||
}
|
||||
|
||||
float2 screenUV = SvPosition.xy * ScreenSize.zw;
|
||||
SvPosition.z = SAMPLE_RT(DepthBuffer, screenUV).r;
|
||||
SvPosition.z = SAMPLE_RT_DEPTH(DepthBuffer, screenUV);
|
||||
|
||||
float4 positionHS = mul(float4(SvPosition.xyz, 1), SvPositionToWorld);
|
||||
float4 positionHS = PROJECT_POINT(float4(SvPosition.xyz, 1), SvPositionToWorld);
|
||||
float3 positionWS = positionHS.xyz / positionHS.w;
|
||||
float3 positionOS = mul(float4(positionWS, 1), InvWorld).xyz;
|
||||
float3 positionOS = PROJECT_POINT(float4(positionWS, 1), InvWorld).xyz;
|
||||
|
||||
clip(0.5 - abs(positionOS.xyz));
|
||||
float2 decalUVs = positionOS.xz + 0.5f;
|
||||
|
||||
@@ -308,7 +308,7 @@ VertexOutput VS_SplineModel(ModelInput input)
|
||||
world = mul(world, WorldMatrix);
|
||||
|
||||
// Compute clip space position
|
||||
output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
|
||||
output.Position = PROJECT_POINT(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
|
||||
|
||||
// Pass vertex attributes
|
||||
output.Geometry.TexCoord = input.TexCoord0;
|
||||
@@ -337,8 +337,7 @@ VertexOutput VS_SplineModel(ModelInput input)
|
||||
// Apply world position offset per-vertex
|
||||
#if USE_POSITION_OFFSET
|
||||
output.Geometry.WorldPosition += material.PositionOffset;
|
||||
output.Geometry.PrevWorldPosition += material.PositionOffset;
|
||||
output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
|
||||
output.Position = PROJECT_POINT(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
|
||||
#endif
|
||||
|
||||
// Get tessalation multiplier (per vertex)
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#define MAX_LOCAL_LIGHTS 4
|
||||
@1// Forward Shading: Includes
|
||||
#include "./Flax/LightingCommon.hlsl"
|
||||
#if USE_REFLECTIONS
|
||||
#include "./Flax/ReflectionsCommon.hlsl"
|
||||
#if USE_REFLECTIONS
|
||||
#define MATERIAL_REFLECTIONS_SSR 1
|
||||
#if MATERIAL_REFLECTIONS == MATERIAL_REFLECTIONS_SSR
|
||||
#include "./Flax/SSR.hlsl"
|
||||
@@ -14,11 +14,13 @@
|
||||
#include "./Flax/Lighting.hlsl"
|
||||
#include "./Flax/ShadowsSampling.hlsl"
|
||||
#include "./Flax/ExponentialHeightFog.hlsl"
|
||||
#include "./Flax/VolumetricFog.hlsl"
|
||||
@2// Forward Shading: Constants
|
||||
LightData DirectionalLight;
|
||||
LightData SkyLight;
|
||||
ProbeData EnvironmentProbe;
|
||||
EnvProbeData EnvironmentProbe;
|
||||
ExponentialHeightFogData ExponentialHeightFog;
|
||||
VolumetricFogData VolumetricFog;
|
||||
float3 Dummy2;
|
||||
uint LocalLightsCount;
|
||||
LightData LocalLights[MAX_LOCAL_LIGHTS];
|
||||
@@ -28,12 +30,14 @@ TextureCube SkyLightTexture : register(t__SRV__);
|
||||
Buffer<float4> ShadowsBuffer : register(t__SRV__);
|
||||
Texture2D<float> ShadowMap : register(t__SRV__);
|
||||
Texture3D VolumetricFogTexture : register(t__SRV__);
|
||||
Texture2D PreIntegratedGF : register(t__SRV__);
|
||||
@4// Forward Shading: Utilities
|
||||
// Public accessors for lighting data, use them as data binding might change but those methods will remain.
|
||||
LightData GetDirectionalLight() { return DirectionalLight; }
|
||||
LightData GetSkyLight() { return SkyLight; }
|
||||
ProbeData GetEnvironmentProbe() { return EnvironmentProbe; }
|
||||
EnvProbeData GetEnvironmentProbe() { return EnvironmentProbe; }
|
||||
ExponentialHeightFogData GetExponentialHeightFog() { return ExponentialHeightFog; }
|
||||
VolumetricFogData GetVolumetricFog() { return VolumetricFog; }
|
||||
uint GetLocalLightsCount() { return LocalLightsCount; }
|
||||
LightData GetLocalLight(uint i) { return LocalLights[i]; }
|
||||
@5// Forward Shading: Shaders
|
||||
@@ -84,8 +88,12 @@ void PS_Forward(
|
||||
gBuffer.ShadingModel = MATERIAL_SHADING_MODEL;
|
||||
|
||||
// Calculate lighting from a single directional light
|
||||
#if LIGHTING_NO_SHADOW
|
||||
float4 shadowMask = (float4)1;
|
||||
#else
|
||||
ShadowSample shadow = SampleDirectionalLightShadow(DirectionalLight, ShadowsBuffer, ShadowMap, gBuffer);
|
||||
float4 shadowMask = GetShadowMask(shadow);
|
||||
#endif
|
||||
float4 light = GetLighting(ViewPos, DirectionalLight, gBuffer, shadowMask, false, false);
|
||||
|
||||
// Calculate lighting from sky light
|
||||
@@ -108,7 +116,8 @@ void PS_Forward(
|
||||
|
||||
// Calculate reflections
|
||||
#if USE_REFLECTIONS
|
||||
float3 reflections = SampleReflectionProbe(ViewPos, EnvProbe, EnvironmentProbe, gBuffer.WorldPos, gBuffer.Normal, gBuffer.Roughness).rgb;
|
||||
float4 reflections = SampleReflectionProbe(ViewPos, EnvProbe, EnvironmentProbe, gBuffer.WorldPos, gBuffer.Normal, gBuffer.Roughness);
|
||||
reflections.rgb *= reflections.a;
|
||||
|
||||
#if MATERIAL_REFLECTIONS == MATERIAL_REFLECTIONS_SSR
|
||||
// Screen Space Reflections
|
||||
@@ -116,7 +125,7 @@ void PS_Forward(
|
||||
Texture2D sceneColorTexture = MATERIAL_REFLECTIONS_SSR_COLOR;
|
||||
float2 screenUV = materialInput.SvPosition.xy * ScreenSize.zw;
|
||||
float stepSize = ScreenSize.z; // 1 / screenWidth
|
||||
float maxSamples = 48;
|
||||
float maxSamples = 50;
|
||||
float worldAntiSelfOcclusionBias = 0.1f;
|
||||
float brdfBias = 0.82f;
|
||||
float drawDistance = 5000.0f;
|
||||
@@ -124,7 +133,7 @@ void PS_Forward(
|
||||
if (hit.z > 0)
|
||||
{
|
||||
float3 screenColor = sceneColorTexture.SampleLevel(SamplerPointClamp, hit.xy, 0).rgb;
|
||||
reflections = lerp(reflections, screenColor, hit.z);
|
||||
reflections.rgb = lerp(reflections.rgb, screenColor, hit.z);
|
||||
}
|
||||
|
||||
// Fallback to software tracing if possible
|
||||
@@ -136,17 +145,17 @@ void PS_Forward(
|
||||
if (TraceSDFSoftwareReflections(gBuffer, reflectWS, surfaceAtlas))
|
||||
{
|
||||
float3 screenColor = sceneColorTexture.SampleLevel(SamplerPointClamp, hit.xy, 0).rgb;
|
||||
reflections = lerp(surfaceAtlas, float4(screenColor, 1), hit.z);
|
||||
reflections.rgb = lerp(surfaceAtlas, float4(screenColor, 1), hit.z);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
light.rgb += reflections * GetReflectionSpecularLighting(ViewPos, gBuffer) * light.a;
|
||||
light.rgb += reflections.rgb * GetReflectionSpecularLighting(PreIntegratedGF, ViewPos, gBuffer);
|
||||
#endif
|
||||
|
||||
// Add lighting (apply ambient occlusion)
|
||||
output.rgb += light.rgb * gBuffer.AO;
|
||||
// Add lighting
|
||||
output.rgb += light.rgb;
|
||||
|
||||
#endif
|
||||
|
||||
@@ -158,17 +167,13 @@ void PS_Forward(
|
||||
#else
|
||||
float fogSceneDistance = gBuffer.ViewPos.z;
|
||||
#endif
|
||||
float4 fog = GetExponentialHeightFog(ExponentialHeightFog, materialInput.WorldPosition, ViewPos, 0, fogSceneDistance);
|
||||
|
||||
float fogSkipDistance = max(ExponentialHeightFog.VolumetricFogMaxDistance - 100, 0);
|
||||
float4 fog = GetExponentialHeightFog(ExponentialHeightFog, materialInput.WorldPosition, ViewPos, fogSkipDistance, fogSceneDistance);
|
||||
if (ExponentialHeightFog.VolumetricFogMaxDistance > 0)
|
||||
{
|
||||
// Sample volumetric fog and mix it in
|
||||
float2 screenUV = materialInput.SvPosition.xy * ScreenSize.zw;
|
||||
float3 viewVector = materialInput.WorldPosition - ViewPos;
|
||||
float sceneDepth = length(viewVector);
|
||||
float depthSlice = sceneDepth / ExponentialHeightFog.VolumetricFogMaxDistance;
|
||||
float3 volumeUV = float3(screenUV, depthSlice);
|
||||
float4 volumetricFog = VolumetricFogTexture.SampleLevel(SamplerLinearClamp, volumeUV, 0);
|
||||
float4 volumetricFog = SampleVolumetricFog(VolumetricFogTexture, VolumetricFog, materialInput.WorldPosition - ViewPos, screenUV, TemporalAAJitter);
|
||||
fog = CombineVolumetricFog(fog, volumetricFog);
|
||||
}
|
||||
|
||||
|
||||
@@ -67,7 +67,7 @@ float Rand(inout uint seed)
|
||||
float3 ReprojectPosition(float2 uv, float rawDepth)
|
||||
{
|
||||
uv = uv * float2(2.0, -2.0) + float2(-1.0, 1.0);
|
||||
float4 pos = mul(float4(uv.x, uv.y, rawDepth, 1.0f), InvViewProjectionMatrix);
|
||||
float4 pos = PROJECT_POINT(float4(uv.x, uv.y, rawDepth, 1.0f), InvViewProjectionMatrix);
|
||||
return pos.xyz / pos.w;
|
||||
}
|
||||
|
||||
@@ -158,7 +158,7 @@ void SpawnParticle(Context context)
|
||||
@4}
|
||||
|
||||
// Main entry point for the particles simulation and spawning
|
||||
META_CS(true, FEATURE_LEVEL_SM5)
|
||||
META_CS(true, AUTO)
|
||||
[numthreads(THREAD_GROUP_SIZE, 1, 1)]
|
||||
void CS_Main(uint3 dispatchThreadId : SV_DispatchThreadID)
|
||||
{
|
||||
|
||||
@@ -38,6 +38,7 @@ struct VertexOutput
|
||||
#endif
|
||||
float4 ClipExtents : TEXCOORD3;
|
||||
float2 ClipOrigin : TEXCOORD4;
|
||||
float2 CustomData : TEXCOORD5; // x-per-geometry type, y-features mask
|
||||
#if USE_CUSTOM_VERTEX_INTERPOLATORS
|
||||
float4 CustomVSToPS[CUSTOM_VERTEX_INTERPOLATORS_COUNT] : TEXCOORD9;
|
||||
#endif
|
||||
@@ -55,6 +56,7 @@ struct PixelInput
|
||||
#endif
|
||||
float4 ClipExtents : TEXCOORD3;
|
||||
float2 ClipOrigin : TEXCOORD4;
|
||||
float2 CustomData : TEXCOORD5; // x-per-geometry type, y-features mask
|
||||
#if USE_CUSTOM_VERTEX_INTERPOLATORS
|
||||
float4 CustomVSToPS[CUSTOM_VERTEX_INTERPOLATORS_COUNT] : TEXCOORD9;
|
||||
#endif
|
||||
@@ -67,6 +69,7 @@ struct MaterialInput
|
||||
float3 WorldPosition;
|
||||
float TwoSidedSign;
|
||||
float2 TexCoord;
|
||||
float2 CustomData; // x-per-geometry type, y-features mask
|
||||
#if USE_VERTEX_COLOR
|
||||
half4 VertexColor;
|
||||
#endif
|
||||
@@ -84,6 +87,7 @@ MaterialInput GetMaterialInput(Render2DVertex input, VertexOutput output)
|
||||
MaterialInput result;
|
||||
result.WorldPosition = output.WorldPosition;
|
||||
result.TexCoord = output.TexCoord;
|
||||
result.CustomData = input.CustomDataAndClipOrigin.xy;
|
||||
#if USE_VERTEX_COLOR
|
||||
result.VertexColor = output.VertexColor;
|
||||
#endif
|
||||
@@ -103,6 +107,7 @@ MaterialInput GetMaterialInput(PixelInput input)
|
||||
MaterialInput result;
|
||||
result.WorldPosition = input.WorldPosition;
|
||||
result.TexCoord = input.TexCoord;
|
||||
result.CustomData = input.CustomData;
|
||||
#if USE_VERTEX_COLOR
|
||||
result.VertexColor = input.VertexColor;
|
||||
#endif
|
||||
@@ -222,13 +227,14 @@ VertexOutput VS_GUI(Render2DVertex input)
|
||||
if ((int)input.CustomDataAndClipOrigin.y & 1)
|
||||
input.Position = (int2)input.Position;
|
||||
|
||||
output.Position = mul(float4(input.Position, 0, 1), ViewProjectionMatrix);
|
||||
output.Position = PROJECT_POINT(float4(input.Position, 0, 1), ViewProjectionMatrix);
|
||||
output.WorldPosition = mul(float4(input.Position, 0, 1), WorldMatrix).xyz;
|
||||
output.TexCoord = input.TexCoord;
|
||||
output.WindowPos = input.Position;
|
||||
#if USE_VERTEX_COLOR
|
||||
output.VertexColor = input.Color;
|
||||
#endif
|
||||
output.CustomData = input.CustomDataAndClipOrigin.xy;
|
||||
output.ClipOrigin = input.CustomDataAndClipOrigin.zw;
|
||||
output.ClipExtents = input.ClipExtents;
|
||||
|
||||
|
||||
@@ -393,7 +393,7 @@ VertexOutput VS_Sprite(SpriteInput input, uint particleIndex : SV_InstanceID)
|
||||
output.WorldPosition = position + spriteVertexPosition;
|
||||
|
||||
// Compute clip space position
|
||||
output.Position = mul(float4(output.WorldPosition.xyz, 1), ViewProjectionMatrix);
|
||||
output.Position = PROJECT_POINT(float4(output.WorldPosition.xyz, 1), ViewProjectionMatrix);
|
||||
|
||||
// Pass vertex attributes
|
||||
output.TexCoord = input.TexCoord;
|
||||
@@ -431,7 +431,7 @@ VertexOutput VS_Sprite(SpriteInput input, uint particleIndex : SV_InstanceID)
|
||||
// Apply world position offset per-vertex
|
||||
#if USE_POSITION_OFFSET
|
||||
output.WorldPosition += material.PositionOffset;
|
||||
output.Position = mul(float4(output.WorldPosition.xyz, 1), ViewProjectionMatrix);
|
||||
output.Position = PROJECT_POINT(float4(output.WorldPosition.xyz, 1), ViewProjectionMatrix);
|
||||
#endif
|
||||
|
||||
// Copy interpolants for other shader stages
|
||||
@@ -511,7 +511,7 @@ VertexOutput VS_Model(ModelInput input, uint particleIndex : SV_InstanceID)
|
||||
output.WorldPosition = mul(float4(input.Position, 1), world).xyz;
|
||||
|
||||
// Compute clip space position
|
||||
output.Position = mul(float4(output.WorldPosition, 1), ViewProjectionMatrix);
|
||||
output.Position = PROJECT_POINT(float4(output.WorldPosition, 1), ViewProjectionMatrix);
|
||||
|
||||
// Pass vertex attributes
|
||||
output.TexCoord = input.TexCoord0;
|
||||
@@ -549,7 +549,7 @@ VertexOutput VS_Model(ModelInput input, uint particleIndex : SV_InstanceID)
|
||||
// Apply world position offset per-vertex
|
||||
#if USE_POSITION_OFFSET
|
||||
output.WorldPosition += material.PositionOffset;
|
||||
output.Position = mul(float4(output.WorldPosition.xyz, 1), ViewProjectionMatrix);
|
||||
output.Position = PROJECT_POINT(float4(output.WorldPosition.xyz, 1), ViewProjectionMatrix);
|
||||
#endif
|
||||
|
||||
// Copy interpolants for other shader stages
|
||||
@@ -617,7 +617,7 @@ VertexOutput VS_Ribbon(RibbonInput input, uint vertexIndex : SV_VertexID)
|
||||
output.WorldPosition = position + tangentRight * vertexSign * (ribbonWidth.xxx * 0.5f);
|
||||
|
||||
// Compute clip space position
|
||||
output.Position = mul(float4(output.WorldPosition.xyz, 1), ViewProjectionMatrix);
|
||||
output.Position = PROJECT_POINT(float4(output.WorldPosition.xyz, 1), ViewProjectionMatrix);
|
||||
|
||||
// Pass vertex attributes
|
||||
output.ParticleIndex = particleIndex;
|
||||
@@ -655,7 +655,7 @@ VertexOutput VS_Ribbon(RibbonInput input, uint vertexIndex : SV_VertexID)
|
||||
// Apply world position offset per-vertex
|
||||
#if USE_POSITION_OFFSET
|
||||
output.WorldPosition += material.PositionOffset;
|
||||
output.Position = mul(float4(output.WorldPosition.xyz, 1), ViewProjectionMatrix);
|
||||
output.Position = PROJECT_POINT(float4(output.WorldPosition.xyz, 1), ViewProjectionMatrix);
|
||||
#endif
|
||||
|
||||
// Copy interpolants for other shader stages
|
||||
|
||||
@@ -342,7 +342,7 @@ VertexOutput VS(ModelInput input)
|
||||
output.Geometry.PrevWorldPosition = mul(float4(input.Position.xyz, 1), object.PrevWorldMatrix).xyz;
|
||||
|
||||
// Compute clip space position
|
||||
output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
|
||||
output.Position = PROJECT_POINT(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
|
||||
|
||||
// Pass vertex attributes
|
||||
output.Geometry.TexCoords01 = float4(input.TexCoord0, input.TexCoord1);
|
||||
@@ -378,7 +378,7 @@ VertexOutput VS(ModelInput input)
|
||||
#if USE_POSITION_OFFSET
|
||||
output.Geometry.WorldPosition += material.PositionOffset;
|
||||
output.Geometry.PrevWorldPosition += material.PositionOffset;
|
||||
output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
|
||||
output.Position = PROJECT_POINT(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
|
||||
#endif
|
||||
|
||||
// Get tessalation multiplier (per vertex)
|
||||
@@ -412,7 +412,7 @@ float4 VS_Depth(ModelInput_PosOnly input) : SV_Position
|
||||
|
||||
// Transform vertex position into the screen
|
||||
float3 worldPosition = mul(float4(input.Position.xyz, 1), object.WorldMatrix).xyz;
|
||||
float4 position = mul(float4(worldPosition, 1), ViewProjectionMatrix);
|
||||
float4 position = PROJECT_POINT(float4(worldPosition, 1), ViewProjectionMatrix);
|
||||
return position;
|
||||
}
|
||||
|
||||
@@ -518,7 +518,7 @@ VertexOutput VS_Skinned(ModelInput_Skinned input)
|
||||
#endif
|
||||
|
||||
// Compute clip space position
|
||||
output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
|
||||
output.Position = PROJECT_POINT(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
|
||||
|
||||
// Pass vertex attributes
|
||||
output.Geometry.TexCoords01 = float4(input.TexCoord0, input.TexCoord1);
|
||||
@@ -549,7 +549,7 @@ VertexOutput VS_Skinned(ModelInput_Skinned input)
|
||||
#if USE_POSITION_OFFSET
|
||||
output.Geometry.WorldPosition += material.PositionOffset;
|
||||
output.Geometry.PrevWorldPosition += material.PositionOffset;
|
||||
output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
|
||||
output.Position = PROJECT_POINT(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
|
||||
#endif
|
||||
|
||||
// Get tessalation multiplier (per vertex)
|
||||
|
||||
@@ -388,7 +388,7 @@ VertexOutput VS(TerrainVertexInput input)
|
||||
output.Geometry.WorldPosition = mul(float4(position, 1), worldMatrix).xyz;
|
||||
|
||||
// Compute clip space position
|
||||
output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
|
||||
output.Position = PROJECT_POINT(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
|
||||
|
||||
// Pass vertex attributes
|
||||
#if USE_SMOOTH_LOD_TRANSITION
|
||||
@@ -436,7 +436,7 @@ VertexOutput VS(TerrainVertexInput input)
|
||||
// Apply world position offset per-vertex
|
||||
#if USE_POSITION_OFFSET
|
||||
output.Geometry.WorldPosition += material.PositionOffset;
|
||||
output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
|
||||
output.Position = PROJECT_POINT(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
|
||||
#endif
|
||||
|
||||
// Get tessalation multiplier (per vertex)
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
#include "./Flax/Common.hlsl"
|
||||
#include "./Flax/MaterialCommon.hlsl"
|
||||
#include "./Flax/GBufferCommon.hlsl"
|
||||
#include "./Flax/VolumetricFog.hlsl"
|
||||
@7
|
||||
|
||||
// Primary constant buffer (with additional material parameters)
|
||||
@@ -21,6 +22,7 @@ float Dummy0;
|
||||
float VolumetricFogMaxDistance;
|
||||
int ParticleStride;
|
||||
int ParticleIndex;
|
||||
float4 GridSliceParameters;
|
||||
@1META_CB_END
|
||||
|
||||
// Particles attributes buffer
|
||||
@@ -202,19 +204,19 @@ Material GetMaterialPS(MaterialInput input)
|
||||
META_PS(true, FEATURE_LEVEL_SM5)
|
||||
void PS_VolumetricFog(Quad_GS2PS input, out float4 VBufferA : SV_Target0, out float4 VBufferB : SV_Target1)
|
||||
{
|
||||
// Reproject grid position back to the screen and world space
|
||||
uint3 gridCoordinate = uint3(input.Vertex.Position.xy, input.LayerIndex);
|
||||
float3 cellOffset = 0.5f;
|
||||
float2 volumeUV = (gridCoordinate.xy + cellOffset.xy) / GridSize.xy;
|
||||
float zSlice = gridCoordinate.z + cellOffset.z;
|
||||
float sceneDepth = (zSlice / GridSize.z) * VolumetricFogMaxDistance / ViewFar;
|
||||
float sceneDepth = GetDepthFromSlice(GridSliceParameters, gridCoordinate.z + cellOffset.z) / ViewFar;
|
||||
float deviceDepth = (ViewInfo.w / sceneDepth) + ViewInfo.z;
|
||||
float4 clipPos = float4(volumeUV * float2(2.0, -2.0) + float2(-1.0, 1.0), deviceDepth, 1.0);
|
||||
float4 wsPos = mul(clipPos, InverseViewProjectionMatrix);
|
||||
float3 positionWS = wsPos.xyz / wsPos.w;
|
||||
wsPos.xyz /= wsPos.w;
|
||||
|
||||
// Get material parameters
|
||||
MaterialInput materialInput = (MaterialInput)0;
|
||||
materialInput.WorldPosition = positionWS;
|
||||
materialInput.WorldPosition = wsPos.xyz;
|
||||
materialInput.TexCoord = input.Vertex.TexCoord;
|
||||
materialInput.ParticleIndex = ParticleIndex;
|
||||
materialInput.TBN = float3x3(float3(1, 0, 0), float3(0, 1, 0), float3(0, 0, 1));
|
||||
@@ -225,9 +227,10 @@ void PS_VolumetricFog(Quad_GS2PS input, out float4 VBufferA : SV_Target0, out fl
|
||||
Material material = GetMaterialPS(materialInput);
|
||||
|
||||
// Compute fog properties
|
||||
material.Opacity *= material.Mask;
|
||||
float3 albedo = material.Color;
|
||||
float extinction = material.Opacity * material.Mask * 0.001f;
|
||||
float3 emission = material.Emissive;
|
||||
float extinction = material.Opacity * 0.001f;
|
||||
float3 emission = material.Emissive * material.Opacity;
|
||||
float3 scattering = albedo * extinction;
|
||||
float absorption = max(0.0f, extinction - Luminance(scattering));
|
||||
|
||||
|
||||
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.
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.
Binary file not shown.
BIN
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.
BIN
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
@@ -1,17 +0,0 @@
|
||||
## Mono
|
||||
|
||||
Custom fork: [https://github.com/FlaxEngine/mono](https://github.com/FlaxEngine/mono) with custom features for C# assemblies hot-reloading at runtime without domain unload (more: [https://flaxengine.com/blog/flax-facts-16-scripts-hot-reload/](https://flaxengine.com/blog/flax-facts-16-scripts-hot-reload/)).
|
||||
|
||||
Startup docs about building mono: [https://www.mono-project.com/docs/compiling-mono/](https://www.mono-project.com/docs/compiling-mono/)
|
||||
|
||||
### Notes
|
||||
|
||||
Some useful notes and tips for devs:
|
||||
* Use `-monolog` to print Mono logs to Flax logs
|
||||
* When working with mono fork set `localRepoPath` to local repo location in `Source\Tools\Flax.Build\Deps\Dependencies\mono.cs`
|
||||
* To update mono deps when developing/updating use `.\Development\Scripts\Windows\CallBuildTool.bat -log -ReBuildDeps -verbose -depsToBuild=mono -platform=Windows`, then build engine and run it
|
||||
* `MONO_GC_DEBUG=check-remset-consistency` - it will do additional checks at each collection to see if there are any missing write barriers
|
||||
* `MONO_GC_DEBUG=nursery-canaries` - it might catch some buffer overflows in case of problems in code.
|
||||
* `MONO_GC_DEBUG=<log-level>:<log-file>` - will print GC debug to the log file (eg. `4:sgen-gc`).
|
||||
* Methods `mono_custom_attrs_from_property` and `mono_custom_attrs_get_attr` are internally cached
|
||||
* If C++ mono call a method in c# that will throw an error, error will be handled but, not completly. Calling relase domain will return random `Access memory violation`. First search for error in c# code. No workaround yet.
|
||||
@@ -34,7 +34,7 @@ goto Exit
|
||||
echo CallBuildTool ERROR: The script is in invalid directory.
|
||||
goto Exit
|
||||
:Error_NoVisualStudioEnvironment
|
||||
echo CallBuildTool ERROR: Missing Visual Studio 2022 or newer.
|
||||
echo CallBuildTool ERROR: Missing Visual Studio 2026 or newer.
|
||||
goto Exit
|
||||
:Error_CompilationFailed
|
||||
echo CallBuildTool ERROR: Failed to compile Flax.Build project.
|
||||
|
||||
+17
-5
@@ -2,17 +2,29 @@
|
||||
"Name": "Flax",
|
||||
"Version": {
|
||||
"Major": 1,
|
||||
"Minor": 11,
|
||||
"Minor": 13,
|
||||
"Revision": 0,
|
||||
"Build": 6802
|
||||
"Build": 7005
|
||||
},
|
||||
"Company": "Flax",
|
||||
"Copyright": "Copyright (c) 2012-2025 Wojciech Figat. All rights reserved.",
|
||||
"Copyright": "Copyright (c) 2012-2026 Wojciech Figat. All rights reserved.",
|
||||
"GameTarget": "FlaxGame",
|
||||
"EditorTarget": "FlaxEditor",
|
||||
"Configuration": {
|
||||
"UseCSharp": true,
|
||||
"UseLargeWorlds": false,
|
||||
"UseDotNet": true
|
||||
"UseReverseZ": true,
|
||||
"Windows": {
|
||||
"UseSDL": false,
|
||||
},
|
||||
"Mac": {
|
||||
"UseSDL": false,
|
||||
},
|
||||
"Linux": {
|
||||
"UseSDL": true,
|
||||
},
|
||||
"Web": {
|
||||
"Threads": false,
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -188,7 +188,7 @@
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
|
||||
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
|
||||
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_CASE_STATEMENT_ON_SAME_LINE/@EntryValue">ALWAYS</s:String>
|
||||
|
||||
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_EMBEDDED_STATEMENT_ON_SAME_LINE/@EntryValue">NEVER</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SIMPLE_CASE_STATEMENT_STYLE/@EntryValue">ON_SINGLE_LINE</s:String>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
|
||||
@@ -257,6 +257,7 @@
|
||||
<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/GrammarAndSpelling/GrammarChecking/Exceptions/=Try_0020to_0020scripting/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/GrammarAndSpelling/GrammarChecking/Exceptions/=will_0020fallback/@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>
|
||||
|
||||
@@ -28,10 +28,10 @@ Follow the instructions below to compile and run the engine from source.
|
||||
|
||||
## Windows
|
||||
|
||||
* Install Visual Studio 2022 or newer
|
||||
* Install Windows 8.1 SDK or newer (via Visual Studio Installer)
|
||||
* Install Visual Studio 2026 or newer
|
||||
* Install Windows 10 SDK or newer (via Visual Studio Installer)
|
||||
* Install Microsoft Visual C++ 2015 v140 toolset or newer (via Visual Studio Installer)
|
||||
* Install .NET 8 or 9 SDK for **Windows x64** (via Visual Studio Installer or [from web](https://dotnet.microsoft.com/en-us/download/dotnet/8.0))
|
||||
* Install .NET 10 SDK (or newer) for **Windows x64** (via Visual Studio Installer or [from web](https://dotnet.microsoft.com/en-us/download/dotnet/10.0))
|
||||
* Install Git with LFS
|
||||
* Clone repo (with LFS)
|
||||
* Run **GenerateProjectFiles.bat**
|
||||
@@ -44,10 +44,10 @@ Follow the instructions below to compile and run the engine from source.
|
||||
## Linux
|
||||
|
||||
* Install Visual Studio Code
|
||||
* Install .NET 8 or 9 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`
|
||||
* Fedora: `sudo dnf install dotnet-sdk-8.0`
|
||||
* Arch: `sudo pacman -S dotnet-sdk-8.0 dotnet-runtime-8.0 dotnet-targeting-pack-8.0 dotnet-host`
|
||||
* Install .NET 10 SDK (or newer) ([https://dotnet.microsoft.com/en-us/download/dotnet/10.0](https://dotnet.microsoft.com/en-us/download/dotnet/10.0))
|
||||
* Ubuntu: `sudo apt install dotnet-sdk-10.0`
|
||||
* Fedora: `sudo dnf install dotnet-sdk-10.0`
|
||||
* Arch: `sudo pacman -S dotnet-sdk-10.0 dotnet-runtime-10.0 dotnet-targeting-pack-10.0 dotnet-host`
|
||||
* Install Vulkan SDK ([https://vulkan.lunarg.com/](https://vulkan.lunarg.com/))
|
||||
* Ubuntu: `sudo apt install vulkan-sdk` (deprecated, follow official docs)
|
||||
* Fedora: `sudo dnf install vulkan-headers vulkan-tools vulkan-validation-layers`
|
||||
@@ -72,8 +72,8 @@ Follow the instructions below to compile and run the engine from source.
|
||||
|
||||
## Mac
|
||||
|
||||
* Install XCode
|
||||
* Install .NET 8 or 9 SDK ([https://dotnet.microsoft.com/en-us/download/dotnet/8.0](https://dotnet.microsoft.com/en-us/download/dotnet/8.0))
|
||||
* Install XCode 16.4 (or newer)
|
||||
* Install .NET 10 SDK (or newer) ([https://dotnet.microsoft.com/en-us/download/dotnet/10.0](https://dotnet.microsoft.com/en-us/download/dotnet/10.0))
|
||||
* Install Vulkan SDK ([https://vulkan.lunarg.com/](https://vulkan.lunarg.com/))
|
||||
* Clone repo (with LFS)
|
||||
* Run `GenerateProjectFiles.command`
|
||||
@@ -86,17 +86,17 @@ 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 8.0. Either target .NET 5.0 or lower, or use a version of the .NET SDK that supports .NET 8.0`
|
||||
* `Microsoft.NET.TargetFrameworkInference.targets(141,5): error NETSDK1045: The current .NET SDK does not support targeting .NET 10.0. Either target .NET 5.0 or lower, or use a version of the .NET SDK that supports .NET 10.0`
|
||||
|
||||
Use Visual Studio 2022, older versions are not supported by .NET SDK 8.
|
||||
Use Visual Studio 2026 (or newer), old Visual Studio versions are not supported by .NET SDK 10.
|
||||
|
||||
* `Building for Windows without Vulkan rendering backend (Vulkan SDK is missing)`
|
||||
|
||||
Install the Vulkan SDK then set an environment variable to provide the path to the SDK prior to running GenerateProjectFiles.bat: `set VULKAN_SDK=%sdk_path%`.
|
||||
|
||||
* `The NuGetSdkResolver did not resolve this SDK`
|
||||
* `The NuGetSdkResolver did not resolve this SDK` / `Could not resolve SDK "Microsoft.NET.Sdk"`
|
||||
|
||||
Install `.NET SDK`, `NuGet package manager` and `NuGet targets and build tasks` in Visual Studio components.
|
||||
Install `.NET SDK` 10, `NuGet package manager` and `NuGet targets and build tasks` in Visual Studio components.
|
||||
|
||||
## Workspace directory
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ namespace FlaxEditor.Content.GUI
|
||||
/// <summary>
|
||||
/// Gets the target node.
|
||||
/// </summary>
|
||||
public ContentTreeNode TargetNode { get; }
|
||||
public ContentFolderTreeNode TargetNode { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="ContentNavigationButton"/> class.
|
||||
@@ -28,7 +28,7 @@ namespace FlaxEditor.Content.GUI
|
||||
/// <param name="x">The x position.</param>
|
||||
/// <param name="y">The y position.</param>
|
||||
/// <param name="height">The height.</param>
|
||||
public ContentNavigationButton(ContentTreeNode targetNode, float x, float y, float height)
|
||||
public ContentNavigationButton(ContentFolderTreeNode targetNode, float x, float y, float height)
|
||||
: base(x, y, height)
|
||||
{
|
||||
TargetNode = targetNode;
|
||||
@@ -147,7 +147,7 @@ namespace FlaxEditor.Content.GUI
|
||||
ClearItems();
|
||||
foreach (var child in Target.TargetNode.Children)
|
||||
{
|
||||
if (child is ContentTreeNode node)
|
||||
if (child is ContentFolderTreeNode node)
|
||||
{
|
||||
if (node.Folder.VisibleInHierarchy) // Respect the filter set by ContentFilterConfig.Filter(...)
|
||||
AddItem(node.Folder.ShortName);
|
||||
@@ -180,7 +180,7 @@ namespace FlaxEditor.Content.GUI
|
||||
var item = _items[index];
|
||||
foreach (var child in Target.TargetNode.Children)
|
||||
{
|
||||
if (child is ContentTreeNode node && node.Folder.ShortName == item)
|
||||
if (child is ContentFolderTreeNode node && node.Folder.ShortName == item)
|
||||
{
|
||||
Editor.Instance.Windows.ContentWin.Navigate(node);
|
||||
return;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user