Skip to content

Commit 0265a7f

Browse files
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents 4e21ca8 + 0d37965 commit 0265a7f

23 files changed

+2264
-77
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
**Project Lead:** Wolferos
99

10-
**Current Version:** 0.20 "Spazio Vitale"
10+
**Current Version:** 0.20.1 "Spazio Vitale"
1111

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

1414
**Supported Languages:**
1515
- English
@@ -119,6 +119,7 @@ THE FOLLOWING PEOPLE ALSO CONTRIBUTED ON THE PROJECT
119119
- PrometheusNavagadro
120120
- NamekSurvivor
121121
- Maloghigno
122+
- shmuft
122123
----------
123124
[Flickering Flags Fix](http://steamcommunity.com/sharedfiles/filedetails/?id=850835220) made by Chairman Meow
124125
[Austro-Hungarians Voices](http://steamcommunity.com/sharedfiles/filedetails/?id=946923873) made by Geodomus

mod/thegreatwar/gfx/entities/units_artillery.asset

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,21 +267,18 @@ entity = {
267267
state = { name = "death" animation = "idle" animation_blend_time = 0.3 animation_speed = 1.0 }
268268
state = { name = "support_attack" animation = "attack" animation_blend_time = 0.0 animation_speed = 1.0
269269
event = { time = 0 node="muzzle" particle = "light_tank_attack_barrel_particle" keep_particle = yes sound = { soundeffect = artillery_unit_fire_01 } }
270-
event = { trigger_once = yes sound = { soundeffect = "distance_artillery_unit_fire_01" } }
271270
event = { time = 0.3 node="smoke" particle = "artillery_cartridge_particle" keep_particle = yes }
272271
event = { time = 0.0 node="left_wheel" particle = "artillery_tyre_tracks_particle" keep_particle = yes }
273272
event = { time = 0.0 node="right_wheel" particle = "artillery_tyre_tracks_particle" keep_particle = yes }
274273
}
275274
state = { name = "attack" animation = "attack" animation_blend_time = 0.0 animation_speed = 1.0
276275
event = { time = 0 node="muzzle" particle = "light_tank_attack_barrel_particle" keep_particle = yes sound = { soundeffect = artillery_unit_fire_01 } }
277-
event = { trigger_once = yes sound = { soundeffect = "distance_artillery_unit_fire_01" } }
278276
event = { time = 0.3 node="smoke" particle = "artillery_cartridge_particle" keep_particle = yes }
279277
event = { time = 0.0 node="left_wheel" particle = "artillery_tyre_tracks_particle" keep_particle = yes }
280278
event = { time = 0.0 node="right_wheel" particle = "artillery_tyre_tracks_particle" keep_particle = yes }
281279
}
282280
state = { name = "defend" animation = "attack" animation_blend_time = 0.0 animation_speed = 1.0
283281
event = { time = 0 node="muzzle" particle = "light_tank_attack_barrel_particle" keep_particle = yes sound = { soundeffect = artillery_unit_fire_01 } }
284-
event = { trigger_once = yes sound = { soundeffect = "distance_artillery_unit_fire_01" } }
285282
event = { time = 0.3 node="smoke" particle = "artillery_cartridge_particle" keep_particle = yes }
286283
event = { time = 0.0 node="left_wheel" particle = "artillery_tyre_tracks_particle" keep_particle = yes }
287284
event = { time = 0.0 node="right_wheel" particle = "artillery_tyre_tracks_particle" keep_particle = yes }

mod/thegreatwar/history/states/683-Northeastern Canada.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ state = {
99

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

12-
2703
13-
5918
14-
9125
15-
11827
1612
13163
1713
13186
1814
13191

mod/thegreatwar/history/units/GER_1910.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,14 @@ division_template = {
77
infantry = { x = 0 y = 0 }
88
infantry = { x = 0 y = 1 }
99
infantry = { x = 0 y = 2 }
10-
artillery = { x = 0 y = 2 }
1110

1211
infantry = { x = 1 y = 0 }
1312
infantry = { x = 1 y = 1 }
1413
infantry = { x = 1 y = 2 }
15-
artillery = { x = 1 y = 2 }
1614

1715
infantry = { x = 2 y = 0 }
1816
infantry = { x = 2 y = 1 }
1917
infantry = { x = 2 y = 2 }
20-
artillery = { x = 2 y = 2 }
2118
}
2219
support = {
2320
recon = { x = 0 y = 0 }
@@ -32,17 +29,14 @@ division_template = {
3229
infantry = { x = 0 y = 0 }
3330
infantry = { x = 0 y = 1 }
3431
infantry = { x = 0 y = 2 }
35-
artillery = { x = 0 y = 2 }
3632

3733
infantry = { x = 1 y = 0 }
3834
infantry = { x = 1 y = 1 }
3935
infantry = { x = 1 y = 2 }
40-
artillery = { x = 0 y = 2 }
4136

4237
infantry = { x = 2 y = 0 }
4338
infantry = { x = 2 y = 1 }
4439
infantry = { x = 2 y = 2 }
45-
artillery = { x = 0 y = 2 }
4640
}
4741
support = {
4842
recon = { x = 0 y = 0 }

mod/thegreatwar/history/units/GER_1914.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,14 @@ division_template = {
77
infantry = { x = 0 y = 0 }
88
infantry = { x = 0 y = 1 }
99
infantry = { x = 0 y = 2 }
10-
artillery = { x = 0 y = 2 }
1110

1211
infantry = { x = 1 y = 0 }
1312
infantry = { x = 1 y = 1 }
1413
infantry = { x = 1 y = 2 }
15-
artillery = { x = 1 y = 2 }
1614

1715
infantry = { x = 2 y = 0 }
1816
infantry = { x = 2 y = 1 }
1917
infantry = { x = 2 y = 2 }
20-
artillery = { x = 2 y = 2 }
2118
}
2219
support = {
2320
recon = { x = 0 y = 0 }
@@ -32,17 +29,14 @@ division_template = {
3229
infantry = { x = 0 y = 0 }
3330
infantry = { x = 0 y = 1 }
3431
infantry = { x = 0 y = 2 }
35-
artillery = { x = 0 y = 2 }
3632

3733
infantry = { x = 1 y = 0 }
3834
infantry = { x = 1 y = 1 }
3935
infantry = { x = 1 y = 2 }
40-
artillery = { x = 0 y = 2 }
4136

4237
infantry = { x = 2 y = 0 }
4338
infantry = { x = 2 y = 1 }
4439
infantry = { x = 2 y = 2 }
45-
artillery = { x = 0 y = 2 }
4640
}
4741
support = {
4842
recon = { x = 0 y = 0 }

0 commit comments

Comments
 (0)