Merge branch 'view_assets' into dev_client
# Conflicts: # Projekte/mdga/client/build.gradle
@@ -0,0 +1,15 @@
|
||||
package pp.mdga.client;
|
||||
|
||||
import com.jme3.app.SimpleApplication;
|
||||
|
||||
public class MdgaApp extends SimpleApplication {
|
||||
public static void main(String[] args) {
|
||||
MdgaApp app = new MdgaApp();
|
||||
app.start();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void simpleInitApp() {
|
||||
|
||||
}
|
||||
}
|
||||
BIN
Projekte/mdga/client/src/main/resources/bigTent/bigTent.j3o
Normal file
BIN
Projekte/mdga/client/src/main/resources/bigTent/bigTent_diff.png
Normal file
|
After Width: | Height: | Size: 316 KiB |
BIN
Projekte/mdga/client/src/main/resources/cardStack/cardStack.j3o
Normal file
|
After Width: | Height: | Size: 58 KiB |
BIN
Projekte/mdga/client/src/main/resources/cir/cir.j3o
Normal file
BIN
Projekte/mdga/client/src/main/resources/cir/cir_diff.png
Normal file
|
After Width: | Height: | Size: 2.1 MiB |
BIN
Projekte/mdga/client/src/main/resources/heer/heer.j3o
Normal file
BIN
Projekte/mdga/client/src/main/resources/heer/heer_diff.png
Normal file
|
After Width: | Height: | Size: 1.5 MiB |
BIN
Projekte/mdga/client/src/main/resources/jet/jet.j3o
Normal file
BIN
Projekte/mdga/client/src/main/resources/jet/jet_diff.png
Normal file
|
After Width: | Height: | Size: 26 KiB |
BIN
Projekte/mdga/client/src/main/resources/lw/lw.j3o
Normal file
BIN
Projekte/mdga/client/src/main/resources/lw/lw_diff.png
Normal file
|
After Width: | Height: | Size: 210 KiB |
BIN
Projekte/mdga/client/src/main/resources/marine/marine.j3o
Normal file
BIN
Projekte/mdga/client/src/main/resources/marine/marine_diff.png
Normal file
|
After Width: | Height: | Size: 186 KiB |
BIN
Projekte/mdga/client/src/main/resources/node_home/node_home.j3o
Normal file
|
After Width: | Height: | Size: 38 KiB |
|
After Width: | Height: | Size: 39 KiB |
|
After Width: | Height: | Size: 38 KiB |
|
After Width: | Height: | Size: 39 KiB |
|
After Width: | Height: | Size: 292 KiB |
|
After Width: | Height: | Size: 291 KiB |
|
After Width: | Height: | Size: 292 KiB |
BIN
Projekte/mdga/client/src/main/resources/radar/radar.j3o
Normal file
BIN
Projekte/mdga/client/src/main/resources/radar/radar_diff.png
Normal file
|
After Width: | Height: | Size: 298 KiB |
|
After Width: | Height: | Size: 39 KiB |
BIN
Projekte/mdga/client/src/main/resources/ship/ship.j3o
Normal file
BIN
Projekte/mdga/client/src/main/resources/ship/ship_diff.png
Normal file
|
After Width: | Height: | Size: 274 KiB |
BIN
Projekte/mdga/client/src/main/resources/smallTent/smallTent.j3o
Normal file
|
After Width: | Height: | Size: 47 KiB |
BIN
Projekte/mdga/client/src/main/resources/swapCard/swapCard.j3o
Normal file
|
After Width: | Height: | Size: 47 KiB |
BIN
Projekte/mdga/client/src/main/resources/tank/tank.j3o
Normal file
BIN
Projekte/mdga/client/src/main/resources/tank/tank_diff.png
Normal file
|
After Width: | Height: | Size: 57 KiB |
BIN
Projekte/mdga/client/src/main/resources/turboCard/turboCard.j3o
Normal file
|
After Width: | Height: | Size: 36 KiB |
BIN
Projekte/mdga/client/src/main/resources/world/world.j3o
Normal file
BIN
Projekte/mdga/client/src/main/resources/world/world_diff.png
Normal file
|
After Width: | Height: | Size: 12 MiB |