1
0
forked from mirrors/0ad
Commit Graph

20439 Commits

Author SHA1 Message Date
Stan b6cb89bf8c Fix incorrect color tone for gather-meat icon
This was SVN commit r23535.
2020-03-17 18:47:55 +00:00
Stan d8511dd7a0 Delete unused GUI textures.
This was SVN commit r23534.
2020-03-17 18:11:01 +00:00
Stan c2afb5cdb6 Fix warnings with VS2015 introduced in 800bf0da24
Reviewed by: @Angen
Differential Revision: https://code.wildfiregames.com/D2394
This was SVN commit r23531.
2020-03-15 16:13:51 +00:00
Stan a251e6cf8c - Use @Lordgood's new obelisks for the Ptol civic center, and the military_colony
- Rename and move the current ptolemy military_colony settlement obelisk
- Update the Egypt (3v3) map

This was SVN commit r23530.
2020-03-15 16:01:44 +00:00
Angen 8bfb449375 Support garrisoned enitites defined in map files.
This is adding support to handle garrisoned entities defined in map
files by game engine and atlas allowing future extension for atlas ui
and solving recreation of entites on init in D1958. Also solving
deepfreeze described in D2562.

Differential Revision; https://code.wildfiregames.com/D2597
Ticket: #3008
Patch by: Freagarach
Comments by: elexis
This was SVN commit r23529.
2020-03-15 13:54:50 +00:00
Stan 0a7649318b New Poplar trees.
Patch by: @BigTiger
This was SVN commit r23527.
2020-03-08 22:12:13 +00:00
Stan c5e163f8bb Improve Gaul and Brit specific names.
Thread:
https://wildfiregames.com/forum/index.php?/topic/25284-specific-name-review-units/page/2/&tab=comments#comment-392452

Patch by: @Genava55, @Nescio
Differential Revision: https://code.wildfiregames.com/D2641
This was SVN commit r23526.
2020-03-08 10:33:31 +00:00
Stan b56c750290 Replaces the 3 (three, a digit) with a ȝ (yogh, a letter) and the ‘ and ’ (quotation marks) with a ʿ (ayin, a letter) in the Kushite specific names, because it looks better, and for consistency.
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2626
This was SVN commit r23525.
2020-03-08 10:30:16 +00:00
Stan 936d1adaef Rename wall_med to wall_medium for consistency.
Fix some of the variant names.
Fix useless AO suffix as already contained in folders see:
wiki:ArtFileNamingConventions
Add some mime types and some EOL properties.
Based on a patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2554
This was SVN commit r23524.
2020-03-08 10:19:45 +00:00
Stan 86f15892b6 Remove elephant prop from pers hall actor for consistency and better immersion.
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2635
This was SVN commit r23523.
2020-03-07 14:53:51 +00:00
Stan 7af9934885 Delete unused duplicate elephant icon
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2588
This was SVN commit r23522.
2020-03-07 14:46:10 +00:00
Angen 6fb01b2d5d Allow to cancel trade route setup
Allow to cancel trade route setup when only origin market is set.
Reported in D2285.

Differential Revision: https://code.wildfiregames.com/D2643
Reviewed by: Freagarach
Reported by: Freagarach
Comments by: elexis
This was SVN commit r23521.
2020-03-07 11:35:25 +00:00
Stan 8be20790b5 Check for missing selection textures and missing range overlay textures
Refs: D2618

This was SVN commit r23520.
2020-03-07 11:06:51 +00:00
Angen be38792477 Support friendly fire for projectile attacks.
Allow templates to define if friendlyfire is enabled for projectiles.

Differential Revision: https://code.wildfiregames.com/D1973
Patch by: Freagarach
Reviewed by: wraitii, Angen
This was SVN commit r23519.
2020-03-07 10:39:05 +00:00
Angen fed4f954b6 Add cursor icon for canceling trade route setup
Created by @Stan
Needed for D2643

This was SVN commit r23517.
2020-03-01 08:48:15 +00:00
elexis ff55548333 Fix map always being set to circular in 34138a7764 / D2483.
Reported By: gameboy, Angen
Tested By: Angen
Forum: https://wildfiregames.com/forum/index.php?/topic/27524-warning/

This was SVN commit r23515.
2020-02-27 11:05:32 +00:00
Stan 5fb88172a2 Allow buildings to autobuild themselves.
Reviewed by: @Angen
Comments by: @Freagarach
Differential Revision: https://code.wildfiregames.com/D2492
This was SVN commit r23514.
2020-02-25 21:29:07 +00:00
Stan df0561988c Fix a texture bug noticed by @Angen.
Thread:
https://wildfiregames.com/forum/index.php?/topic/27665-artic-wolf-texture-mapping/&tab=comments#comment-392624

This was SVN commit r23513.
2020-02-24 20:01:30 +00:00
Angen 0b8aa7eb5a Fix GetTerritoryPercentage when changing number of players
Check for player being out of bounds after m_TerritoryCellCounts may be
recomputed.

Differential Revision: https://code.wildfiregames.com/D2046
Reviewed by: @Stan
This was SVN commit r23510.
2020-02-23 18:24:31 +00:00
Imarok b4da3388ec Should have waited for the bears
refs D1752
refs 0916ffbbb1

This was SVN commit r23507.
2020-02-17 19:23:42 +00:00
Imarok 0c917a2a52 Fix button caption and enable in modmod
Differential Revision: https://code.wildfiregames.com/D1623
This was SVN commit r23506.
2020-02-17 18:22:52 +00:00
Imarok 0916ffbbb1 Add GUI events for middle mouse click
Summary: Add gui events for middle mouse click

Differential Revision: https://code.wildfiregames.com/D1752
This was SVN commit r23505.
2020-02-17 18:16:58 +00:00
bb f12feba62d Correct military colony footprint/obstruction
Patch By: Nescio
Differential Revision: D2639
This was SVN commit r23504.
2020-02-17 18:00:32 +00:00
Stan 0c7e8e75cb Remove ground texture from brit and cart gate actors as it doesn't fit all the terrains and none of the gates have them.
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2634
This was SVN commit r23502.
2020-02-15 10:35:05 +00:00
Angen 72beb1326f Fix missing cmpTechnologyManager check in Commands.js
Check for cmpTechnologyManager existence to avoid calling function on
null when upgrading entity requires some technology to be researched.

Differential Revision: https://code.wildfiregames.com/D2632
Fixes: #5668
Patch by: @Ampaex
This was SVN commit r23500.
2020-02-14 08:09:16 +00:00
Stan bfab378b85 Fix missing transparency introduced in f9b0d5e365.
Noticed by: @elexis
This was SVN commit r23498.
2020-02-13 21:15:05 +00:00
Angen 623d4088e8 UnitAI cleanup [GATHER]
delete not needed variable
var -> let
rename nearby variables to reflect what they are referencing

Differential Revision: https://code.wildfiregames.com/D1940
Comments by: Stan, Polakrity
This was SVN commit r23497.
2020-02-13 20:24:51 +00:00
Angen 0535eb9b92 Fix formationmember not leaving walking state if offset cannot be reached
Fail movement for formationmember when cannot find path to destination
and formationcontroller is not moving so formationmember will enter idle
state or follow next command relying on member stopping movement first.

Introduced in a1dc9cadd8.

Differentail Revision: https://code.wildfiregames.com/D2438

This was SVN commit r23496.
2020-02-13 19:44:03 +00:00
Angen a3a5b2fd08 Simplify conditions in SetAnimation
Introduced in d3f57744d9.
There are 2 mane cases when entity cannot play animation.
1st there are not bones
2nd animation is not valid

These conditions are merged into one.

Differential Revision: https://code.wildfiregames.com/D2416
Reviewed by: @Stan
This was SVN commit r23495.
2020-02-13 19:24:08 +00:00
Stan 8707763eb2 Fix placement of the ptolemaic short wall.
Noticed by: @Nescio
Refs: D2502

This was SVN commit r23494.
2020-02-12 22:32:54 +00:00
bb 909dae4ec1 Removing trailing 0's and leading +'s from operators in templates.
Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D2609
This was SVN commit r23493.
2020-02-11 20:07:18 +00:00
bb 053b3c424a Correct watermarks aspect ratio
Patch By: Nescio
Comments By: Stan
Differential Revision: https://code.wildfiregames.com/D2589
This was SVN commit r23492.
2020-02-11 08:28:01 +00:00
elexis 0dff6940f7 Implement a FixedVector2D::CompareLengthSquared function to provide a more performant alternative to CompareLength.
Avoids computing the square of the compared value every call.

Differential Revision: https://code.wildfiregames.com/D2058
Reviewed By: Vladislav
This was SVN commit r23489.
2020-02-09 21:00:43 +00:00
Alexandermb 49710ee5e8 Replace Wrong visual actor being used in mace_siege_oxybeles_packed.xml
This was SVN commit r23488.
2020-02-09 14:13:37 +00:00
Stan 8dd369ca04 Correct the contents of the kush_hero_harsiotef.xml template, which used to be simply a copy of kush_hero_nastasen.xml
Standardize the Kushite hero specific names, as
Insert Harsiotef in the Kushite sandbox map
Patch by: @Nescio
Discussed with:  @Sundiata
Thread:
https://wildfiregames.com/forum/index.php?/topic/21602-the-kingdom-of-kush-a-proper-introduction-illustrated/page/38/&tab=comments#comment-392146
Differential Revision: https://code.wildfiregames.com/D2624
This was SVN commit r23487.
2020-02-07 21:25:25 +00:00
vladislavbelov 113b1c49b9 Adds anti-aliasing option with FXAA algorithm.
Differential Revision: https://code.wildfiregames.com/D2537
This was SVN commit r23484.
2020-02-05 21:53:10 +00:00
Stan b76fd22c57 New icon for Nastasen.
Art by: @Sundiata
Thread:https://wildfiregames.com/forum/index.php?/topic/21602-the-kingdom-of-kush-a-proper-introduction-illustrated/page/37/&tab=comments#comment-392054

This was SVN commit r23482.
2020-02-05 17:14:21 +00:00
vladislavbelov 00989a6560 Uses fixed-function pipeline functions only in FFP mode.
Differential Revision: https://code.wildfiregames.com/D2619
This was SVN commit r23481.
2020-02-05 14:00:52 +00:00
vladislavbelov 36883f2832 Renames RenderTerrain to RenderTerrainFixed to follow its implementation.
RenderTerrainShader was added in d295dacb9b.

This was SVN commit r23479.
2020-02-04 23:16:30 +00:00
Angen b5e5a8b382 Fix eee to ee in Terms_and_Conditions
Introduced in 209bab0255

Differential Revision: https://code.wildfiregames.com/D2617
Patch by: @Nescio
This was SVN commit r23478.
2020-02-04 20:09:24 +00:00
elexis 912dda50d6 Option to allow having the same entity in multiple control groups.
Differential Revision: https://code.wildfiregames.com/D2176
Patch By: Freagarach
This was SVN commit r23476.
2020-02-02 17:17:16 +00:00
Angen 0f9dd324c2 Fix cape approaching variants related to idle animation and fix incorrect animation names
Introduced in a84a896672

This was SVN commit r23475.
2020-02-01 14:22:52 +00:00
Angen a6159e4ac6 Lower number of setdefaultanimation calls in gathering state
Move call to SetDefaultAnimationVariant to leave function upon leaving
GATHERING state instead for every one substate leave.

Differential Revision: https://code.wildfiregames.com/D2565
This was SVN commit r23474.
2020-02-01 13:46:23 +00:00
elexis 045c3c9d5f Gamesetup setting for map specific team placement, fixes #4110, refs #4838.
Differential Revision: https://code.wildfiregames.com/D2607
This was SVN commit r23473.
2020-01-31 21:25:47 +00:00
elexis c4f6f6cd8d Fix autocomplete of Landscape/Daytime in af15d5972d/D2564 as well.
This was SVN commit r23472.
2020-01-31 21:02:39 +00:00
Angen 39bfd15aca Fix checks for range existence following 6bc99c47e1
Function introduced in 6bc99c47e1, GetRange can return undefined when
required component does not exist. Fixing two oversights, when check is
needed.

Differential Revision: https://code.wildfiregames.com/D2608
Fixes: #5666

This was SVN commit r23471.
2020-01-31 20:00:06 +00:00
elexis 8def60082d Fix missing translate calls and typo in Gamesetup Landscape/Daytime implementation af15d5972d/D2564.
This was SVN commit r23470.
2020-01-31 18:49:00 +00:00
Angen 5d167d4bf9 Use correct player id when querying interfaces in guiinterface
Fix cases when passing gaia player in data parameter will result in
ignoring this passed value noticable mainly when using cheat "controll
all units".

Reported by: gameboy
(https://wildfiregames.com/forum/index.php?/topic/27538-%E3%80%90fixed%E3%80%91upgrade-error%EF%BC%81/)
Differential Revision: https://code.wildfiregames.com/D2606
Comments by: elexis
This was SVN commit r23468.
2020-01-30 21:36:01 +00:00
Angen 083a5947e6 Do not create range query with no enemies
Do not create range query with no enemies as that triggers warning in
range manager.
This situation occurs when player has no enemies so empty list is
returned.

Fixing CCmpRangeManager: No owners in query for entity 0 warning

refs 38b2e37a61

Differential Revision: https://code.wildfiregames.com/D2601
Fixes: #5666
Reviewed by: @Freagarach
This was SVN commit r23467.
2020-01-30 21:13:42 +00:00
Angen 074dff2c91 Rephrase formation disabled tooltip after 9c2e9d7893
I failed to keep tooltip constancy in 9c2e9d7893 done in e381fa393a as I
did not recheck tooltip changes when revisiting D1462 after longer time.

Differential Revision: https://code.wildfiregames.com/D2602
Reviewed by: @Nescio
This was SVN commit r23466.
2020-01-30 21:09:36 +00:00