1.1.0harmattan30

CHANGES.md

@@ -1,9 +1,18 @@
 ## Change logs
-**1.1.0harmattan29(natasha)** - **2023-05-01**
+**1.1.0harmattan30(natasha)** - **2023-05-23**
 
 ----------------------------------------------------------------------------------
 ### Update
 
+* Add function key toolbar for soft input method(default disabled, in `Settings`).
+* Add joystick release range setting in tab `CONTROLS`. The value is joystick radius's multiple, 0 to disable.
+* Fix crash when end intro cinematic in Quake 4.
+* Fix delete savegame menu action in Quake 4.
+
+----------------------------------------------------------------------------------
+
+### History
+
 > 1.1.0harmattan29 (2023-05-01)
 
 * Fixup crash in game loading when change app to background.
@@ -13,7 +22,6 @@
 * Fixup on-screen buttons layer render error on some devices.
 
 ----------------------------------------------------------------------------------
-### History
 
 > 1.1.0harmattan28 (2023-04-13)
 

CHANGES.zh.md

@@ -1,9 +1,18 @@
 ## 更新日志
-**1.1.0harmattan29(natasha)** - **2023-05-01**
+**1.1.0harmattan30(natasha)** - **2023-05-23**
 
 ----------------------------------------------------------------------------------
 ### 更新
 
+* 新增功能键工具条当输入法打开时(默认禁用, 在`Settings`菜单中).
+* 新增摇杆释放范围设置, 在`CONTROLS`选项卡下. 值为摇杆半径的倍数, 设为0禁用.
+* 修复雷神之锤4第一关动画播放完后游戏崩溃.
+* 修复雷神之锤4删除存档菜单功能.
+
+----------------------------------------------------------------------------------
+
+### 历史
+
 > 1.1.0harmattan29 (2023-05-01)
 
 * 修复游戏关卡载入时, 游戏切换到后台时崩溃.
@@ -13,7 +22,6 @@
 * 修复部分设备上虚拟按键层与游戏层重叠渲染.
 
 ----------------------------------------------------------------------------------
-### 历史
 
 > 1.1.0harmattan28 (2023-04-13)
 

DIII4A/idTech4Amm/src/main/java/com/karin/idTech4Amm/sys/Constants.java

@@ -11,7 +11,7 @@ public final class Constants
     public static final String CONST_PREFERENCE_EXCEPTION_DEBUG = "_EXCEPTION_DEBUG";
 
     public static final int CONST_UPDATE_RELEASE = 30;
-    public static final String CONST_RELEASE = "2023-05-15";
+    public static final String CONST_RELEASE = "2023-05-23";
     public static final String CONST_EMAIL = "beyondk2000@gmail.com";
     public static final String CONST_DEV = "Karin";
     public static final String CONST_CODE = "Harmattan";
@@ -25,6 +25,8 @@ public final class Constants
 	public static final String[] CONST_CHANGES = {
             "Add function key toolbar for soft input method(default disabled, in Settings).",
             "Add joystick release range setting in tab `CONTROLS`. The value is joystick radius's multiple, 0 to disable.",
+            "Fix crash when end intro cinematic in Quake 4.",
+            "Fix delete savegame menu action in Quake 4.",
 	};
     public static final String CONST_PACKAGE = "com.karin.idTech4Amm";
 

README.md

@@ -1,9 +1,9 @@
 ## idTech4A++ (Harmattan Edition)
 #### DIII4A++, com.n0n3m4.diii4a, DOOM III/Quake 4/Prey(2006) for Android, 毁灭战士3/雷神之锤4/掠食(2006)安卓移植版
 **Latest version:**
-1.1.0harmattan29(natasha)  
+1.1.0harmattan30(natasha)  
 **Last update release:**
-2023-05-01  
+2023-05-23  
 **Arch:**
 arm64 armv7-a  
 **Platform:**
@@ -14,13 +14,10 @@ GPLv3
 ----------------------------------------------------------------------------------
 ### Update
 
-> 1.1.0harmattan29 (2023-05-01)
-
-* Fixup crash in game loading when change app to background.
-* Fixup effects with noise and other effects in Quake 4.
-* Optimize sky render in Quake 4.
-* Remove cvar `harm_g_flashlightOn` in Quake 4.
-* Fixup on-screen buttons layer render error on some devices.
+* Add function key toolbar for soft input method(default disabled, in `Settings`).
+* Add joystick release range setting in tab `CONTROLS`. The value is joystick radius's multiple, 0 to disable.
+* Fix crash when end intro cinematic in Quake 4.
+* Fix delete savegame menu action in Quake 4.
 
 ----------------------------------------------------------------------------------
 

README.zh.md

@@ -1,9 +1,9 @@
 ## idTech4A++ (Harmattan Edition)
 #### DIII4A++, com.n0n3m4.diii4a, DOOM III/Quake 4/Prey(2006) for Android, 毁灭战士3/雷神之锤4/掠食(2006)安卓移植版
 **最新版本:**
-1.1.0harmattan29(natasha)  
+1.1.0harmattan30(natasha)  
 **最新更新日期:**
-2023-05-01  
+2023-05-23  
 **架构支持:**
 arm64 armv7-a  
 **平台:**
@@ -14,22 +14,10 @@ GPLv3
 ----------------------------------------------------------------------------------
 ### 更新
 
-> 1.1.0harmattan29 (2023-05-01)
-
-* 修复游戏关卡载入时, 游戏切换到后台时崩溃.
-* 修复雷神之锤4特效噪音和其他特效显示.
-* 优化雷神之锤4天空盒渲染.
-* 移除雷神之锤4cvar `harm_g_flashlightOn`.
-* 修复部分设备上虚拟按键层与游戏层重叠渲染.
-
-----------------------------------------------------------------------------------
-
-> 1.1.0harmattan28 (2023-04-13)
-
-* 雷神之锤4新增布尔型cvar `harm_g_mutePlayerFootStep`去控制是否静音玩家脚步声(默认静音).
-* 雷神之锤4修复亮度依赖声音幅度的光源. 例如在大多数关卡(比如`airdefense2`), 在一些黑暗的通道应该有重复闪烁的光源.
-* 移除启动雷神之锤4时的帮助对话框, 如果需要解压游戏资源, 在菜单`Other` -> `Extract resource`.
-* (Bug)雷神之锤4中, 如果开启特效, 载入关卡后有杂音, 在控制台输入`bse_enabled`为0, 然后再输入`bse_enabled`变回1, 杂音将会消失.
+* 新增功能键工具条当输入法打开时(默认禁用, 在`Settings`菜单中).
+* 新增摇杆释放范围设置, 在`CONTROLS`选项卡下. 值为摇杆半径的倍数, 设为0禁用.
+* 修复雷神之锤4第一关动画播放完后游戏崩溃.
+* 修复雷神之锤4删除存档菜单功能.
 
 ----------------------------------------------------------------------------------
 

doom3/neo/raven/bse/BSE_Parser.cpp

@@ -110,7 +110,7 @@ class rvDeclEffectParser
 		int ParseLine(idBounds &res, int *parmsCount = 0); // parse line geometry parmeters
 		int ParseSphere(idSphere &res, int *parmsCount = 0);
 		int ParseCylinder(idSphere &res, int *parmsCount = 0);
-		int ParseSpiral(idBounds &res, int *parmsCount = 0);
+		int ParseSpiral(idBounds &res, float &i7, int *parmsCount = 0);
 		void ParseVelocity(rvBSEParticleStage *stage, int n);
 		void ParseFade(rvBSEParticleStage *stage, int n);
 		idVec3 ParseTint(rvBSEParticleStage *stage, int n);
@@ -185,6 +185,12 @@ bool rvDeclEffectParser::ParseGeneralParms(idToken &token, rvFXSingleAction &FXA
 		FXAction.delay = vec[0];
 		return true;
 	}
+	if (!token.Icmp("density")) {
+		ParseVec();
+		if(FXAction.count == 0)
+			FXAction.count = vec[0];
+		return true;
+	}
 	return false;
 }
 
@@ -251,39 +257,20 @@ int rvDeclEffectParser::ParsePoint(idVec3 &res, int *parmsCount)
 	return 0;
 }
 
-int rvDeclEffectParser::ParseSpiral(idBounds &res, int *parmsCount)
+int rvDeclEffectParser::ParseSpiral(idBounds &res, float &i7, int *parmsCount)
 {
 	int count = ParseVec(parmsCount);
-	if(count == 6)
+	if(count == 7)
 	{
 		res[0][0] = vec[0];
 		res[0][1] = vec[1];
 		res[0][2] = vec[2];
 		res[1][0] = vec[3];
 		res[1][1] = vec[4];
 		res[1][2] = vec[5];
+		i7 = vec[6];
 		return 3;
 	}
-	else if(count == 4)
-	{
-		res[0][0] = vec[0];
-		res[0][1] = vec[1];
-		res[0][2] = 0.0;
-		res[1][0] = vec[2];
-		res[1][1] = vec[3];
-		res[1][2] = 0.0;
-		return 2;
-	}
-	else if(count == 2)
-	{
-		res[0][0] = vec[0];
-		res[0][1] = 0.0;
-		res[0][2] = 0.0;
-		res[1][0] = vec[1];
-		res[1][1] = 0.0;
-		res[1][2] = 0.0;
-		return 1;
-	}
 	return 0;
 }
 
@@ -622,7 +609,7 @@ void rvDeclEffectParser::ParseVelocity(rvBSEParticleStage *stage, int n)
 			if(stage->customPathType == PPATH_HELIX)
 			{
 				stage->customPathParms[3] = v;
-				stage->customPathParms[4] = v;
+				//stage->customPathParms[4] = v;
 			}
 		}
 	}
@@ -641,7 +628,7 @@ void rvDeclEffectParser::ParseVelocity(rvBSEParticleStage *stage, int n)
 			if(stage->customPathType == PPATH_HELIX)
 			{
 				stage->customPathParms[3] = v;
-				stage->customPathParms[4] = v;
+				//stage->customPathParms[4] = v;
 			}
 		}
 	}
@@ -718,12 +705,15 @@ void rvDeclEffectParser::ParsePosition(rvBSEParticleStage *stage)
 	else if(!idStr::Icmp(token, "spiral"))
 	{
 		idBounds b;
+		float i7 = 0.0;
 		b.Zero();
-		ParseSpiral(b);
+		ParseSpiral(b, i7);
 		stage->customPathType = PPATH_HELIX;
-		stage->customPathParms[0] = b[0][0];
-		stage->customPathParms[1] = b[0][1];
-		stage->customPathParms[2] = b[0][2];
+		idVec3 v = b.Size();
+		stage->customPathParms[0] = v[0];
+		stage->customPathParms[1] = v[1];
+		stage->customPathParms[2] = v[2];
+		stage->customPathParms[4] = i7;
 	}
 	else
 	{
@@ -965,6 +955,10 @@ void rvDeclEffectParser::ParseStage(rvFXSingleAction &FXAction, rvBSEParticleSta
 		LOGW_SKIP("Skip stage: %s -> %s", GetName(), token.c_str());
 		Skip();
 	}
+	if(stage && stage->customPathType == PPATH_HELIX)
+	{
+		FXAction.useEndOrigin = false;
+	}
 }
 
 void rvDeclEffectParser::Skip(void)
@@ -1039,9 +1033,9 @@ void rvDeclEffectParser::ParseLine(rvFXSingleAction &FXAction)
 
 		if (!token.Icmp("start")) {
 			ParseStage(action, stage, STAGE_START);
-			stage->customPathParms[0] = action.size;
-			stage->customPathParms[1] = action.useEndOrigin ? 0.0f : 1.0f;
-			stage->customPathParms[2] = action.length;
+			stage->customPathParms[5] = action.size;
+			stage->customPathParms[6] = action.useEndOrigin ? 0.0f : 1.0f;
+			stage->customPathParms[7] = action.length;
 			continue;
 		}
 
@@ -1052,9 +1046,9 @@ void rvDeclEffectParser::ParseLine(rvFXSingleAction &FXAction)
 
 		if (!token.Icmp("end")) {
 			ParseStage(action, stage, STAGE_END);
-			//stage->customPathParms[0] = action.size;
-			if(stage->customPathParms[2] == 0.0 && action.length != 0.0 && action.length < stage->customPathParms[2])
-				stage->customPathParms[2] = action.length;
+			//stage->customPathParms[5] = action.size;
+			if(stage->customPathParms[7] == 0.0 && action.length != 0.0 && action.length < stage->customPathParms[7])
+				stage->customPathParms[7] = action.length;
 			continue;
 		}
 

doom3/neo/raven/bse/BSE_Particle.cpp

@@ -1164,7 +1164,7 @@ void R_LocalPointToGlobal(const float modelMatrix[16], const idVec3 &in, idVec3
 
 static int ParticleVerts_line(rvBSEParticleStage *stage, rvBSE_particleGen_t *g, idVec3 origin, idDrawVert *verts)
 {
-	bool useEndOrigin = stage->customPathParms[1] < 1.0f;
+	bool useEndOrigin = stage->customPathParms[6] < 1.0f;
 
 	float	modelMatrix[16];
 
@@ -1184,8 +1184,8 @@ static int ParticleVerts_line(rvBSEParticleStage *stage, rvBSE_particleGen_t *g,
 		minor.Cross(major, dir);
 		minor.Normalize();
 
-		if (stage->customPathParms[0] != 0.0f) {
-			minor *= stage->customPathParms[0] * 0.5f;
+		if (stage->customPathParms[5] != 0.0f) {
+			minor *= stage->customPathParms[5] * 0.5f;
 		}
 
 		verts[0].xyz = minor;
@@ -1196,7 +1196,7 @@ static int ParticleVerts_line(rvBSEParticleStage *stage, rvBSE_particleGen_t *g,
 	else
 	{
 		idVec3	localView, localTarget;
-		idVec3 target = origin + g->renderEnt->axis[0] * stage->customPathParms[2];
+		idVec3 target = origin + g->renderEnt->axis[0] * stage->customPathParms[7];
 		R_AxisToModelMatrix(g->renderEnt->axis, origin, modelMatrix);
 		R_GlobalPointToLocal(modelMatrix, g->renderView->vieworg, localView);
 		R_GlobalPointToLocal(modelMatrix, target, localTarget);
@@ -1209,8 +1209,8 @@ static int ParticleVerts_line(rvBSEParticleStage *stage, rvBSE_particleGen_t *g,
 		minor.Cross(major, dir);
 		minor.Normalize();
 
-		if (stage->customPathParms[0] != 0.0f) {
-			minor *= stage->customPathParms[0] * 0.5f;
+		if (stage->customPathParms[5] != 0.0f) {
+			minor *= stage->customPathParms[5] * 0.5f;
 		}
 
 		verts[0].xyz = origin + minor;