Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Wolferos committed Dec 1, 2022
2 parents 4e21ca8 + 0d37965 commit 0265a7f
Show file tree
Hide file tree
Showing 23 changed files with 2,264 additions and 77 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

**Project Lead:** Wolferos

**Current Version:** 0.20 "Spazio Vitale"
**Current Version:** 0.20.1 "Spazio Vitale"

**Compatible with:** Hearts of Iron IV 1.12.5 (with or without Paid DLC)
**Compatible with:** Hearts of Iron IV 1.12.6 (with or without Paid DLC)

**Supported Languages:**
- English
Expand Down Expand Up @@ -119,6 +119,7 @@ THE FOLLOWING PEOPLE ALSO CONTRIBUTED ON THE PROJECT
- PrometheusNavagadro
- NamekSurvivor
- Maloghigno
- shmuft
----------
[Flickering Flags Fix](http://steamcommunity.com/sharedfiles/filedetails/?id=850835220) made by Chairman Meow
[Austro-Hungarians Voices](http://steamcommunity.com/sharedfiles/filedetails/?id=946923873) made by Geodomus
3 changes: 0 additions & 3 deletions mod/thegreatwar/gfx/entities/units_artillery.asset
Original file line number Diff line number Diff line change
Expand Up @@ -267,21 +267,18 @@ entity = {
state = { name = "death" animation = "idle" animation_blend_time = 0.3 animation_speed = 1.0 }
state = { name = "support_attack" animation = "attack" animation_blend_time = 0.0 animation_speed = 1.0
event = { time = 0 node="muzzle" particle = "light_tank_attack_barrel_particle" keep_particle = yes sound = { soundeffect = artillery_unit_fire_01 } }
event = { trigger_once = yes sound = { soundeffect = "distance_artillery_unit_fire_01" } }
event = { time = 0.3 node="smoke" particle = "artillery_cartridge_particle" keep_particle = yes }
event = { time = 0.0 node="left_wheel" particle = "artillery_tyre_tracks_particle" keep_particle = yes }
event = { time = 0.0 node="right_wheel" particle = "artillery_tyre_tracks_particle" keep_particle = yes }
}
state = { name = "attack" animation = "attack" animation_blend_time = 0.0 animation_speed = 1.0
event = { time = 0 node="muzzle" particle = "light_tank_attack_barrel_particle" keep_particle = yes sound = { soundeffect = artillery_unit_fire_01 } }
event = { trigger_once = yes sound = { soundeffect = "distance_artillery_unit_fire_01" } }
event = { time = 0.3 node="smoke" particle = "artillery_cartridge_particle" keep_particle = yes }
event = { time = 0.0 node="left_wheel" particle = "artillery_tyre_tracks_particle" keep_particle = yes }
event = { time = 0.0 node="right_wheel" particle = "artillery_tyre_tracks_particle" keep_particle = yes }
}
state = { name = "defend" animation = "attack" animation_blend_time = 0.0 animation_speed = 1.0
event = { time = 0 node="muzzle" particle = "light_tank_attack_barrel_particle" keep_particle = yes sound = { soundeffect = artillery_unit_fire_01 } }
event = { trigger_once = yes sound = { soundeffect = "distance_artillery_unit_fire_01" } }
event = { time = 0.3 node="smoke" particle = "artillery_cartridge_particle" keep_particle = yes }
event = { time = 0.0 node="left_wheel" particle = "artillery_tyre_tracks_particle" keep_particle = yes }
event = { time = 0.0 node="right_wheel" particle = "artillery_tyre_tracks_particle" keep_particle = yes }
Expand Down
4 changes: 0 additions & 4 deletions mod/thegreatwar/history/states/683-Northeastern Canada.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ state = {

761 763 2947 3736 4753 5239 6728 7185 7782 8962 9615 10585 10605 10721 13182 13188 13190

2703
5918
9125
11827
13163
13186
13191
Expand Down
6 changes: 0 additions & 6 deletions mod/thegreatwar/history/units/GER_1910.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,14 @@ division_template = {
infantry = { x = 0 y = 0 }
infantry = { x = 0 y = 1 }
infantry = { x = 0 y = 2 }
artillery = { x = 0 y = 2 }

infantry = { x = 1 y = 0 }
infantry = { x = 1 y = 1 }
infantry = { x = 1 y = 2 }
artillery = { x = 1 y = 2 }

infantry = { x = 2 y = 0 }
infantry = { x = 2 y = 1 }
infantry = { x = 2 y = 2 }
artillery = { x = 2 y = 2 }
}
support = {
recon = { x = 0 y = 0 }
Expand All @@ -32,17 +29,14 @@ division_template = {
infantry = { x = 0 y = 0 }
infantry = { x = 0 y = 1 }
infantry = { x = 0 y = 2 }
artillery = { x = 0 y = 2 }

infantry = { x = 1 y = 0 }
infantry = { x = 1 y = 1 }
infantry = { x = 1 y = 2 }
artillery = { x = 0 y = 2 }

infantry = { x = 2 y = 0 }
infantry = { x = 2 y = 1 }
infantry = { x = 2 y = 2 }
artillery = { x = 0 y = 2 }
}
support = {
recon = { x = 0 y = 0 }
Expand Down
6 changes: 0 additions & 6 deletions mod/thegreatwar/history/units/GER_1914.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,14 @@ division_template = {
infantry = { x = 0 y = 0 }
infantry = { x = 0 y = 1 }
infantry = { x = 0 y = 2 }
artillery = { x = 0 y = 2 }

infantry = { x = 1 y = 0 }
infantry = { x = 1 y = 1 }
infantry = { x = 1 y = 2 }
artillery = { x = 1 y = 2 }

infantry = { x = 2 y = 0 }
infantry = { x = 2 y = 1 }
infantry = { x = 2 y = 2 }
artillery = { x = 2 y = 2 }
}
support = {
recon = { x = 0 y = 0 }
Expand All @@ -32,17 +29,14 @@ division_template = {
infantry = { x = 0 y = 0 }
infantry = { x = 0 y = 1 }
infantry = { x = 0 y = 2 }
artillery = { x = 0 y = 2 }

infantry = { x = 1 y = 0 }
infantry = { x = 1 y = 1 }
infantry = { x = 1 y = 2 }
artillery = { x = 0 y = 2 }

infantry = { x = 2 y = 0 }
infantry = { x = 2 y = 1 }
infantry = { x = 2 y = 2 }
artillery = { x = 0 y = 2 }
}
support = {
recon = { x = 0 y = 0 }
Expand Down
Loading

0 comments on commit 0265a7f

Please sign in to comment.