Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
18,895 Commits 6 Branches 28 Tags 13 GiB
870a0b54d0
Commit Graph

18895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
elexis
2be4293dff Complain if an RMS tries to revert the loading progress. 
Also increase estimated mapgen time, refs 942a45372c, 0e0ed94926.

Differential Revision: https://code.wildfiregames.com/D1341
Proposed By: Vladislav in D1340
This was SVN commit r21400.
 2018-03-01 12:06:55 +00:00
Stan
5ea7458671 Fixes #5056 
Remove the offending props. Add EOL properties.
Reported and fix suggested by s0600204

This was SVN commit r21399.
 2018-03-01 07:40:31 +00:00
Stan
df246b3f5b Disable trader sounds that were only enabled because their szddles had an event tzg. 
For the record and the future I guess as much possible try to avoid
dexlaring events in props.
when nearly everything will use variants that wont be much of a
probleme.
Reported in a stzff match by elexis

This was SVN commit r21398.
 2018-03-01 07:18:39 +00:00
mimo
58f7f47554 petra: additional fixes for accessibility checks during attacks 
This was SVN commit r21397.
 2018-02-28 19:20:28 +00:00
mimo
12be2af34c Fix inconsistent behaviour when deleting a saved game from the load or save panels 
Patch by ztamas

Reviewed By: mimo
Trac Tickets: #4862

Differential Revision: https://code.wildfiregames.com/D1344
This was SVN commit r21396.
 2018-02-28 19:16:27 +00:00
elexis
7dd14f4512 Fix missing double negation in a1ddf6114a / D1021. 
This was SVN commit r21394.
 2018-02-27 19:51:53 +00:00
Stan
5db56fce33 New pers quiver by alexandermb 
Thread:
https://wildfiregames.com/forum/index.php?/topic/23925-task-weapons-and-armory/&page=2

This was SVN commit r21393.
 2018-02-27 19:06:42 +00:00
mimo
91299ce79a petra: fixes/cleanups in navalManager 
This was SVN commit r21392.
 2018-02-27 16:46:49 +00:00
mimo
b50589f66e petra: fixes/cleanups in attacks 
This was SVN commit r21391.
 2018-02-27 16:31:23 +00:00
elexis
c166357146 Fix JS type label in the heightmap library, refs #3764. 
Remove an unused variable following 3eac3856c6.

This was SVN commit r21390.
 2018-02-27 13:09:48 +00:00
Itms
387200f745 Enable multi-processor compilation on Windows with premake5. Patch by Stan, fixes #5035. 
Differential Revision: https://code.wildfiregames.com/D1335
This was SVN commit r21389.
 2018-02-26 21:49:49 +00:00
temple
2e8ba0ca2c Fix some map load progress numbers 
Differential Revision: https://code.wildfiregames.com/D1340
Reviewed by: elexis
This was SVN commit r21388.
 2018-02-26 21:36:37 +00:00
Stan
354408439a Add back texture for the centurio 
This was SVN commit r21387.
 2018-02-26 21:35:33 +00:00
Stan
12e5910088 Clean up death anims a bit. 
Fishermen are excluded.
Use a delenda est variant for hoplites.

This was SVN commit r21386.
 2018-02-26 20:59:03 +00:00
Stan
861411ac29 New variants for elephants. 
Remove duplication, simplify files
Allow for faster updates

This was SVN commit r21385.
 2018-02-26 20:26:23 +00:00
elexis
fc218bb12e Rework passage creation on Lower Nubia and add map description by Sundiata, refs #5040. 
Increase passage size so that elephants and siege engines can pass with
higher likelihood.
Use the ElevationBlendingPainter from c1904a725a, so that the mountain
elevation near the river is taken into account.
Smooth the passages even more using the SmoothingPainter, refs #5027.
Add missing SetProgress calls.

This was SVN commit r21384.
 2018-02-26 19:48:28 +00:00
bb
56a17c788d Missing double negate throws error from a1ddf6114a 
Spotted By: temple
refs D1021, #4791

This was SVN commit r21383.
 2018-02-26 17:40:50 +00:00
elexis
99b69098db Pay missing file in the previous commit 9d681ff3e3 with a large pyramid, refs #5040. 
This was SVN commit r21380.
 2018-02-25 22:35:10 +00:00
bb
3698c134b5 Make sure dropdowns fit in the screen by allowing the list to be above when there is not enough space 
Reviewed By: Vladislav
Differential Revision: D1061
fixes #4857

This was SVN commit r21379.
 2018-02-25 22:26:31 +00:00
bb
a1ddf6114a Allow units to be positioned with freehand placement 
Patch By: OptimusShepard
Comments By and Agreed With: elexis
Comments By: Imarok
Differential Revision: D1021
fixes #4791

This was SVN commit r21378.
 2018-02-25 22:17:19 +00:00
elexis
9d681ff3e3 Lower Nubia random map, refs #5040. 
Composes the NASA heightmap with the NASA composite photography to
reduce the ahistorical Lake Nasser and avoid having huge lakes in the
valleys to the west of the Nile,
as the heightmap does not correlate with water distribution in this arid
climate at all.
I.e. places riverbed elevation where composite and heightmap intersect,
elsewhere uses the elevation model by NASA.

Bounding box chosen by Hannibal Barca
Geographic and biome consulting by Sundiata

This was SVN commit r21377.
 2018-02-25 22:08:26 +00:00
elexis
3d54e697e7 Allow using createPassage with out of bounds coordinates when TILE_CENTERED_HEIGHT_MAP mode is enabled. 
Update credits.

This was SVN commit r21376.
 2018-02-25 21:39:06 +00:00
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