1
0
forked from mirrors/0ad
Commit Graph

20457 Commits

Author SHA1 Message Date
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
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