Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity
22,747 Commits 9 Branches 28 Tags 13 GiB
0e36e4a33c
Commit Graph

15465 Commits

Author SHA1 Message Date
wowgetoffyourcellphone
0e36e4a33c Improve some prop textures (mainly shields). Darken up the shuttle block diffuse texture a bit. 
This was SVN commit r26428.
 2022-02-20 02:30:43 +00:00
wowgetoffyourcellphone
ed244700d4 Modified the "Han Bandana" to be a generic headband for any civ. This replaces the old "headband_color" prop with something much much better. 
This also creates a player_trans_norm.xml material, which was
conspicuously missing. Changed the material for the headband from a
parallax material to this new normal map material.

This was SVN commit r26427.
 2022-02-20 02:28:08 +00:00
wowgetoffyourcellphone
63d90afeec Han female's rice hat stays on when chopping wood. 
This was SVN commit r26426.
 2022-02-20 00:30:27 +00:00
wowgetoffyourcellphone
55ca22bb91 Hotfix to remove the generic palisade from the Han female's builder queue. Makes her queue match that of the Han males'. 
This was SVN commit r26425.
 2022-02-19 20:54:14 +00:00
Stan
cb336fb28b Fix some maps issues. Add the new maps to the new map campaign. 
This was SVN commit r26423.
 2022-02-19 18:39:11 +00:00
bb
0f07c368ed Allow more general contexts in json translatable strings 
While at it fix the messages.json from ea72437739 (missing excludeMask
and make the keywords objects not arrays)
Comments By: Freagarach
Differential Revision: D4483
This was SVN commit r26422.
 2022-02-19 17:21:23 +00:00
Stan
e2bf494cf9 Add Han Chinese Maps 
Patch by: artoo @wowgetoffyourcellphone
Refs #6412

This was SVN commit r26421.
 2022-02-19 16:59:31 +00:00
Stan
4de188f55a Add Han Chinese Templates and Civ.json. 
Patch by: artoo @wowgetoffyourcellphone, @Alexandermb, @Nescio, @Stan,
@wltonlopes, @Kate, @lastrodamo, @Kimball, @niektb, @Lionkanzen,
@Brightgalrs, @wackyserious, @Gen.Kenobi, @s0600204, @leper, sciondev,
@Mr.lie, J.R.I.B.-Wein, David Flores, @sanderd17, @asterix @thamlett
Fixes #6412

This was SVN commit r26420.
 2022-02-19 16:58:44 +00:00
Stan
ef5089be6e Add Han Chinese Techs, Auras 
Patch by: artoo @wowgetoffyourcellphone, @Alexandermb, @Nescio, @Stan,
@wltonlopes, @Kate, @lastrodamo, @Kimball, @niektb, @Lionkanzen,
@Brightgalrs, @wackyserious, @Gen.Kenobi, @s0600204, @leper, sciondev,
@Mr.lie, J.R.I.B.-Wein, David Flores, @sanderd17, @asterix @thamlett
Refs #6412

This was SVN commit r26419.
 2022-02-19 16:56:31 +00:00
Stan
5a0be24262 Add Han Chinese Actors 
Patch by: artoo @wowgetoffyourcellphone, @Alexandermb, @Nescio, @Stan,
@wltonlopes, @Kate, @lastrodamo, @Kimball, @niektb, @Lionkanzen,
@Brightgalrs, @wackyserious, @Gen.Kenobi, @s0600204, @leper, sciondev,
@Mr.lie, J.R.I.B.-Wein, David Flores, rastko96
Refs #6412

This was SVN commit r26418.
 2022-02-19 16:48:23 +00:00
Stan
051df5ecfb Add Han Chinese variants 
Patch by: @artoo, @wowgetoffyourcellphone, @Stan, @AlexanderMB,
@s0600204, @wltonlopes
Refs #6412

This was SVN commit r26417.
 2022-02-19 16:45:45 +00:00
Stan
a2c0797f9d Add Han Chinese particles 
Patch by: @artoo, @wowgetoffyourcellphone, @Stan, @Kimball, @EmjeR
Refs #6412

This was SVN commit r26416.
 2022-02-19 16:43:31 +00:00
Stan
6c1e6b1673 Add Han Chinese models, animations, and skeletons. 
Patch by: artoo, @wowgetoffyourcellphone, @Alexandermb, @Nescio, @Stan,
@wltonlopes, @Kate, @lastrodamo, @Kimball, @niektb, @Lionkanzen,
@Brightgalrs, @wackyserious, @Gen.Kenobi, @s0600204, @leper, sciondev,
@Mr.lie, J.R.I.B.-Wein
References by: Wolflance, Ayakashi
Refs #6412

This was SVN commit r26415.
 2022-02-19 16:41:45 +00:00
Stan
1a44e2790a Add Han Chinese textures. 
Patch by: artoo @wowgetoffyourcellphone, @Alexandermb, @Nescio, @Stan,
@wltonlopes, @Kate, @lastrodamo, @Kimball, @niektb, @Lionkanzen,
@Brightgalrs, @wackyserious, @Gen.Kenobi, @s0600204, @leper, sciondev,
J.R.I.B.-Wein
Refs #6412

This was SVN commit r26414.
 2022-02-19 16:35:18 +00:00
Stan
9902faf5cb Add credits missed in 6496aea364. 
This was SVN commit r26413.
 2022-02-19 16:21:26 +00:00
Stan
d77f0b28a0 Add two new asian themed tracks. 
Patch by: Omri Lahav
This was SVN commit r26412.
 2022-02-19 16:19:31 +00:00
vladislavbelov
b949f19875 Moves GL debug information toggle to run-time to make it easier to test after release. 
This was SVN commit r26407.
 2022-02-18 22:38:45 +00:00
Freagarach
6a2a297c0e Clean LoadPlayerSettings in Player-helper. 
- Removed obsolete C++-side `addPlayer`, introduced in 4fed9b8242, moved
out of Atlas in 1c0536bf08, unused after 9ee44bd9b8.
- Get the player settings from a local function (avoids passing
arguments).
- Removed setting the standard diplomacy (done in cmpPlayerManager since
132020f88e).
- Create entity when adding a player instead of creating it and
instructing the playermanager to add it.
- Changed/Removed some comments.

Differential revision: https://code.wildfiregames.com/D4482
Comments by: @Stan
This was SVN commit r26404.
 2022-02-18 08:10:13 +00:00
Stan
0c65e88cd5 New shuttle blocks by wowgetoffyourcellphone 
This was SVN commit r26402.
 2022-02-17 22:20:21 +00:00
Stan
05947ec96c Delete now unused helmet variants. 
This was SVN commit r26401.
 2022-02-17 22:18:12 +00:00
Stan
7492e71fc3 Fix some unused extra material textures in units reported in validator.py. 
This was SVN commit r26400.
 2022-02-17 21:55:31 +00:00
Stan
8d786d0bcb Fix some unused extra materials in trees and geology reported in validator.py. 
This was SVN commit r26399.
 2022-02-17 18:41:55 +00:00
Stan
fbd536b855 Fix some unused extra materials in trees reported in validator.py. 
This was SVN commit r26398.
 2022-02-17 18:35:01 +00:00
Stan
e30def27fd New Macedonian wonder. Based on a model by @m7600. 
Thread:
https://wildfiregames.com/forum/topic/20820-macedonian-wonder/page/7/

This was SVN commit r26397.
 2022-02-17 18:21:08 +00:00
wowgetoffyourcellphone
cea9f9be8d Art Cleanup and Fixes found by Jenkins. 
This was SVN commit r26396.
 2022-02-17 07:27:58 +00:00
wowgetoffyourcellphone
edb10156d5 - Kushite skeletal textures moved to their own subfolder. 
- Actor texture refs updated to reflect the move. Actor aesthetics
improved.

This was SVN commit r26395.
 2022-02-16 09:23:34 +00:00
bb
071fddd598 Remove useless persistMatchSettings and handle some which weren't handled 
Fixing issues in dc18d94030

Everyone make sure to delete savegames, saved campaigns an most
importantly your matchsettings.json's (regular alpha players won't
notice since there is a version check, but if you already have your
stuff at A26/svn, you will have some issues)

Reported By: elexis
Comments By: wraitii, Freagarach
Differential Revision: D4240
This was SVN commit r26393.
 2022-02-15 21:13:10 +00:00
bb
3484a3d483 Move parabolic range computation to rangemanager 
Co-proposed By: Freagarach
Reviewed By: Freagarach
Test written By: Stan
Comments By: vladislavbelov, stan, wraitii, Silier
Depricates: D4356

Differential Revision: D3249
This was SVN commit r26392.
 2022-02-15 20:31:55 +00:00
wackyserious
6c1c4e0cde Update celt tunic details 
This was SVN commit r26391.
 2022-02-15 11:03:23 +00:00
wowgetoffyourcellphone
8df9d31286 Improved Iberian structure textures. May improve it further at some point. 
This was SVN commit r26390.
 2022-02-15 10:28:14 +00:00
wowgetoffyourcellphone
9ae4db9425 Add ambient occlusion to the Mauryan Palace structure. 
This was SVN commit r26389.
 2022-02-15 09:59:56 +00:00
wowgetoffyourcellphone
069217b9e7 Roman sandbox map changed to be more of a debug demo. 
This was SVN commit r26388.
 2022-02-15 09:48:55 +00:00
wowgetoffyourcellphone
d2ebe4464f - PERSIAN skeletal textures moved to their own subfolder. 
- Actor texture refs updated to reflect the move. Actor aesthetics
improved.
- Persian Sandbox scenario changed up.

This was SVN commit r26387.
 2022-02-15 09:47:56 +00:00
wowgetoffyourcellphone
b160a62902 Fix a bunch of texture refs found by Jenkins. 
This was SVN commit r26386.
 2022-02-15 09:44:24 +00:00
wowgetoffyourcellphone
c2310b56b4 - MAURYAN skeletal textures moved to their own subfolder. 
- Actor texture refs updated to reflect the move.
- A couple of Atlas-only hero units.
- Maurya Sandbox scenario changed up.

This was SVN commit r26385.
 2022-02-15 09:40:04 +00:00
wowgetoffyourcellphone
54e9f15bc7 - Replace some if the "old" helmet meshes and textures. These textures are used by some of the newer helmet prop actors. Perhaps we can find a better texture solution in the future for these props. 
- Fix a couple helmet actors while I'm at it.

This was SVN commit r26384.
 2022-02-15 07:38:04 +00:00
wowgetoffyourcellphone
259eced530 - Add horse actors for each color type so that they are more easily visualized for designers. 
- Get rid of the dumb "pers_cav_knot" actor. Maybe we can make some
better Persian cavalry decor in the future.

This was SVN commit r26383.
 2022-02-15 07:34:31 +00:00
Freagarach
3c73bb1b51 Display defeated/won before victory. 
When the victory conditions dictate that someone loses when e.g. losing
their CC, the message that the other player(s) had won was sent before
the former player was actually defeated.
When the victory conditions dictate that someone wins when e.g.
capturing all relics, the message that they have won was sent after the
message that the rest has lost.

This changes those.

Differential revision: https://code.wildfiregames.com/D4478
Comments by: @bb, @Silier
This was SVN commit r26382.
 2022-02-15 07:20:21 +00:00
Freagarach
73f732dc30 Replace chicken in the random maps folder with startingAnimal. 
Which is more generic. It means we don't have `chicken = oPeacock` and
the like anymore.
It adds a default scaling function such that people replacing the
animals are puzzled by the different number of starting animals./To keep
the amount of food roughly equal to the amount standard provide by
chicken.

Patch by: @marder
Differential revision: https://code.wildfiregames.com/D4472
Comments by: @smiley, @Stan
This was SVN commit r26381.
 2022-02-15 07:04:49 +00:00
wowgetoffyourcellphone
930cc9b850 Scythian textures by Wackyserious. 
Persians and Athenians will use these.

This was SVN commit r26377.
 2022-02-14 08:17:02 +00:00
wowgetoffyourcellphone
f8333e7deb Prop and Actor improvements. 
- New destruction decal textures.
- Material fixes for actors.
- Bridge decals.
- Shields.

This was SVN commit r26375.
 2022-02-14 08:13:42 +00:00
wowgetoffyourcellphone
df0797e4a1 Continue the removal of the old helmets. 
Move remaining helmet actors to the parent helmet folder.

This was SVN commit r26374.
 2022-02-14 08:04:07 +00:00
wowgetoffyourcellphone
42b64f8ea2 - Delete 196 unused Helmet textures. Meshes and Actors to follow. 
- Reduce resolution (and disk space) of some over-sized remaining helmet
textures.

This was SVN commit r26373.
 2022-02-14 07:28:11 +00:00
wowgetoffyourcellphone
939f800a26 - ROMAN skeletal textures moved to their own subfolder. 
- Actor texture refs updated to reflect the move.
- A new Roman champion unit added for fun, "Praetorian."
- An "infantry" version of Scipio Africanus to match the other 2 Roman
heroes.
- New Roman helmet models and actors.
- A bunch of unused textures deleted.

This was SVN commit r26371.
 2022-02-14 04:01:56 +00:00
vladislavbelov
492a109b68 Removes redundant ogl_tex quality option after 4de89c3db1. 
This was SVN commit r26367.
 2022-02-13 21:53:02 +00:00
vladislavbelov
4de89c3db1 Moves texture management to CDeviceCommandContext, adds quality options. 
Comments By: nwtour, Stan
Tested By: nwtour, Stan
Differential Revision: https://code.wildfiregames.com/D4488
This was SVN commit r26365.
 2022-02-13 19:30:28 +00:00
wowgetoffyourcellphone
451dc24a7e Carthaginian texture changes, deletions, additions. 
This was SVN commit r26364.
 2022-02-13 15:23:25 +00:00
wowgetoffyourcellphone
f6a8c8cbbc This was SVN commit r26363. 2022-02-13 15:21:23 +00:00
wowgetoffyourcellphone
9536069201 Spartan unit actors improved. 
This was SVN commit r26362.
 2022-02-13 15:20:26 +00:00
wowgetoffyourcellphone
1c67883401 Unused and low res Celtic textures deleted. 
About a dozen new Celtic tunic textures added to replace them.

This was SVN commit r26361.
 2022-02-13 15:18:37 +00:00