Merge branch 'master' into pathfinder_history

Author: jere8184

Makefile

@@ -45,7 +45,11 @@ libopenage: $(BUILDDIR)
 
 .PHONY: codegen
 codegen: $(BUILDDIR)
-	$(MAKE) $(MAKEARGS) -C $(BUILDDIR) codegen
+	$(MAKE) $(MAKEARGS) -C $(BUILDDIR) cppgen
+
+.PHONY: cppgen
+cppgen: $(BUILDDIR)
+	$(MAKE) $(MAKEARGS) -C $(BUILDDIR) cppgen
 
 .PHONY: pxdgen
 pxdgen: $(BUILDDIR)

buildsystem/codegen.cmake

@@ -1,4 +1,4 @@
-# Copyright 2014-2019 the openage authors. See copying.md for legal info.
+# Copyright 2014-2025 the openage authors. See copying.md for legal info.
 
 # set CODEGEN_SCU_FILE to the absolute path to SCU file
 macro(get_codegen_scu_file)
@@ -52,7 +52,7 @@ function(codegen_run)
 		COMMENT "openage.codegen: generating c++ code"
 	)
 
-	add_custom_target(codegen
+	add_custom_target(cppgen
 		DEPENDS "${CODEGEN_TIMEFILE}"
 	)
 

doc/changelogs/nyan_api/v0.6.0.md

@@ -0,0 +1,43 @@
+# [0.6.0] - 2025-05-18
+All notable changes for version [v0.6.0] are documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## Added
+### Ability module
+- Add `Ranged(Property)` object; defines range of an ability; replaces various range members in `Ability` objects
+
+### Utility module
+- Add `AbilityUsable(Condition)` object; checks if an ability can be used by an entity
+- Add `NextCommand(Condition)` object; checks if a specific command is next in the command queue; replaces individual objects checking for specific commands
+- Add `TargetInRange(Condition)` object; checks if the target of an entity is in range of a specific ability
+- Add `Task(Node)` object; execute internal task when visiting node
+- Add `Task(Object)` object
+- Add `ClearCommandQueue(Task)` object; clears the command queue when visiting task node
+- Add `PopCommandQueue(Task)` object; pops the front command in the command queue when visiting task node
+- Add `MoveToTarget(Task)` object; move to the current target of the entity when visiting task node
+- Add `XORSwitchGate(Node)` object; switch branches based on evaluating single value
+- Add `SwitchCondition(Object)` object
+- Add `NextCommand(SwitchCondition)` object; switch branches based on the next command in the command queue
+- Add `Command(Object)` object; references internal commands of the engine
+- Add `ApplyEffect(Command)` object
+- Add `Idle(Command)` object
+- Add `Move(Command)` object
+
+### Removed
+### Ability module
+- Remove `RangedContinuousEffect(Ability)` object; functionality superceded by `Ranged(Property)` object
+- Remove `RangedDiscreteEffect(Ability)` object; functionality superceded by `Ranged(Property)` object
+- Remove `range` member from `DetectCloak(Ability)`; functionality superceded by `Ranged(Property)` object
+- Remove `range` member from `Herd(Ability)`; functionality superceded by `Ranged(Property)` object
+- Remove `min_range` member from `ShootProjectile(Ability)`; functionality superceded by `Ranged(Property)` object
+- Remove `max_range` member from `ShootProjectile(Ability)`; functionality superceded by `Ranged(Property)` object
+
+### Utility module
+- Remove `NextCommandIdle(Condition)` object; functionality superceded by `NextCommand(Condition)` object
+- Remove `NextCommandMove(Condition)` object; functionality superceded by `NextCommand(Condition)` object
+
+## Reference visualization
+
+* [Gamedata](https://github.com/SFTtech/openage/blob/927f547d4985cba8e172c9492273b34537571c56/doc/nyan/aoe2_nyan_tree.svg)

doc/code/renderer/demos.md

@@ -24,7 +24,7 @@ The demo mostly follows the steps described in the [Level 1 Renderer - Basic Usa
 documentation.
 
 ```bash
-./bin/run test --demo renderer.tests.renderer_demo 0
+cd bin && ./run test --demo renderer.tests.renderer_demo 0
 ```
 
 **Result:**
@@ -38,7 +38,7 @@ This demo shows how simple *textured* meshes can be created and rendered. It als
 how to interact with the window and the renderer using window callbacks.
 
 ```bash
-./bin/run test --demo renderer.tests.renderer_demo 1
+cd bin && ./run test --demo renderer.tests.renderer_demo 1
 ```
 
 **Controls:**
@@ -56,7 +56,7 @@ In this demo, we show how animation and texture metadata files are parsed and us
 load and render the correct textures and animations for a mesh.
 
 ```bash
-./bin/run test --demo renderer.tests.renderer_demo 2
+cd bin && ./run test --demo renderer.tests.renderer_demo 2
 ```
 
 **Controls:**
@@ -76,7 +76,7 @@ This demo shows a minimal setup for the [Level 2 Renderer](level2.md) and how to
 with it. The demo also introduces the camera system and how to interact with it.
 
 ```bash
-./bin/run test --demo renderer.tests.renderer_demo 3
+cd bin && ./run test --demo renderer.tests.renderer_demo 3
 ```
 
 **Controls:**
@@ -95,7 +95,7 @@ This demos shows how animation frame timing works and how to control the animati
 with the engine's internal clock.
 
 ```bash
-./bin/run test --demo renderer.tests.renderer_demo 4
+cd bin && ./run test --demo renderer.tests.renderer_demo 4
 ```
 
 **Controls:**
@@ -115,7 +115,7 @@ This demo shows how to create [uniform buffers](level1.md#uniform-buffers) and h
 Additionally, uniform buffer usage for the camera system is demonstrated.
 
 ```bash
-./bin/run test --demo renderer.tests.renderer_demo 5
+cd bin && ./run test --demo renderer.tests.renderer_demo 5
 ```
 
 **Controls:**
@@ -132,7 +132,7 @@ Additionally, uniform buffer usage for the camera system is demonstrated.
 This demo shows how to use [frustum culling](level2.md#frustum-culling) in the renderer.
 
 ```bash
-./bin/run test --demo renderer.tests.renderer_demo 6
+cd bin && ./run test --demo renderer.tests.renderer_demo 6
 ```
 
 **Controls:**
@@ -144,12 +144,12 @@ This demo shows how to use [frustum culling](level2.md#frustum-culling) in the r
 ![Demo 6](/doc/code/renderer/images/demo_6.png)
 
 
-### Demo 6
+### Demo 7
 
 This demo shows how to use [shader templating](level1.md#shader-templates) in the renderer.
 
 ```bash
-./bin/run test --demo renderer.tests.renderer_demo 6
+cd bin && ./run test --demo renderer.tests.renderer_demo 7
 ```
 
 **Result:**
@@ -164,7 +164,7 @@ This demo shows how to use [shader templating](level1.md#shader-templates) in th
 This stresstest tests the performance when rendering an increasingly larger number of objects.
 
 ```bash
-./bin/run test --demo renderer.tests.stresstest 0
+cd bin && ./run test --demo renderer.tests.renderer_stresstest 0
 ```
 
 **Result:**
@@ -177,7 +177,7 @@ This stresstest tests the performance when [frustum culling](level2.md#frustum-c
 number of objects is rendered on the screen.
 
 ```bash
-./bin/run test --demo renderer.tests.stresstest 1
+cd bin && ./run test --demo renderer.tests.renderer_stresstest 1
 ```
 
 **Result:**