GameDevArea/Global-Gam-Jam-2017
Archived
1
0
Fork 0
Code Releases 1 Activity

Merge

Browse source
This commit is contained in:
MrDev023 2017-01-20 20:39:18 +01:00
commit 60f16efe7f
3 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
.idea/workspace.xml
View file

@ -2,13 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="00f293cb-c755-478c-9b6f-422f827454e0" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/globalgamejam/gui/GUI.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/globalgamejam/gui/IActionGUI.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/globalgamejam/gui/Label.java" afterPath="$PROJECT_DIR$/src/globalgamejam/gui/GUILabel.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/globalgamejam/input/Input.java" afterPath="$PROJECT_DIR$/src/globalgamejam/input/Input.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/globalgamejam/tiles/PlayerTile.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/globalgamejam/math/Matrix4f.java" afterPath="$PROJECT_DIR$/src/globalgamejam/math/Matrix4f.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/globalgamejam/render/DisplayManager.java" afterPath="$PROJECT_DIR$/src/globalgamejam/render/DisplayManager.java" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -49,11 +44,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="Matrix4f.java" pinned="false" current-in-tab="false">
<file leaf-file-name="Matrix4f.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/math/Matrix4f.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="181" column="5" lean-forward="true" selection-start-line="181" selection-start-column="5" selection-end-line="181" selection-end-column="5" />
<state relative-caret-position="206">
<caret line="83" column="0" lean-forward="true" selection-start-line="83" selection-start-column="0" selection-end-line="83" selection-end-column="0" />
<folding />
</state>
</provider>
@ -72,7 +67,7 @@
</provider>
</entry>
</file>
<file leaf-file-name="GUI.java" pinned="false" current-in-tab="true">
<file leaf-file-name="GUI.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/GUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
@ -186,13 +181,13 @@
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/src/globalgamejam/math/Vector3f.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/tiles/Tile.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/math/Matrix4f.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/gui/Label.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/render/DisplayManager.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/gui/IActionGUI.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/gui/GUILabel.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/gui/GUI.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/input/Input.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/math/Matrix4f.java" />
</list>
</option>
</component>
@ -997,14 +992,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/math/Matrix4f.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="181" column="5" lean-forward="true" selection-start-line="181" selection-start-column="5" selection-end-line="181" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/Image.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
@ -1075,6 +1062,14 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/math/Matrix4f.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206">
<caret line="83" column="0" lean-forward="true" selection-start-line="83" selection-start-column="0" selection-end-line="83" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

2
src/globalgamejam/math/Matrix4f.java
View file

@ -81,7 +81,7 @@ public class Matrix4f {
});
return mat;
}
public Matrix4f translate(float x,float y,float z){
Matrix4f mat = new Matrix4f(new float[][]{
{1,0,0,x},

8
src/globalgamejam/tiles/PlayerTile.java Normal file
View file

@ -0,0 +1,8 @@
package globalgamejam.tiles;
public class PlayerTile extends Tile {
public PlayerTile(){
super();
}
}