[Jrisk-cvs] SF.net SVN: domination-code:[2603] Domination
Brought to you by:
yuranet
Menu
▾
▴
[Jrisk-cvs] SF.net SVN: domination-code:[2603] Domination
|
From: <yu...@us...> - 2024-12-28 00:23:01
|
Revision: 2603
http://sourceforge.net/p/domination/code/2603
Author: yuranet
Date: 2024-12-28 00:22:58 +0000 (Sat, 28 Dec 2024)
Log Message:
-----------
grasshopper update
Modified Paths:
--------------
Domination/ChangeLog.txt
Domination/android/AndroidManifest.xml
Domination/android/libs/GrasshopperAndroid.jar
Domination/ios/lib/GrasshopperiOS.jar
Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapServerClient.java
Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java
Domination/swingUI/lib/Grasshopper.jar
Domination/swingUI/src/net/yura/domination/ui/flashgui/BugLogger.java
Domination/swingUI/src/net/yura/domination/ui/swinggui/BugsPanel.java
Domination/swingUI/src/net/yura/domination/ui/swinggui/SwingGUIPanel.java
Modified: Domination/ChangeLog.txt
===================================================================
--- Domination/ChangeLog.txt 2024-12-23 17:31:24 UTC (rev 2602)
+++ Domination/ChangeLog.txt 2024-12-28 00:22:58 UTC (rev 2603)
@@ -7,7 +7,7 @@
* Save: 8
iOS: 16
- Android: 98
+ Android: 99
Game GUI: 2
Swing GUI: 2
Simple GUI: 2
@@ -34,6 +34,8 @@
Player card info on main screen
Can add custom maps through Files app
+ Android 99 handle lobby disconnections better
+
Android 98 fix for images sometimes not loading
Android 97 fix for notifications not working
Modified: Domination/android/AndroidManifest.xml
===================================================================
--- Domination/android/AndroidManifest.xml 2024-12-23 17:31:24 UTC (rev 2602)
+++ Domination/android/AndroidManifest.xml 2024-12-28 00:22:58 UTC (rev 2603)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
package="net.yura.domination"
- android:versionCode="98"
- android:versionName="98"
+ android:versionCode="99"
+ android:versionName="99"
android:installLocation="auto">
<!-- android:targetSdkVersion 11 to hide the legacy menu button on tablets -->
Modified: Domination/android/libs/GrasshopperAndroid.jar
===================================================================
(Binary files differ)
Modified: Domination/ios/lib/GrasshopperiOS.jar
===================================================================
(Binary files differ)
Modified: Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapServerClient.java
===================================================================
--- Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapServerClient.java 2024-12-23 17:31:24 UTC (rev 2602)
+++ Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapServerClient.java 2024-12-28 00:22:58 UTC (rev 2603)
@@ -64,10 +64,11 @@
// this stop imagees being fucked by operators
// http://benvallack.com/notebook/how-to-fix-poor-image-quality-compression-when-using-tmobile-web-n-walk-on-a-mac/
+ // https://serverfault.com/questions/752846/how-to-prevent-compression-of-images-served-via-http
static final Hashtable headers = new Hashtable();
static {
- headers.put("Cache-Control", "no-cache");
- headers.put("Pragma", "no-cache");
+ headers.put("Cache-Control", "no-transform, no-cache, no-store, private, max-age=0");
+ headers.put("Pragma", "no-cache"); // for backwards compatibility with HTTP/1.0 caches that do not support the Cache-Control HTTP/1.1 header.
}
MapServerListener listener;
Modified: Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java
===================================================================
--- Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java 2024-12-23 17:31:24 UTC (rev 2602)
+++ Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java 2024-12-28 00:22:58 UTC (rev 2603)
@@ -23,11 +23,11 @@
import net.yura.domination.mapstore.MapUpdateService;
import net.yura.domination.mobile.MiniUtil;
import net.yura.domination.mobile.RiskMiniIO;
-import net.yura.grasshopper.ApplicationInfoProvider;
-import net.yura.grasshopper.BugSubmitter;
-import net.yura.grasshopper.LogList;
+import net.yura.grasshopper.info.ApplicationInfoProvider;
+import net.yura.grasshopper.submitter.BugSubmitter;
+import net.yura.grasshopper.info.LogList;
import net.yura.grasshopper.SimpleBug;
-import net.yura.grasshopper.StdOutErrLevel;
+import net.yura.grasshopper.util.StdOutErrLevel;
import net.yura.lobby.client.PushLobbyClient;
import net.yura.lobby.mini.MiniLobbyClient;
import net.yura.lobby.model.Game;
Modified: Domination/swingUI/lib/Grasshopper.jar
===================================================================
(Binary files differ)
Modified: Domination/swingUI/src/net/yura/domination/ui/flashgui/BugLogger.java
===================================================================
--- Domination/swingUI/src/net/yura/domination/ui/flashgui/BugLogger.java 2024-12-23 17:31:24 UTC (rev 2602)
+++ Domination/swingUI/src/net/yura/domination/ui/flashgui/BugLogger.java 2024-12-28 00:22:58 UTC (rev 2603)
@@ -23,7 +23,7 @@
RiskUtil.RISK_VERSION+" FlashGUI" // "(save: " + RiskGame.SAVE_VERSION + " network: "+RiskGame.NETWORK_VERSION+")"
, TranslationBundle.getBundle().getLocale().toString());
- net.yura.grasshopper.BugSubmitter.setApplicationInfoProvider(new net.yura.grasshopper.ApplicationInfoProvider() {
+ net.yura.grasshopper.submitter.BugSubmitter.setApplicationInfoProvider(new net.yura.grasshopper.info.ApplicationInfoProvider() {
public void addInfoForSubmit(Map map) {
// TODO SwingGUI should also prob send this
map.put("lobbyID", net.yura.lobby.mini.MiniLobbyClient.getMyUUID());
Modified: Domination/swingUI/src/net/yura/domination/ui/swinggui/BugsPanel.java
===================================================================
--- Domination/swingUI/src/net/yura/domination/ui/swinggui/BugsPanel.java 2024-12-23 17:31:24 UTC (rev 2602)
+++ Domination/swingUI/src/net/yura/domination/ui/swinggui/BugsPanel.java 2024-12-28 00:22:58 UTC (rev 2603)
@@ -24,7 +24,7 @@
import net.yura.domination.engine.RiskUtil;
import net.yura.domination.engine.translation.TranslationBundle;
import net.yura.domination.guishared.RiskUIUtil;
-import net.yura.grasshopper.BugSubmitter;
+import net.yura.grasshopper.submitter.BugSubmitter;
/**
* @author Yura Mamyrin
Modified: Domination/swingUI/src/net/yura/domination/ui/swinggui/SwingGUIPanel.java
===================================================================
--- Domination/swingUI/src/net/yura/domination/ui/swinggui/SwingGUIPanel.java 2024-12-23 17:31:24 UTC (rev 2602)
+++ Domination/swingUI/src/net/yura/domination/ui/swinggui/SwingGUIPanel.java 2024-12-28 00:22:58 UTC (rev 2603)
@@ -468,7 +468,7 @@
Map map = new HashMap();
RiskGame game = myrisk.getGame();
if (game != null) {
- map.put("gameLog", new net.yura.grasshopper.LogList(game.getCommands()));
+ map.put("gameLog", new net.yura.grasshopper.info.LogList(game.getCommands()));
}
if (messageFromUser != null) {
map.put("messageFromUser" , messageFromUser);
@@ -481,7 +481,7 @@
map.put("recipient", to);
}
- boolean success = net.yura.grasshopper.BugSubmitter.submitBug(map, from, subject, cause, RiskUtil.GAME_NAME,
+ boolean success = net.yura.grasshopper.submitter.BugSubmitter.submitBug(map, from, subject, cause, RiskUtil.GAME_NAME,
RiskUtil.RISK_VERSION, TranslationBundle.getBundle().getLocale().toString()
);
@@ -1225,7 +1225,7 @@
public void flush() { }
public void close() { }
}, new net.yura.grasshopper.BugManager() {
- public void action(String thecause) {
+ public void action(String thecause, int actionCount) {
cause = thecause;
int nom = tabbedpane.indexOfComponent(DebugTab.this);
|
