Skip to content

Mergering Maikramer and Main Branch #12

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
wants to merge 90 commits into
base: master
Choose a base branch
from
Open

Mergering Maikramer and Main Branch #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
f6dd6f3
Rework to change from FreeImage to ImageShark
maikramer Nov 7, 2018
e34d996
Create README.md
maikramer Nov 7, 2018
cd7318e
Update README.md
maikramer Nov 7, 2018
e774389
Update README.md
maikramer Nov 7, 2018
456c7ed
Now building in linux
maikramer Nov 8, 2018
d5f3b71
Merge branch 'master' of https://github.com/maikramer/Materialize
maikramer Nov 8, 2018
8c8523a
Updated Unity to 2018.3.0f2 and ImageSharp to latest
maikramer Jan 8, 2019
030fda3
Update README.md
maikramer Jan 8, 2019
936fe5b
ImageSharp removed. Original File Manager replaced, now we can select…
maikramer Jan 9, 2019
e2a2583
Corrigidos alguns bugs
maikramer Jan 9, 2019
c4c3d1e
More bugfixes and added SaveAll
maikramer Jan 9, 2019
ac52501
Settings goes to playerprefs. Save and Load Project working
maikramer Jan 9, 2019
bf90a4a
Release v0.2
maikramer Jan 9, 2019
b2e4143
Update README.md
maikramer Jan 9, 2019
2bd6ba7
Update README.md
maikramer Jan 9, 2019
084a34d
Update Project Settings
maikramer Jan 20, 2019
7bba87c
Merge branch 'master' of https://github.com/maikramer/Materialize
maikramer Jan 20, 2019
2add012
Clean Scripts
maikramer Jan 21, 2019
98331b0
Clean Up and Paste Image on Linux
maikramer Jan 31, 2019
278b7e8
Added paste from browser / image editor
maikramer Feb 1, 2019
42bd5f1
Hide GUI while rotating/panning
maikramer Feb 1, 2019
46f4394
Cleaning and Fixes
maikramer Feb 2, 2019
3a7cd14
Merge branch 'CleanUp'
maikramer Feb 2, 2019
d7bea53
Update README.md
maikramer Feb 6, 2019
ddb5b31
Update README.md
maikramer Feb 6, 2019
fdd4821
Added in ability to change framerate
finepointcgi Feb 22, 2019
0808c6e
Fixed Ui Layout Issue
finepointcgi Feb 22, 2019
9245ea1
Merge pull request #2 from mitchelldmccollum/master
maikramer Feb 23, 2019
cd1ce9c
Added FrameRate limit, thanks to mitchelldmccollum. Updated unity to …
maikramer Feb 23, 2019
80802de
Fixed project settings issue
finepointcgi Feb 26, 2019
b2aff9e
Added Reset to defaults to all materal options
finepointcgi Feb 27, 2019
89223e0
Fxed bug with smoothness using wrong shader
finepointcgi Feb 28, 2019
d890687
Merge branch 'master' of https://github.com/mitchelldmccollum/Materia…
maikramer Feb 28, 2019
bfeb28e
Merge branch 'mitchelldmccollum-master'
maikramer Feb 28, 2019
194b792
Fix problem with smoothness, i think unity was stripping preview shader
maikramer Feb 28, 2019
cbcba1b
Revert "Merge branch 'Batch-Processing'"
finepointcgi Feb 28, 2019
4bf993f
attempt to merge again
finepointcgi Feb 28, 2019
bf22a39
added in packed maps for batching
finepointcgi Mar 1, 2019
3313360
Added in ui changes for the extra channel
finepointcgi Mar 2, 2019
7ebc379
Changed UI to allow property packing into the alpha channel
finepointcgi Mar 2, 2019
fb7e963
Added in ability to scale texure on import and laid ground work for d…
finepointcgi Mar 3, 2019
6689df9
Merged To master
finepointcgi Mar 4, 2019
85cc80e
added in aspect locked for texture scale
finepointcgi Mar 4, 2019
46a4561
Merge pull request #4 from mitchelldmccollum/master
maikramer Mar 5, 2019
0c61fa1
Bump to v0.3.5
maikramer Mar 5, 2019
0a2e727
Fix Smoothness and paths with special chars Like spaces
maikramer Mar 5, 2019
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
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
172 changes: 172 additions & 0 deletions .idea/.idea.Materialize/.idea/contentModel.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading