peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

merge development into test #26

Merged
j23f0712 merged 95 commits from development into dev/test 2024-12-01 21:02:48 +01:00
Conversation 2 Commits 95 Files Changed 270 +3 -6
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7a482b74ab - Show all commits

3
Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java
View File

@@ -82,9 +82,6 @@ public void onAction(String name, boolean isPressed, float tpf) {
} }
} }
}, "Test"); }, "Test");
} }
@Override @Override

6
Projekte/mdga/client/src/main/resources/MatDefs/SelectObjectOutliner/Post15.vert
View File

@@ -1,7 +1,7 @@
in vec4 inPosition; attribute vec4 inPosition;
in vec2 inTexCoord; attribute vec2 inTexCoord;
out vec2 texCoord; varying vec2 texCoord;
void main() { void main() {
vec2 pos = inPosition.xy * 2.0 - 1.0; vec2 pos = inPosition.xy * 2.0 - 1.0;