branchrust_reboot/main/HDRP_Art_Backport/MergeFromMain_2021_04_06cancel

4 Commits over 0 Days - Infinitycph!

6 Years Ago
Restoring stables_a and stables_b prefab moves
6 Years Ago
Merge from main (keeping prefab changes from HDRP branch where we had conflicts, except for: tabledoorPOKER.prefab, tabledoorPOKERClear.prefab and fridge.prefab which only had shadow proxy changes on HDRP branch, and gameplay changes on main branch)
6 Years Ago
Merge preparations, second attempt
6 Years Ago
Merge preparations