Skip to content

ex #7

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

ex #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ce294be
Merge pull request #18 from zrdumped/master
zrdumped Jun 26, 2018
6038cde
Merge pull request #10 from vitalight/master
tangzhongyue Jun 27, 2018
ae9da04
no idea why I changde that
tangzhongyue Jun 27, 2018
ebd9400
Merge branch 'master' of https://github.com/tangzhongyue/Unity-Chemic…
tangzhongyue Jun 27, 2018
83e997a
fix some small bugs
tangzhongyue Jun 27, 2018
492b60d
Merge pull request #19 from tangzhongyue/master
tangzhongyue Jun 27, 2018
bfe47b7
small update
vitalight Jun 27, 2018
e7c26c2
Merge remote-tracking branch 'origin/master'
vitalight Jun 27, 2018
c95fd8c
cleanup
vitalight Jun 27, 2018
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
15,328 changes: 1,767 additions & 13,561 deletions Assets/3rdParty/Obi/Sample Scenes/FluidSmoke.unity
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Assets/3rdParty/Obi/Sample Scenes/SampleResources/Materials/DiffuseParticles.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Material:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: DiffuseParticles
m_Shader: {fileID: 207, guid: 0000000000000000f000000000000000, type: 0}
m_Shader: {fileID: 202, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
Expand Down Expand Up @@ -39,7 +39,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0}
m_Texture: {fileID: 2800000, guid: 568ceb11f52ec4d36abc82bcf61af795, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
Expand Down
6 changes: 3 additions & 3 deletions Assets/Chemistry/substances.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</O2>

<H2 type="gas">
<color>255:255:255:0</color>
<color>255:255:255:255</color>
</H2>

<Cl2 type="gas">
Expand Down Expand Up @@ -93,7 +93,7 @@
<color>255:255:255:255</color>
</C5H11O5COOH>

<H2SO4 type="solid">
<H2SO4 type="liquid">
<color>255:255:255:255</color>
<reactionTag>CXX_KClO3</reactionTag>
</H2SO4>
Expand Down Expand Up @@ -192,7 +192,7 @@
<tempConstant>0.1</tempConstant>
<reactant type="solid" rate="3">C5H11O5CHO</reactant>
<reactant type="solid" rate="1">KClO3</reactant>
<reactant type="solid" rate="0">H2SO4</reactant>
<reactant type="liquid" rate="0">H2SO4</reactant>
<product type="solid" rate="3">C5H11O5COOH</product>
<product type="solid" rate="3">KCl</product>
</CXX_KClO3>
Expand Down
10 changes: 0 additions & 10 deletions Assets/Cruncher.meta
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions Assets/Cruncher/Documentation.meta
View file
Open in desktop

This file was deleted.

Loading