Skip to content

Merge missing changes by finepointcgi and I (continued his fork) #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ParkingLotGames wants to merge 73 commits into
base: master
Choose a base branch
from
Open

Merge missing changes by finepointcgi and I (continued his fork) #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
e337363
Fixed Small bug with UI
finepointcgi Mar 6, 2019
39f0d8a
Update README.md
finepointcgi Mar 31, 2019
6ab64a9
Update README.md
finepointcgi Apr 19, 2019
0e00d85
Update README.md
finepointcgi Apr 19, 2019
53e9e51
Started converting to New UI
finepointcgi Apr 21, 2019
bab90f9
Converted the Middle of the ui over the new system
finepointcgi Apr 21, 2019
4ba58c2
Finished converting the middle bar over to the new ui and fixed a but…
finepointcgi Apr 21, 2019
6afafdf
Update README.md
finepointcgi Apr 24, 2019
57151e6
Update README.md
finepointcgi Apr 24, 2019
92869d8
Update README.md
finepointcgi Apr 24, 2019
da7efbf
Continued to adjust ui
finepointcgi Apr 24, 2019
a799f46
Fixed Massive bug with saving
finepointcgi Apr 25, 2019
41393ab
fixed middle bar moved its position and rebuilt save menu
finepointcgi Apr 26, 2019
73bd69f
Added a Modle to the save system
finepointcgi Apr 26, 2019
c0e70a3
Ui Updates
finepointcgi Apr 26, 2019
f172003
Added and styled load system
finepointcgi Apr 27, 2019
737e5ab
Merge remote-tracking branch 'origin/master'
finepointcgi Apr 27, 2019
8543686
Started Converting the main bar to unity ui and made saving async
finepointcgi Apr 27, 2019
58383c7
Continued hooking up the main texture bar
finepointcgi Apr 27, 2019
c015a26
converting most of main ui over to unity UI
finepointcgi Jun 17, 2019
cfb0146
Added in 2d Camera hide button
finepointcgi Jun 18, 2019
e5b8283
Finalized conversion to unity UI
finepointcgi Jul 2, 2019
2fb7647
Upgraded to 2019.1.9f1 and added presets
finepointcgi Jul 7, 2019
dddcb29
Update README.md
finepointcgi Jul 7, 2019
d13d6bb
Merge branch 'master' of https://github.com/mitchelldmccollum/Materia…
finepointcgi Jul 27, 2019
a166e7c
updated to unity 2019.2
finepointcgi Aug 24, 2019
8c97aa8
Updated to 2019.2 and fixed ui fullscreen bugs
finepointcgi Aug 25, 2019
7c36cec
clean up
finepointcgi Aug 25, 2019
67fdaab
Fixed massive bug with property map
Sep 14, 2019
6b63521
Fixed bugs with property map and diffuse map
Sep 16, 2019
f8e20c9
Fixes Decimal point issue
finepointcgi May 30, 2020
932dce9
Invert into smoothness
finepointcgi May 30, 2020
d156a9d
Changed navigation method
finepointcgi May 30, 2020
07e3f68
Updated to update the shader
finepointcgi May 31, 2020
2a10adc
Added in comments
finepointcgi May 31, 2020
b26a5c4
Update README.md
finepointcgi May 31, 2020
749f4cf
Merge branch 'master' of https://github.com/mitchelldmccollum/Materia…
finepointcgi May 31, 2020
6edad93
Update README.md
finepointcgi Jun 14, 2020
4e58265
Update README.md
finepointcgi Jun 14, 2020
780cd4f
Fix diffuse issue adjusted gui to be less cluttered
finepointcgi Jun 19, 2020
bab6c5a
Merge branch 'master' of https://github.com/mitchelldmccollum/Materia…
finepointcgi Jun 19, 2020
aa1ee7e
Added in installer
finepointcgi Jun 20, 2020
01de824
Updated to fix overlay issue
finepointcgi Jun 21, 2020
5dcea27
Updated to unity 2019.4.8f1
finepointcgi Sep 29, 2020
023012e
Update to Unity 2019.4.40f1, switch to IL2CPP, enable incremental GC,…
ParkingLotGames Jan 9, 2023
9a14106
roll back to Mono
ParkingLotGames Jan 9, 2023
64bde8c
reimplemented IL2CPP
ParkingLotGames Jan 9, 2023
1e37d45
Add openupm, ReactUnity and quickjs, requires nodejs in dev machine
ParkingLotGames Jan 9, 2023
634b6ee
Update README.md
ParkingLotGames Jan 9, 2023
db6eec6
Update README.md
ParkingLotGames Jan 9, 2023
e93b171
Update README.md
ParkingLotGames Jan 9, 2023
140f17c
Update README.md
ParkingLotGames Jan 9, 2023
fed44da
Update README.md
ParkingLotGames Jan 9, 2023
0888486
General improvements
ParkingLotGames Jan 13, 2023
4a3b3be
Add some documentation
ParkingLotGames Jan 13, 2023
be8eea8
Add some documentation
ParkingLotGames Jan 13, 2023
9d95e40
remove clutter
ParkingLotGames Jan 13, 2023
97ca920
Separate everything in different assemblies
ParkingLotGames Jan 13, 2023
64a0d29
Add new scene to develop without touching old one, might add separate…
ParkingLotGames Jan 13, 2023
35bc0d7
Update README.md
ParkingLotGames Jan 13, 2023
c7636c6
Update README.md
ParkingLotGames Jan 13, 2023
c048f8c
roll back CommandListExecutor, MainGui and main scene to restore func…
ParkingLotGames Jan 13, 2023
185122f
Merge branch 'master' of https://github.com/ParkingLotGames/Materiali…
ParkingLotGames Jan 13, 2023
2cba8bd
make LEGACY scene work
ParkingLotGames Jan 13, 2023
1d6bacb
condition OBJEditor to editor only
ParkingLotGames Jan 13, 2023
98a22f2
Add NSIS Installer creation scripts and icons
ParkingLotGames Jan 13, 2023
19cec0a
Update .gitignore
ParkingLotGames Jan 13, 2023
185da3f
Update .gitignore
ParkingLotGames Jan 13, 2023
3f48b39
Update README.md
ParkingLotGames Jan 13, 2023
60d72ac
Update README.md
ParkingLotGames Jan 13, 2023
2812660
Update README.md
ParkingLotGames Jan 13, 2023
79974e8
Update README.md
ParkingLotGames Jan 13, 2023
f05298b
minor changes to scene
ParkingLotGames Jan 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
[Ll]ibrary/
[Tt]emp/
[Oo]bj/
[Bb]uild/
[Bb]uilds/
*[Bb]uild/
*[Bb]uilds/*/*_BackUpThisFolder_ButDontShipItWithYourGame/
*[Bb]uilds/*/MonoBleedingEdge/
*[Bb]uilds/*/*_Data/
*[Bb]uilds/*/*.exe
*[Bb]uilds/*/*.dll
*[Bb]uilds/*linux*/
*[Bb]uilds/*macos*/
Assets/AssetStoreTools*

# Visual Studio cache directory
Expand Down
172 changes: 0 additions & 172 deletions .idea/.idea.Materialize/.idea/contentModel.xml
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/.idea.Materialize/.idea/dictionaries/maikeu.xml
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions .idea/.idea.Materialize/.idea/encodings.xml
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/.idea.Materialize/.idea/indexLayout.xml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/.idea.Materialize/.idea/misc.xml
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/.idea.Materialize/.idea/modules.xml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/.idea.Materialize/.idea/vcs.xml
View file
Open in desktop

This file was deleted.

Loading