Skip to content
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

Bitfield class #90

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Bitfield class #90

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29f9a25
Add multiline macro
czaloj Jul 17, 2015
d39a4ba
Begin bitfield implementation
czaloj Jul 17, 2015
152befc
Fix small error
czaloj Jul 17, 2015
8f115fd
Merge remote-tracking branch 'refs/remotes/origin/develop' into featu…
czaloj Dec 6, 2015
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
Prev Previous commit
Merge remote-tracking branch 'refs/remotes/origin/develop' into featu… 
…re/Util

# Conflicts:
#	Vorb.vcxproj
#	Vorb.vcxproj.filters
  • Loading branch information
@czaloj
czaloj committed Dec 6, 2015
commit 8f115fdf18d132a585724612255843c799a787be
4 changes: 4 additions & 0 deletions Vorb.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,10 @@
<None Include="include/typesColor.inl" />
<None Include="include\AssetLoader.inl" />
<None Include="include\Bitfields.inl" />
<None Include="include\math\MatrixMath.hpp" />
<None Include="include\Matrix.inl" />
<None Include="include\Quaternion.inl" />
<None Include="include\Vector.inl" />
<None Include="include\voxel\IntervalTree.inl" />
<None Include="src/sound/SoundImplFMOD.inl" />
<None Include="src\graphics\ImageIOConv.inl" />
Expand Down
12 changes: 12 additions & 0 deletions Vorb.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,6 +858,18 @@
<None Include="include\Bitfields.inl">
<Filter>Utils</Filter>
</None>
<None Include="include\Matrix.inl">
<Filter>Core</Filter>
</None>
<None Include="include\Vector.inl">
<Filter>Core</Filter>
</None>
<None Include="include\Quaternion.inl">
<Filter>Core</Filter>
</None>
<None Include="include\math\MatrixMath.hpp">
<Filter>Core\Math</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Text Include="KEG.txt">
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.