Commit 0c764332 authored by Vitaliy Vashchenko's avatar Vitaliy Vashchenko

Merging

parent 6f2cad26
......@@ -11,11 +11,14 @@ import android.view.SurfaceView;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.backends.android.AndroidApplication;
import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
import com.flurry.android.FlurryAgent;
import java.io.File;
import java.io.FileOutputStream;
import cz.nic.tablexia.Tablexia;
import cz.nic.tablexia.TablexiaBuildConfig;
import cz.nic.tablexia.TablexiaSettings;
import cz.nic.tablexia.android.camera.AndroidDeviceCameraController;
import cz.nic.tablexia.debug.BuildConfig;
import cz.nic.tablexia.screen.loader.IConnectionManager;
......@@ -58,13 +61,14 @@ public class AndroidLauncher extends AndroidApplication {
glView.setZOrderOnTop(true);
}
// if (TablexiaSettings.getInstance().getBuildType().isBugReport() && TablexiaBuildConfig.FLURRY_KEY != null) {
// FlurryAgent.setLogEnabled(false);
// FlurryAgent.setVersionName(TablexiaSettings.getInstance().getFullName());
// FlurryAgent.init(this, TablexiaBuildConfig.FLURRY_KEY);
// }
Gdx.app.setLogLevel(LOG_DEBUG);
if (TablexiaSettings.getInstance().getBuildType().isBugReport() && TablexiaBuildConfig.FLURRY_KEY != null) {
FlurryAgent.setLogEnabled(false);
FlurryAgent.setVersionName(TablexiaSettings.getInstance().getFullName());
FlurryAgent.init(this, TablexiaBuildConfig.FLURRY_KEY);
}
}
/**
......@@ -100,8 +104,6 @@ public class AndroidLauncher extends AndroidApplication {
}
}
});
}
public void post(Runnable r) {
......
......@@ -388,8 +388,7 @@ project(":core") {
compile "net.engio:mbassador:$mbassadorVersion"
compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
compile "com.google.guava:guava:$guavaVersion"
// compile "com.google.zxing:core:$zxingVersion"
compile "com.google.zxing:javase:$zxingVersion"
compile "com.google.zxing:core:$zxingVersion"
......
......@@ -20,10 +20,10 @@ import cz.nic.tablexia.loader.TablexiaAbstractFileManager;
import cz.nic.tablexia.model.UserDAO;
import cz.nic.tablexia.model.game.GameDAO;
import cz.nic.tablexia.model.game.GamePauseDAO;
import cz.nic.tablexia.model.screen.ScreenDAO;
import cz.nic.tablexia.shared.model.User;
import cz.nic.tablexia.model.game.GameScoreDAO;
import cz.nic.tablexia.model.screen.ScreenDAO;
import cz.nic.tablexia.screen.AbstractTablexiaScreen;
import cz.nic.tablexia.shared.model.User;
import cz.nic.tablexia.util.Log;
import cz.nic.tablexia.util.Utility;
......
......@@ -20,8 +20,8 @@ import cz.nic.tablexia.TablexiaSettings;
import cz.nic.tablexia.bus.ApplicationBus;
import cz.nic.tablexia.loader.application.ApplicationAtlasManager;
import cz.nic.tablexia.loader.application.ApplicationFontManager;
import cz.nic.tablexia.shared.model.User;
import cz.nic.tablexia.screen.AbstractTablexiaScreen.ScreenInfoEvent;
import cz.nic.tablexia.shared.model.User;
import cz.nic.tablexia.util.ui.TablexiaLabel;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.alpha;
......
......@@ -10,8 +10,8 @@ import com.badlogic.gdx.scenes.scene2d.actions.SequenceAction;
import com.badlogic.gdx.scenes.scene2d.ui.Image;
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.Timer;
import com.badlogic.gdx.utils.Scaling;
import com.badlogic.gdx.utils.Timer;
import com.google.common.collect.ObjectArrays;
import java.util.Arrays;
......
......@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import cz.nic.tablexia.game.games.robbery.creature.attribute.Attribute;
import cz.nic.tablexia.game.games.robbery.creature.attribute.AttributeDescription;
import cz.nic.tablexia.game.games.robbery.creature.attribute.Attribute.CreatureSuperGenericType;
import cz.nic.tablexia.game.games.robbery.creature.attribute.AttributeDescription;
import cz.nic.tablexia.game.games.robbery.creature.attribute.clothing.accessories.AccessoriesAttribute;
import cz.nic.tablexia.game.games.robbery.creature.attribute.clothing.bottom.BottomAttribute;
import cz.nic.tablexia.game.games.robbery.creature.attribute.clothing.headgear.HeadgearAttribute;
......
......@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import cz.nic.tablexia.game.games.robbery.creature.attribute.Attribute;
import cz.nic.tablexia.game.games.robbery.creature.attribute.AttributeDescription;
import cz.nic.tablexia.game.games.robbery.creature.attribute.Attribute.CreatureGenericType;
import cz.nic.tablexia.game.games.robbery.creature.attribute.AttributeDescription;
import cz.nic.tablexia.game.games.robbery.creature.attribute.clothing.ClothingAttribute;
@CreatureGenericType(isGeneric = true)
......
......@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import cz.nic.tablexia.game.games.robbery.creature.attribute.Attribute;
import cz.nic.tablexia.game.games.robbery.creature.attribute.AttributeDescription;
import cz.nic.tablexia.game.games.robbery.creature.attribute.Attribute.CreatureGenericType;
import cz.nic.tablexia.game.games.robbery.creature.attribute.AttributeDescription;
import cz.nic.tablexia.game.games.robbery.creature.attribute.clothing.ClothingAttribute;
@CreatureGenericType(isGeneric = true)
......
......@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import cz.nic.tablexia.game.games.robbery.creature.attribute.Attribute;
import cz.nic.tablexia.game.games.robbery.creature.attribute.AttributeDescription;
import cz.nic.tablexia.game.games.robbery.creature.attribute.Attribute.CreatureGenericType;
import cz.nic.tablexia.game.games.robbery.creature.attribute.AttributeDescription;
import cz.nic.tablexia.game.games.robbery.creature.attribute.clothing.ClothingAttribute;
@CreatureGenericType(isGeneric = true)
......
......@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import cz.nic.tablexia.game.games.robbery.creature.attribute.Attribute;
import cz.nic.tablexia.game.games.robbery.creature.attribute.AttributeDescription;
import cz.nic.tablexia.game.games.robbery.creature.attribute.Attribute.CreatureGenericType;
import cz.nic.tablexia.game.games.robbery.creature.attribute.AttributeDescription;
import cz.nic.tablexia.game.games.robbery.creature.attribute.clothing.ClothingAttribute;
@CreatureGenericType(isGeneric = true)
......
......@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import cz.nic.tablexia.game.games.robbery.creature.attribute.Attribute;
import cz.nic.tablexia.game.games.robbery.creature.attribute.AttributeDescription;
import cz.nic.tablexia.game.games.robbery.creature.attribute.Attribute.CreatureGenericType;
import cz.nic.tablexia.game.games.robbery.creature.attribute.AttributeDescription;
@CreatureGenericType(isGeneric = true)
public abstract class GlassesAttribute extends Attribute {
......
......@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import cz.nic.tablexia.game.games.robbery.creature.attribute.Attribute;
import cz.nic.tablexia.game.games.robbery.creature.attribute.AttributeDescription;
import cz.nic.tablexia.game.games.robbery.creature.attribute.Attribute.CreatureGenericType;
import cz.nic.tablexia.game.games.robbery.creature.attribute.AttributeDescription;
@CreatureGenericType(isGeneric = true)
public abstract class HairAttribute extends Attribute {
......
......@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import cz.nic.tablexia.game.games.robbery.creature.attribute.Attribute;
import cz.nic.tablexia.game.games.robbery.creature.attribute.AttributeDescription;
import cz.nic.tablexia.game.games.robbery.creature.attribute.Attribute.CreatureGenericType;
import cz.nic.tablexia.game.games.robbery.creature.attribute.AttributeDescription;
@CreatureGenericType(isGeneric = true)
public abstract class HeadAttribute extends Attribute {
......
......@@ -4,9 +4,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import cz.nic.tablexia.TablexiaStorage;
import cz.nic.tablexia.bus.ApplicationBus;
......
......@@ -18,12 +18,11 @@ import java.util.Set;
import cz.nic.tablexia.TablexiaStorage;
import cz.nic.tablexia.game.AbstractTablexiaGame;
import cz.nic.tablexia.game.GameDefinition;
import cz.nic.tablexia.game.common.TablexiaRandom;
import cz.nic.tablexia.game.difficulty.GameDifficulty;
import cz.nic.tablexia.game.trophy.UserTrophyDefinition;
import cz.nic.tablexia.model.UserDAO;
import cz.nic.tablexia.shared.model.User;
import cz.nic.tablexia.shared.model.Game;
import cz.nic.tablexia.shared.model.User;
import cz.nic.tablexia.util.Log;
/**
......
......@@ -106,7 +106,7 @@ public class CameraScreen extends AbstractTablexiaScreen<Void> implements Camera
protected void screenLoaded(Map<String, String> screenState) {
deviceCameraControl = Tablexia.getDeviceCameraControl();
deviceCameraControl.setCameraCallback(this);
deviceCameraControl.resetDecoded();
// deviceCameraControl.resetDecoded();
if (deviceCameraControl != null) {
resetState();
}
......
......@@ -4,7 +4,6 @@ import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.audio.Music;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.NinePatch;
import com.badlogic.gdx.scenes.scene2d.actions.Actions;
import com.badlogic.gdx.scenes.scene2d.actions.ParallelAction;
import com.badlogic.gdx.scenes.scene2d.actions.SequenceAction;
......
......@@ -31,7 +31,7 @@ public interface DeviceCameraControl {
boolean cameraAccessible();
boolean isPreviewReady();
// Asynchronous interface - need when called from a non platform thread (GDX OpenGl thread)
void startPreviewAsync();
......
......@@ -16,8 +16,8 @@ import cz.nic.tablexia.game.games.kidnapping.model.GameState;
import cz.nic.tablexia.game.games.kidnapping.model.Position;
import cz.nic.tablexia.game.games.kidnapping.util.DirectionsHelper;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
* Created by lhoracek on 11/25/15.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment