1
0
forked from mirrors/0ad
Commit Graph

20481 Commits

Author SHA1 Message Date
Angen 3ad1e47e7e Fix typo in startingStrategy.js
This was SVN commit r23588.
2020-04-19 12:07:26 +00:00
Angen c47496cf18 Cleanup ResearchTechnology function
Remove unused variable since e16c4c4800 and call for ranged manager.
Transform comment to javadoc.
var -> let

Differential Revision: https://code.wildfiregames.com/D2631
Patch by: Freagarach
Reviewed by: Angen
This was SVN commit r23587.
2020-04-15 21:26:25 +00:00
Stan 676bc42647 Fix issues with capes reported by @wowgetoffyourcellphone and @hidan
This was SVN commit r23586.
2020-04-15 11:57:04 +00:00
Angen 3d5b766687 Syntax cleanup of GuiInterface and test.
Remove redundant comments.
var -> let
quote object properties
fix intendation
fix some spacing
use javadoc for function description
remove one line brackets

Differential Revision: https://code.wildfiregames.com/D2069
Patch by: Freagarach
Reviewed by: Angen
Comments by: elexis, Nescio, Stan
This was SVN commit r23584.
2020-04-13 07:47:55 +00:00
Angen ff74a26865 Fix handling events with undefined message in _petrabot Serialization [Petra]
Check for undefined messages when Serializing events.

Differential Revision: https://code.wildfiregames.com/D2695
Reported by: DangerousI (
https://wildfiregames.com/forum/index.php?/topic/24727-javascript-error-petrabot-typeerror/)
Reviewed by: Freagarach
Tested by: gameboy
Fixes: #5282

This was SVN commit r23583.
2020-04-12 13:26:11 +00:00
Angen 46a9160d12 Use formation controller as target when formation reaches another formation
When a formation that is given the order to attack another formation is
already in range the formation controller of the target is passed as the
target for its members.

Use same behaviour when formation walks into another formation`s range.

Differential Revision: https://code.wildfiregames.com/D2692
Patch by: Freagarach
Reviewed by: Angen
This was SVN commit r23582.
2020-04-12 10:37:41 +00:00
Angen 448592b3c5 Colorize username in chat when user changes ready status or leaves match
Remove regression after 34138a7764.
Make ready status message bold as any other system messages are bold.

Differential Revision: https://code.wildfiregames.com/D2663
Reviewed by: elexis
Comments by: nani, Freagarach
This was SVN commit r23581.
2020-04-12 10:19:20 +00:00
Angen 9a1052a93c [gameplay-a24] Structure selection groups
This patch sets selection groups for all shared structures in the
generic parent templates of structures.

Clicking behaviour:
single click: select the clicked structure
double click: select all structures of the same selection group within
view that are owned by this player (e.g. all owned barracks across
civilisations)
triple click: select all structures of exactly the same file within view
that are owned by this player (e. g. all owned barracks of the same
civilisation)

Differential Revision: https://code.wildfiregames.com/D2675
Patch by: Nescio
Reviewed by: ValihrAnt
This was SVN commit r23580.
2020-04-12 10:09:03 +00:00
Angen ded0598950 [gameplay-a24] give worker elephants an aura
Remove builder component from worker elephant as it was not able to
place any foundation.
Add aura, that speeds up builder rate for all workers by 25% inside 15
range.

Differential Revision: https://code.wildfiregames.com/D2511
Patch by: Nescio
Reviewed by: Feldfeld
Comments by: elexis, Stan
This was SVN commit r23579.
2020-04-12 09:58:48 +00:00
Stan e76742bb77 Improved icons by @wowgetoffyourcellphone.
Remove trailing zeroes.
Rename fauna_bear to fauna_bear_brown for consistency.
Delete a unused icon.

This was SVN commit r23578.
2020-04-11 23:34:37 +00:00
Stan 3d29f9ab66 Add missing foundation for the mausoleum.xml introduced in 2bf78288f4:
This was SVN commit r23577.
2020-04-11 23:03:10 +00:00
Stan f21bf3565e Fix incorrect animation for viridomarus
Discussed with: @Alexandermb

This was SVN commit r23576.
2020-04-11 16:32:48 +00:00
Stan 2bf78288f4 Add the mausoleum at Halicarnassus to the game as an eyecandy building.
Thread:
https://wildfiregames.com/forum/index.php?/topic/20820-macedonian-wonder/page/2/
Feedback by: @wowgetoffyourcellphone, @Nescio
This was SVN commit r23575.
2020-04-11 13:34:15 +00:00
Alexandermb 693a2dcd90 Adjust the UV mapping of the "elephant_african_forest.dae" Mesh
Due to recent Elephant update for having the blend file of the whole
elephants and have the proper workspace for animating riders it was
updated in a recent commit. However the african forest elephant mesh
wasn't properly adapting to the new UV mapping since it wasn't properly
alligned.

Thread:
https://wildfiregames.com/forum/index.php?/topic/27906-elephant-uv-mapping/&tab=comments#comment-393918

This was SVN commit r23574.
2020-04-10 15:39:49 +00:00
Stan ee033b6268 Rename the Carthaginian “mausoleum” to “cenotaph”.
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2694
This was SVN commit r23572.
2020-04-08 13:45:58 +00:00
Angen 8354d511dc Add formation CheckTarget-/MoveToTargetRange-functions.
Use `CheckFormationTargetAttackRange` instead `CheckTargetAttackRange`
for formations to not use that ugly workaround with passing `target,
target`.

Use `MoveFormationToTargetAttackRange` to achieve better looking
behaviour when moving formation to target range.

Differential Revision: https://code.wildfiregames.com/D2015
Patch by: Freagarach
Reviewed by: Angen
This was SVN commit r23571.
2020-04-07 17:35:25 +00:00
Angen 3bcc5ab0ab Selection groups for support units
Merge selection group for women.
Merge selection group for healers.
Add selection group for merchant ship and fishing ship.
Add selection group for trader and slave as well.

Differential Revision: https://code.wildfiregames.com/D2677
Patch by: Nescio
Reviewed by: Freagarach
This was SVN commit r23570.
2020-04-07 17:28:10 +00:00
vladislavbelov accf7ade37 Add thread names on Linux (implements debug_SetThreadName), also add the thread name of the UPnP thread.
Patch By: linkmauve
Differential Revision: https://code.wildfiregames.com/D2479
This was SVN commit r23568.
2020-04-06 20:20:27 +00:00
Angen 36ea0b14cd React to target death properly when chasing
Differential Revision: https://code.wildfiregames.com/D2517
Reviewed by: Freagarach
Comments by: elexis, Stan
Fixes: #5610 #5656

Introduce likelyFailure check in the movementupdate for chasing state
missing since 32e8ed51aa.
Use new order and substate for Chasing to get into the wanted range and
avoid that way issue with running - walking tracking or animation
variants.

Fixing issue when attacker would not react to the death of the target
while chasing it in stances where results for abandoning chasing are
always false and also do not rely on timer ending chasing for the rest
of stances.

This was SVN commit r23566.
2020-04-03 18:08:45 +00:00
Angen c968154934 Explicitly return "undefined" when requesting Splash data in Attack.js
Compared to other occurrences in code base, it makes sense to return
undefined rather then just empty return.

Differential Revision: https://code.wildfiregames.com/D2665
Patch by: Freagarach
This was SVN commit r23563.
2020-04-01 18:17:48 +00:00
Itms 32a105d6f8 Update cppformat from v0.11.0 to v1.1.0, fixes #5646, refs #3190.
Use the opportunity to rename the lib from cppformat to fmt, refs #4148.

Patch By: adrian
Rebased By: s0600204
Differential Revision: https://code.wildfiregames.com/D2613
This was SVN commit r23562.
2020-04-01 07:29:33 +00:00
Stan 5a4a935e3b Fix missing <group> tag in 36f9648ba7
Noticed by: @Angen
This was SVN commit r23560.
2020-03-27 20:32:00 +00:00
Angen 54f9848ad7 [gameplay-a24] Standardize structure loot to 20%
Structure loot is standardized to 20% of cost.
Loot is provided from resources that were required for constructing.
Exception is field, which costs wood but grants food as loot.
Removed not needed elements.
Related D2605

Differential Revision: https://code.wildfiregames.com/D2659
Patch by: Nescio
Reviewed by: ValihrAnt
This was SVN commit r23559.
2020-03-27 20:14:22 +00:00
Stan 36f9648ba7 Remove deprecated variants from Brit structures actors.
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2633
This was SVN commit r23558.
2020-03-27 20:03:36 +00:00
Angen d8ddfd73b4 Remove unnecessary arguments in Pack.js
Remove argument passed to timer, which was not used.
Remove 4-th argument passed into SelectAnimation, that takes only 3
arguments.

Differential Revision: https://code.wildfiregames.com/D2679
Patch by: Freagarach
This was SVN commit r23557.
2020-03-27 20:00:39 +00:00
Angen 6cfb4e5df8 Standardizes formating style of aura json files
Use tabs for intendation.
Remove trailing zeroes.
Alphabetize modifications, except for damage types and resources, which
have a fixed order (hack, pierce, crush and food, wood, stone, metal,
respectively).

Differential Revision: https://code.wildfiregames.com/D2000
Patch by: Nescio
Reviewed by: Freagarach
Comments by: elexis, Stan
This was SVN commit r23556.
2020-03-27 19:54:53 +00:00
Stan 5063adb30f Move Persian cavalry to the persian folder.
Use the Persian cavalry for pers as well (Currently only used by
Seleucids)
Move the chariot to an unused unit
Fix the specicif names,
Move the icon from sele_ to pers_

Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2530
This was SVN commit r23553.
2020-03-27 08:29:39 +00:00
Stan 7d6238692c Move iberian cavalry swordsman actors to the iberian folder.
Patch by: @Nescio
Accepted by: @Alexandermb, @Stan
Differential Revision:  https://code.wildfiregames.com/D2636
This was SVN commit r23552.
2020-03-25 23:05:50 +00:00
Alexandermb 6c0f2ac579 Adjust helmet mesh to avoid clipping and reduce unnecesary vertex.
Added double face's on cheecks due to helmet shape for avoid
transparency.

This was SVN commit r23551.
2020-03-25 19:37:40 +00:00
Alexandermb 37c59909dc Fix some issues mentioned by @Nescio in the next thread:
https://wildfiregames.com/forum/index.php?/topic/27756-unit-actor-mistakes/&tab=comments#comment-393370

This was SVN commit r23550.
2020-03-25 19:36:52 +00:00
Stan 4757d0bbe0 Use chariot unit instead of foot soldier for Amanirenas
Patch by: @Nescio
Reviewed by: @Stockfish0ad, ValihrAnt
Suggested by: @Sundiata
Thread:
https://wildfiregames.com/forum/index.php?/topic/21602-the-kingdom-of-kush-a-proper-introduction-illustrated/page/37/&tab=comments#comment-392079

Differential Revision: https://code.wildfiregames.com/D2622
This was SVN commit r23549.
2020-03-25 15:50:54 +00:00
Stan 2725279bf9 Display Civic Center before houses
Patch by: @Nescio
Reviewed by: @ValihrAnt, @Stockfish0ad
Differential Revision: https://code.wildfiregames.com/D2580
This was SVN commit r23548.
2020-03-25 11:42:45 +00:00
Angen c13faea0f3 [gameplay-a24] Reduce Blemmye and Nuba camp building time
Reduce buildtime of kush_blemmye_camp and kush_nuba_village to 150.
Remove not needed BuildTime element from cart_embassy.

Differential Revision: https://code.wildfiregames.com/D1863
Patch by: Nescio
Reviewed by: Feldfeld
This was SVN commit r23547.
2020-03-23 18:49:15 +00:00
Alexandermb 99b2f4ebfd Fix of trader, catafalque and packed siege engines horses being unsync with horse assets.
This was SVN commit r23545.
2020-03-22 21:25:31 +00:00
Stan 5a9fd3e7eb Enable archery tradition for kush. It is historically correct and will buff Kushites a little bit.
Patch by: @Nescio
Reviewed by: @Feldfeld
Differential Revision: https://code.wildfiregames.com/D2022
This was SVN commit r23544.
2020-03-22 09:56:54 +00:00
Angen 04660d594b [gameplay-a24] Balance ranged infantry citizen soldiers
Buffs archers (+0.7 Pierce)
Nerfs slingers. (-0.3 Pierce,-0.1 Crush,+0.5 Spread)

Differential Revision: https://code.wildfiregames.com/D2612
Patch by: ValihrAnt
Reviewed by: elexis
Comments by: badosu, Feldfeld
This was SVN commit r23543.
2020-03-21 22:03:10 +00:00
Stan 7aa6cd4215 New bear model with animations.
Model by @Stan and @Alexandermb
Animations by @Alexandermb
Textures by @Stan

Thread:
https://wildfiregames.com/forum/index.php?/topic/23595-task-bear/

Fixes #1981

This was SVN commit r23542.
2020-03-21 17:00:31 +00:00
Angen d392472d44 Experience trickle
Implement support for experience trickle. Provide 1 experience trickle
when unit is garrisoned in barracks.

Differential Revision: https://code.wildfiregames.com/D1245
Patch by: @temple
Reviewed by: @wraitii
Comments by: mimo, elexis, Freagarach, Stan
This was SVN commit r23541.
2020-03-21 15:54:45 +00:00
Angen f5589fe1a9 Check for UnitMotion component [UnitAI]
This was SVN commit r23540.
2020-03-20 20:12:09 +00:00
Stan c351a48351 Fix cape going out of sync when approaching resources.
This was SVN commit r23538.
2020-03-18 15:29:39 +00:00
Stan b9e06fc449 Remove the obelisk as it is not historically accurate.
Patch by: @Nescio

Differential Revision: https://code.wildfiregames.com/D2653
This was SVN commit r23537.
2020-03-18 10:36:32 +00:00
Angen ba8acb1bf2 Remove duplication in AttackPlan [Petra]
Move duplicating code to functions.
Cleaner, nicer, easier to extend.

Differential Revision: https://code.wildfiregames.com/D2655
This was SVN commit r23536.
2020-03-17 19:30:15 +00:00
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