mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-24 14:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,673 Commits 1 Branch 39 Tags
a4bdd943c1a620a59d1d5867f228fc3abea74ffd
Commit Graph

18673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stan a4bdd943c1 Check for m_Unit before using it as it is done below. 
That would break autostart beacause m_Unit is not set.
Noticed by: Mimo
Fix af2abb8cbf

This was SVN commit r21375.
 2018-02-25 14:58:31 +00:00
Stan f75a67e8c6 Fix cavalry animations. Use inheritance where possible to reduce the amount of maintenance work needed. 
This was SVN commit r21374.
 2018-02-25 14:40:00 +00:00
Stan 2ab3436dab Move some unused textures to the art repo 
This was SVN commit r21373.
 2018-02-25 13:03:18 +00:00
mimo f687c8f61d petra: Always use an helper function to get the accessibility of an entity instead of direct use of the accessibility map, in order to be able to cope with entity specificities (docks for example). 
This was SVN commit r21372.
 2018-02-25 10:10:14 +00:00
Stan 23db9cac91 Use the correct texture for the mauryan hero head. 
This was SVN commit r21370.
 2018-02-25 02:28:46 +00:00
Stan 2b45ac5ddf Fix Mauryan Hero 
This was SVN commit r21369.
 2018-02-25 02:27:04 +00:00
Stan cd1be35976 Move files found by a modified checkref.pl to the old_public 
Use some previously unused anims for ponies,
Remove unanimated capes, as the current models are the same but rigged.

This was SVN commit r21368.
 2018-02-25 02:08:55 +00:00
Stan e912160467 Use an old anim committed by Pureon 
This has no visual effect.
Reported by checkrefs.pl

This was SVN commit r21367.
 2018-02-25 00:38:34 +00:00
Stan d89abdef44 Move unused and old anims to the old_public folder 
Reorganize the new into folders so it's easier to find
and will be easier to reimplement if we need them.

This was SVN commit r21366.
 2018-02-25 00:30:46 +00:00
elexis 8bad02bd64 Donate button. 
Differential Revision: https://code.wildfiregames.com/D1317
Agreed with: Itms
String improvement by: Stan
Tested by: Imarok
This was SVN commit r21365.
 2018-02-24 23:18:42 +00:00
elexis 8615acb2fc Napata demo map by Skhorn, based on research by Sundiata, refs #5040. 
Displays a historic reconstruction of the ancient Nubian / Kushite city.

This was SVN commit r21364.
 2018-02-24 23:13:11 +00:00
Stan 3e0482b85b Use Inheritance for quadrapeds, to reduce work needed when wanting to update anims 
This was SVN commit r21363.
 2018-02-24 22:37:33 +00:00
Stan d5c48e851e Disable cavalry sounds. 
This was SVN commit r21362.
 2018-02-24 21:07:30 +00:00
Stan 679dc0ebba Fix broken tests, 
Noticed by bb:
fixes af2abb8cbf

This was SVN commit r21361.
 2018-02-24 20:37:50 +00:00
bb d470995bcb Fix nomad checbox scrolling wrongly, fixes 70172519b7 
This was SVN commit r21360.
 2018-02-24 20:19:59 +00:00
Stan af2abb8cbf Fix units not being able to play sounds when walking and running 
This currently disabled by variants, and will be reenabled when sounds
have been chosen.
Reviewed by: Vladislav,
Comments by: Itms, elexis
Differential Revision: ​https://code.wildfiregames.com/1257
This was SVN commit r21359.
 2018-02-24 18:13:03 +00:00
mimo 976ab3d395 petra fixes/improvments of b11ff0df68 
This was SVN commit r21358.
 2018-02-24 17:06:04 +00:00
elexis 29bd1216cd Place treasure on Elephantine island to incentivize players invading the fortified island. 
Discussed with: temple, (-_-) aka smiley
Also add missing Unknown diff in previous commit d35d6cc9f9

This was SVN commit r21357.
 2018-02-24 16:25:47 +00:00
elexis d35d6cc9f9 Change createPassage function from cfdd37f6d9 to optionally consume a Constraint argument instead of an optional maxHeight argument. 
This allows constraining the passage using tileclasses for instance.

This was SVN commit r21356.
 2018-02-24 16:01:20 +00:00
temple 79090bfa63 Double negate state.garrisonHolder 
Differential Revision: https://code.wildfiregames.com/D1326
Reviewed by: mimo
This was SVN commit r21355.
 2018-02-24 14:13:27 +00:00
elexis 7541291621 Elephantine map description by Sundiata, refs #5040. 
Place bushes on the shoreline.
Fix berries.
Remove unused tileclass.
Less watercolor saturation.
Fix lineendings.

This was SVN commit r21354.
 2018-02-24 12:56:35 +00:00
elexis db07c11216 Maximize civ selection dropdown size in the gamesetup, i.e increase the size by 3 more civs. 
Further increasing the size for mods was neglected in d6c028923e / D527
and
Delenda Est had a copy of gamesetup.xml to extend the size already.

This was SVN commit r21353.
 2018-02-24 12:19:47 +00:00
Stan 665695bed1 Add a snow particles for mapmakers 
Discussed with: bb_, elexis

This was SVN commit r21352.
 2018-02-24 11:50:03 +00:00
Stan abb6026816 Fix Iber champ not using fire javelins anymore 
Patch by: (-_-)
Reviewed by: Stan
Thanks.

This was SVN commit r21351.
 2018-02-24 11:02:58 +00:00
Stan 158b5963c4 Fix Ptol, Cart, and Pers traders not having animations. 
This was SVN commit r21350.
 2018-02-24 11:00:36 +00:00
mimo 1b525c1917 Small floating debris should not block ship movement. 
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1329
This was SVN commit r21349.
 2018-02-24 10:52:04 +00:00
mimo 3b26e8fac3 Decrease a bit the clearance of fishing ships (from 4 to 3). 
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1330
This was SVN commit r21348.
 2018-02-24 10:48:48 +00:00
Stan db080f7f22 Fix some templates errors introduced by the recent camel renaming. 
This was SVN commit r21347.
 2018-02-24 10:48:46 +00:00
mimo b11ff0df68 petra: fix oversight in 5a2b3d3d5d 
This was SVN commit r21346.
 2018-02-24 10:41:59 +00:00
elexis 7c7d74cf2e Fix missing right-alignment of lobby icon in the summary screen following 228399f913, refs #4106. 
This was SVN commit r21345.
 2018-02-24 10:26:44 +00:00
temple 4eb9582e63 Town bell - use matching classes, add a market alert 
Replace the alert level with matching classes.
Women respond to bells at the civic center, farmstead, and storehouse.
Trade carts respond to the bell at the market.
Allow garrisoning in allied buildings.
Adapt the GUI to the new behavior.

Differential Revision: https://code.wildfiregames.com/D937
Reviewed by: causative
This was SVN commit r21343.
 2018-02-24 04:35:26 +00:00
temple ee23f7adb1 Tweaks to Via Augusta 
Change the angles of civic centers and convert tree actors into trees.
Differential Revision: https://code.wildfiregames.com/D1328
Reviewed by: elexis
This was SVN commit r21342.
 2018-02-24 02:06:17 +00:00
elexis c69b5688bc Revert 8684e06ce0 / D1083 since the translated strings are only accessible while the public mod is enabled. 
Reported By: leper
Reviewed By: Vladislav
Alternatively one might consider mod label and description translations
contained in the mod.json.

This was SVN commit r21341.
 2018-02-24 00:33:30 +00:00
s0600204 1d0700c3cb Reduce duplication in code compiling template lists in Reference Suite 
Also supports having initial start entity templates not in the usual
`simulation/templates/{structures|units}` folders

This was SVN commit r21340.
 2018-02-23 22:04:45 +00:00
s0600204 760a47335d Add buttons for changing between, and hotkeys for opening, the civinfo and structree 
Patch by: fpre
Reviewed By: s0600204
Fixes: #4970
Differential Revision: https://code.wildfiregames.com/D846
This was SVN commit r21339.
 2018-02-23 20:54:28 +00:00
bb 70172519b7 Use a macro for creating checkboxes in the Atlas map panel (other panels code checkboxes in a different way) 
Agreed With: elexis

This was SVN commit r21338.
 2018-02-23 20:47:46 +00:00
bb 0ace1b44b2 Learn males chopped wood is not a weapon to fight with. 
Use correct variants in animations form UnitAI.

Patch By: wraitii
Reviewed By: temple
Differential Revision: https://code.wildfiregames.com/D1239
fixes #4932

This was SVN commit r21337.
 2018-02-23 20:20:57 +00:00
Imarok c894eeb856 Fix debug mode after d5807cd59f 
Reviewed by: temple
Differential Revision: https://code.wildfiregames.com/D1315
This was SVN commit r21336.
 2018-02-23 20:17:47 +00:00
bb c0349931c0 Update the animation immediately after a varaint is changed, so we don't have sliding issues when we do so. 
Differential Revision: https://code.wildfiregames.com/D1322
Reviewed By: temple
This was SVN commit r21335.
 2018-02-23 20:11:16 +00:00
elexis 7908045272 Add desert bush variant which was used in cc3d9de386 but became unused by 4d40c8dc7d. 
The elephantine map from 4c979d8e38 used it already, reported by Angen.
Use these berries for the desert and savanna random biomes and Sahel.

This was SVN commit r21334.
 2018-02-23 15:02:05 +00:00
elexis 51194c2eca Fix bloom on Persian Highlands following a6e4c5142a, refs #4766, #4954. 
This was SVN commit r21333.
 2018-02-23 14:55:15 +00:00
elexis e1d2d3e723 Update credits. 
This was SVN commit r21332.
 2018-02-23 13:19:57 +00:00
elexis 4c979d8e38 Elephantine random map script, refs #5040. 
Uses OpenStreetMap polygons for the shape of the water, refs #5018.

Proposed by: Sundiata, wowgetoffyourcellphone
This was SVN commit r21330.
 2018-02-23 05:41:35 +00:00
elexis dca8a68559 Change the RandomObject prototype to pick a different template upon each placement, making it much more useful. 
This was SVN commit r21329.
 2018-02-23 01:43:49 +00:00
Stan 07419b5ab1 Fix typo, that didn't break the game for some reason. 
This was SVN commit r21328.
 2018-02-22 21:04:45 +00:00
bb b2c923800f Fix linting issues in 9571c56d7e and ac7b5ce861 noticed by Imarok 
This was SVN commit r21327.
 2018-02-22 20:50:15 +00:00
Stan 1e42ab5548 New camels 
Models, Anims and textures by Alexandermb and Wackyserious
Thread:
https://wildfiregames.com/forum/index.php?/topic/23596-task-update-camel-units/&page=7

This was SVN commit r21326.
 2018-02-22 20:41:50 +00:00
s0600204 46114e00c8 Pass appropriate techcode to Template Viewer when clicking on one of a tech-pair in the session gui 
(Instead of the content of the tech-pair's pairing tech)

Reported by: wowgetoffyourcellphone
Report: https://wildfiregames.com/forum/index.php?/topic/24027-viewer/

Refs: https://code.wildfiregames.com/D297

This was SVN commit r21325.
 2018-02-22 20:22:45 +00:00
mimo fd14419bc0 petra: fix an index access + some cleanup 
This was SVN commit r21324.
 2018-02-22 18:42:45 +00:00
Stan b38cf55ff5 Cleanup materials, remove comments, and tweak requires. 
Reviewed By: Vladislav
Differential Revision: ​https://code.wildfiregames.com/D94
This was SVN commit r21323.
 2018-02-22 18:26:04 +00:00