1
0
forked from 0ad/0ad
Commit Graph

5519 Commits

Author SHA1 Message Date
056962b5c5 Greek building stuffs.
This was SVN commit r11480.
2012-04-11 00:19:01 +00:00
368dda421a New Hele walls
This was SVN commit r11479.
2012-04-10 23:14:58 +00:00
71a57ed3a7 Allow gathering regardless of resource owner
This was SVN commit r11478.
2012-04-10 21:09:21 +00:00
d3a24c26ba Do alpha-testing earlier in ARB shaders, for performance.
This was SVN commit r11477.
2012-04-10 21:08:54 +00:00
f2260892bd Add config option to force alpha-tested materials.
This was SVN commit r11475.
2012-04-10 21:03:22 +00:00
05008d190e Clean up terrain shader a bit
This was SVN commit r11473.
2012-04-10 20:55:01 +00:00
9796fbf59b Eggbird's new Iberian Temple.
This was SVN commit r11472.
2012-04-10 18:27:25 +00:00
577676810b Make domestic herd animals controllable by the player
This was SVN commit r11471.
2012-04-10 16:37:34 +00:00
a035fc3949 Delete some unnecessary folders and files. Add shiny stuff to more helmets.
This was SVN commit r11469.
2012-04-10 02:43:42 +00:00
764b173f6e Shield tweaks.
This was SVN commit r11467.
2012-04-10 01:25:03 +00:00
b3e519c278 Remove sheets.
This was SVN commit r11466.
2012-04-09 23:13:45 +00:00
e5d3a2b312 Adjusting the Iberian wall tower's windows
This was SVN commit r11465.
2012-04-09 19:23:48 +00:00
67bca5a6ed Use an overlay image to mark selected icons instead of using a separate image.
Remove some useless sheets.

This was SVN commit r11464.
2012-04-09 18:58:03 +00:00
a21fc77212 A minor improvement for enabling/disabling user feedback. It was set to enabled/disabled in every tick which triggered some code.
Now it's only enabled or disabled when the user clicks the button and
therefore much less events are triggered.

This was SVN commit r11463.
2012-04-09 12:30:56 +00:00
3db7f32d17 Specular for a few more things.
This was SVN commit r11462.
2012-04-09 00:37:50 +00:00
25d1affef2 Adding specular to some items.
This was SVN commit r11461.
2012-04-08 23:53:05 +00:00
4b5bd36d9b Multiply specular lighting by sun color
This was SVN commit r11460.
2012-04-08 23:03:22 +00:00
c93f17827f Make use of the grayscale opion.
Move some icon files to a more adequate location.
Closes #1214 as that was already commited and this commit fixes some
minor issues.

This was SVN commit r11459.
2012-04-08 22:56:11 +00:00
f3a393d2e5 Add alpha-tested materials
This was SVN commit r11457.
2012-04-08 21:55:21 +00:00
566a4588b6 This update to JuBot transfers to the v2 SVN, and adds tower garrisoning.
This was SVN commit r11455.
2012-04-08 16:58:57 +00:00
f3617822e0 Make AlwaysVisible objects always visible in shader mode. Fixes #908.
This was SVN commit r11454.
2012-04-08 16:36:23 +00:00
b7888aea52 Add support for specular materials.
Let materials specify shader uniform values.
Use interned strings for shader uniform/attribute names.
Remove confusing float* cast operator on CVector4D.
Simplify and clean up CVector4D.
Remove non-supported 'old' lighting model.

This was SVN commit r11453.
2012-04-08 15:55:06 +00:00
8a0e47fdd6 Adds the GarrisonTower and GarrisonFortress classes to towers and fortresses.
This was SVN commit r11452.
2012-04-08 12:09:49 +00:00
2dc3c36ee6 Adds the classes "GarrisonTower" and "GarrisonFortress" to more easily demarcate the buildings the AI wants to garrison for defense.
This was SVN commit r11451.
2012-04-08 12:08:21 +00:00
fda1d07794 Tweaking some pop costs.
This was SVN commit r11450.
2012-04-08 07:27:56 +00:00
6b5034e313 Iberian wall model updates
This was SVN commit r11448.
2012-04-07 10:36:32 +00:00
6a82b215e1 This was SVN commit r11447. 2012-04-07 05:31:15 +00:00
b5e4916f03 New "Laconia" map. Update to Spartan female citizen.
This was SVN commit r11446.
2012-04-07 01:31:49 +00:00
4a12049df5 Put resource accessibility checks back for the new worker code
This was SVN commit r11445.
2012-04-06 19:53:50 +00:00
83422923aa Added deep forest map by FeXoR. Fixes #1287.
This was SVN commit r11444.
2012-04-06 19:15:58 +00:00
07ea6673c3 Use grayscale option instead of grayscaled icons
This was SVN commit r11443.
2012-04-06 15:51:26 +00:00
32d6b09c3c Set goods for every selected trader. Based on patch by Spahbod, fixes #1209.
This was SVN commit r11442.
2012-04-06 15:07:04 +00:00
7ff99cc218 Prevent trade with foundations, based on patch by Spahbod, fixes #1215.
This was SVN commit r11440.
2012-04-05 22:00:15 +00:00
a5076c1eb1 Added dummy PostMessage and BroadcastMessage functions for tests
This was SVN commit r11439.
2012-04-05 14:13:36 +00:00
9d353b7df9 fixes
This was SVN commit r11438.
2012-04-05 08:03:44 +00:00
ea66f950e7 Making M_s look better. Removed 2nd special building for S_s.
This was SVN commit r11437.
2012-04-05 04:01:53 +00:00
a569194d37 Fixing some missing units.
This was SVN commit r11436.
2012-04-05 04:01:24 +00:00
d56d65bc87 Removing old unused Iberian structural models
This was SVN commit r11435.
2012-04-04 23:16:33 +00:00
ba296eb7d9 Iberian wall segments. New design and models
This was SVN commit r11434.
2012-04-04 23:14:00 +00:00
6efbf65a90 Demo map for S_ and M_
This was SVN commit r11433.
2012-04-04 22:33:33 +00:00
6670195fcf Some cool stuff.
This was SVN commit r11432.
2012-04-04 22:32:43 +00:00
2ba6b4d185 Missed anatolian plateau in previous commit
This was SVN commit r11431.
2012-04-04 21:06:05 +00:00
47ea2ef167 Convert rmgen to use anticlockwise angle from the positive x axis for unit placement, patch from FeXoR, fixes #1289.
This was SVN commit r11430.
2012-04-04 20:53:17 +00:00
7eb5480494 AI common-api-v2 and a qbot which works with the new API but it not fully transitioned to make use of it properly
This was SVN commit r11429.
2012-04-04 20:23:41 +00:00
21a39dedfb Add check to prevent error when ranged attack target is destroyed
This was SVN commit r11428.
2012-04-04 20:03:04 +00:00
e686c65fe6 Partial support for alpha-tested materials
This was SVN commit r11425.
2012-04-03 20:00:04 +00:00
59447bce2e Move shaders into appropriate subdirectories.
Delete some obsolete shader files.

This was SVN commit r11424.
2012-04-03 19:45:58 +00:00
6bc33fe8bd Update renderer design to be more flexible and data-driven based on material and shader definitions.
Support conditional expressions in shader effect XML files.
Consolidate fixed-function model rendering into the shader system.
Remove lots of now-obsolete renderer code.
Move shader defines from std::map to new class with interned data, for
performance.
Move texture from model into material.
Alleviate singletonitis.
Remove obsolete lodbias setting.
Remove unused terrain shadow transparency.

This was SVN commit r11423.
2012-04-03 18:44:46 +00:00
8f59cb7b90 This was SVN commit r11421. 2012-04-03 09:26:38 +00:00
1daee6bbc2 Updating some campaign assets.
This was SVN commit r11420.
2012-04-03 03:04:58 +00:00
59851231bd Minor tweaks. New thracian peltast portrait.
This was SVN commit r11419.
2012-04-02 17:15:11 +00:00
25762f1f0d Persian wall segments
This was SVN commit r11417.
2012-04-01 18:57:05 +00:00
bf70e99b00 Celt Murus Gallicus wall, tower, and gate
This was SVN commit r11416.
2012-04-01 16:36:38 +00:00
41c7fe7901 For fcxsanya
This was SVN commit r11415.
2012-04-01 15:46:43 +00:00
316584d71a Corrected in game manual about creating control groups to include 0, fixes #1279.
This was SVN commit r11414.
2012-04-01 14:00:15 +00:00
9198c449ad This was SVN commit r11413. 2012-03-31 19:19:33 +00:00
315a41f479 Some more emblems. Some updated portraits.
This was SVN commit r11412.
2012-03-31 04:27:22 +00:00
16a5d74b35 Campaign map tree assets' poly count reduced between 75% and 90%.
This was SVN commit r11411.
2012-03-30 22:04:22 +00:00
99da24c7a3 Correctly check whether an existing formation controller can be reused. Fixes #1255.
This was SVN commit r11410.
2012-03-30 20:09:50 +00:00
e5c85bc540 More campaign proof of concept stuff. A "Leonidas" army pawn.
This was SVN commit r11408.
2012-03-28 06:09:38 +00:00
6cb97e3e01 This was SVN commit r11407. 2012-03-27 21:38:12 +00:00
f0897e05cd New Roman Merchant ship by Kenobi and Enrique.
This was SVN commit r11406.
2012-03-27 18:31:47 +00:00
ad49f58468 Random new stuff.
This was SVN commit r11405.
2012-03-27 04:08:24 +00:00
44a3af8d29 This was SVN commit r11404. 2012-03-27 04:07:04 +00:00
82c8af3ad5 More proof of concept stuff for campaigns.
This was SVN commit r11403.
2012-03-27 02:20:21 +00:00
99576ab44a More campaign conceptual stuff.
This was SVN commit r11401.
2012-03-26 09:59:39 +00:00
666936a5e3 Test campaign stuff. Just proof of concept stuff. *NOT FINAL ARTWORK*
This was SVN commit r11400.
2012-03-26 08:35:59 +00:00
a7af9b028b 2 shield texture tweaks. 1 dust texture tweak.
This was SVN commit r11399.
2012-03-26 08:20:29 +00:00
856a6e7135 Some shield prop tweaking for consistency.
This was SVN commit r11398.
2012-03-26 07:53:20 +00:00
893cb2c1c4 typos
This was SVN commit r11397.
2012-03-24 22:22:51 +00:00
0fd6cc8873 Adding music to these civ files.
This was SVN commit r11396.
2012-03-24 22:11:14 +00:00
4659d60c19 This was SVN commit r11395. 2012-03-24 03:20:36 +00:00
11889f4221 New horse model
This was SVN commit r11393.
2012-03-22 08:39:00 +00:00
8d3434722d New loading screen tips for Roman Army Camp, Palisade walls, and Persian Architecture.
This was SVN commit r11392.
2012-03-22 07:57:53 +00:00
c8d7e1c006 Tweaked a bunch of templates.
This was SVN commit r11391.
2012-03-22 07:12:00 +00:00
b90cedf0a6 Cost tweaks and other things.
This was SVN commit r11390.
2012-03-22 02:07:17 +00:00
0d385f4112 Make selected stances and formations more obvious. Patch from leper, fixes #1190.
This was SVN commit r11386.
2012-03-21 16:45:02 +00:00
a957455647 Shift-click ungarrisons all units of a type. Patch from leper, fixes #1206.
This was SVN commit r11385.
2012-03-21 15:18:31 +00:00
f53823b498 Oasis X tweaks.
This was SVN commit r11384.
2012-03-21 06:19:36 +00:00
65c39cb74e This was SVN commit r11383. 2012-03-21 05:33:58 +00:00
2c913b4a9f Removed qbot entity extend functions since they are now in the common-api
This was SVN commit r11382.
2012-03-20 23:34:03 +00:00
f718ddaee7 Slightly updated Iberian cc meshes.
Delete old vesta mesh.

Crocodile from Historicity.

This was SVN commit r11381.
2012-03-20 22:35:28 +00:00
97479830e9 New Iberian civic centre.
Made Indibil a cavalry dude.
Tweaked Army Camp entity.

This was SVN commit r11378.
2012-03-20 19:00:11 +00:00
02c848d1f1 Adjustments to palisade walls and rotated gate
This was SVN commit r11375.
2012-03-20 00:13:55 +00:00
700e28480d Add command-line option to enable archivebuilder compression
This was SVN commit r11373.
2012-03-19 21:16:12 +00:00
36107cb7e1 GLES compatibility for particles and shadows.
Fix invalid enum errors.
Fix shader texture binding.

This was SVN commit r11372.
2012-03-19 21:10:14 +00:00
4b3d98ad71 Fixed bug in library.js GetAngle function
This was SVN commit r11370.
2012-03-19 09:32:49 +00:00
af7a914bae Fixed Army Camp turf.
This was SVN commit r11369.
2012-03-19 04:22:28 +00:00
9bbb341e23 Temperate and Tropic farmland terrains.
This was SVN commit r11368.
2012-03-19 04:06:21 +00:00
c12125018c Farmland and other terrain updates.
This was SVN commit r11367.
2012-03-19 03:41:55 +00:00
5e145c8b2d This was SVN commit r11366. 2012-03-19 01:53:44 +00:00
5f06766ead Replace isUnit, isAnimal, ... with calls to hasClass using patch from leper. Fixes #1201.
This was SVN commit r11365.
2012-03-18 21:16:30 +00:00
7c51e743fa Modified rmgen GetAngle function to use atan2 and the standard mathematical angle convention (WARNING this changes return values so will break scripts using the old version) and changed getGradient so it returns Infinity for infinite gradient lines. Added errors if people try and use unsafe javascript maths functions.
This was SVN commit r11363.
2012-03-18 18:40:27 +00:00
b72d72dec2 Minor changes.
This was SVN commit r11362.
2012-03-18 14:47:13 +00:00
208e642089 More random maps and FeXoR's wall system.
This was SVN commit r11361.
2012-03-18 07:53:18 +00:00
b68d770c89 This was SVN commit r11359. 2012-03-17 22:17:45 +00:00
148f84b708 Tweaked garrison capacity.
This was SVN commit r11358.
2012-03-17 22:16:48 +00:00
dc920f3c50 This was SVN commit r11357. 2012-03-17 22:14:38 +00:00
78840ad7b4 Roman Temple of Mars, and sword rack. :)
This was SVN commit r11356.
2012-03-17 22:06:35 +00:00
f71cdd90a3 This was SVN commit r11355. 2012-03-17 17:41:33 +00:00
78a427eef2 Fix to Celt merchant ship prop points
This was SVN commit r11354.
2012-03-17 15:23:23 +00:00
d195263215 Celt fishing boat prop fix
This was SVN commit r11353.
2012-03-17 15:07:13 +00:00
6dac7f30d7 Fixed the description for archipelago.
This was SVN commit r11352.
2012-03-17 08:24:50 +00:00
41cbe0a315 Tweaked some maps.
This was SVN commit r11351.
2012-03-17 08:13:52 +00:00
7d52cbc540 Roman army tents. Try out Oasis IX. :)
This was SVN commit r11350.
2012-03-17 02:42:02 +00:00
f347939909 Carthaginians +25% sea trading bonus.
Persians +25% land trading bonus.

This was SVN commit r11349.
2012-03-16 17:56:58 +00:00
b6ec143aee Added Engine.ProfilerStop() to qBot so it doesn't cause memory leaks when it has no units to control
This was SVN commit r11348.
2012-03-16 17:36:07 +00:00
cab65bb932 Added new random maps. Tweaked some existing ones. Added tree actors to randombiome.js. Added new functions.
This was SVN commit r11347.
2012-03-16 14:06:32 +00:00
a37ce96dcf Running dust for all of these actors.
This was SVN commit r11346.
2012-03-16 02:15:42 +00:00
cdd987c0f8 Running dust for Roman cav.
This was SVN commit r11345.
2012-03-16 01:51:07 +00:00
f923667657 Palisade segments for the click-drag wall system
This was SVN commit r11344.
2012-03-15 23:28:21 +00:00
c70cbe1e00 Made it so that there isn't a huge puff of smoke when the Celt Temple and Roman Army Camp are selected for construction.
This was SVN commit r11341.
2012-03-15 07:33:30 +00:00
1819276b1e A test for dust kicked up by cavalry when running.
This was SVN commit r11340.
2012-03-15 06:42:07 +00:00
c5f61b660e Fix old references to scout tower
This was SVN commit r11339.
2012-03-14 13:09:36 +00:00
acb853056b Fix XML error
This was SVN commit r11338.
2012-03-14 13:09:01 +00:00
9edd53a796 Fixed a bug with getTerrainTexture function.
This was SVN commit r11337.
2012-03-14 11:59:44 +00:00
10410e4e3b This was SVN commit r11336. 2012-03-14 02:49:28 +00:00
24b38da680 Tweaked Army Camp cost.
This was SVN commit r11334.
2012-03-14 02:28:31 +00:00
095f7a2381 #New Roman army camp.
This was SVN commit r11333.
2012-03-14 02:19:46 +00:00
4eec2bf5d2 Fixes some bugs related to deleting saved games (in particular, load/delete was broken if the file was deleted externally while the game was running).
Adds saved game directory to the hotload watch list.
Logs error instead of crashing when saved game is not found.
Changes Atlas double-click selection to only pick units from the same
player.

This was SVN commit r11332.
2012-03-14 00:23:28 +00:00
e57730ecce This was SVN commit r11331. 2012-03-14 00:22:46 +00:00
5ffee8e4e0 Fixing a minor error.
This was SVN commit r11330.
2012-03-14 00:10:02 +00:00
bfe5772315 xml changes
This was SVN commit r11329.
2012-03-14 00:09:27 +00:00
f1ba777a76 Ides of March
This was SVN commit r11328.
2012-03-13 22:54:15 +00:00
0c49ac92fe Ides of March
This was SVN commit r11326.
2012-03-13 20:52:42 +00:00
9ff8d706f5 Acropolis IV.
This was SVN commit r11325.
2012-03-13 08:21:02 +00:00
e35d8f7df9 This was SVN commit r11324. 2012-03-13 02:59:14 +00:00
83c276afc4 Ruins gathering sounds.
Portrait for Rhodian Slinger.

Updated the name of the Roman merchant.

Updated the names of these maps.

This was SVN commit r11323.
2012-03-13 01:59:06 +00:00
0cace671b7 Fixed bug with economy not finding food.
The problem was with the new caching and unhuntable animals.  The cache
would have an unhuntable food source so would show as not being empty
but then when this was filtered out at a later stage.  After this later
stage there would be no attempt to search a larger area.

This was SVN commit r11321.
2012-03-11 23:09:12 +00:00
cd906e074f Added support for romans to qBot
This was SVN commit r11320.
2012-03-11 22:24:02 +00:00
f027a64251 This was SVN commit r11319. 2012-03-11 08:46:54 +00:00
8dd841b116 Fixed a pop limit thing. Seems to be an Atlas bug with this.
This was SVN commit r11318.
2012-03-11 07:44:51 +00:00
d7fa7477ab Updated trade cursor.
This was SVN commit r11317.
2012-03-11 07:41:41 +00:00
b099676175 A couple of new Death Canyon variants.
This was SVN commit r11316.
2012-03-11 07:35:10 +00:00
915bc8d263 I noticed some units were missing promotion animations. :)
This was SVN commit r11315.
2012-03-11 04:47:31 +00:00
0741d0ccd6 Fixed Celt slinger sound effects.
Tweaked cav spear tooltip.

This was SVN commit r11314.
2012-03-11 04:39:53 +00:00
8e94dea94d This was SVN commit r11313. 2012-03-11 00:23:26 +00:00
ae1d57a4c7 Made Oasis X the default map.
This was SVN commit r11312.
2012-03-10 20:13:25 +00:00
d3727a99f9 Updated Oasis X
This was SVN commit r11311.
2012-03-10 20:08:48 +00:00
e8c31dc9a3 This was SVN commit r11310. 2012-03-10 19:49:59 +00:00
vts
7934e3ab0b Fixed missing cmpIdentity null check in Barter.js:60 (causes failure on Isthmus when territory_pull entity is iterated over). Fixes #1199.
This was SVN commit r11309.
2012-03-10 16:34:59 +00:00
OmriLahav
5282d77c19 This was SVN commit r11304. 2012-03-10 15:03:09 +00:00
OmriLahav
f062610daf This was SVN commit r11303. 2012-03-10 14:41:44 +00:00
OmriLahav
e18bb4adc7 This was SVN commit r11301. 2012-03-10 13:56:17 +00:00
OmriLahav
987df3b72b This was SVN commit r11300. 2012-03-10 13:54:02 +00:00
c8fde142af New Greek trader portrait. Tweaked Greek and Roman trade cart footprints.
This was SVN commit r11298.
2012-03-10 07:08:31 +00:00
63b2743338 Tweaked garrison healing. Temple is now more important for healing than before.
This was SVN commit r11297.
2012-03-10 05:55:18 +00:00
4b7a5ac814 Allows garrison heal rate of "0" (disables healing).
This was SVN commit r11296.
2012-03-10 04:08:15 +00:00
39844eaadc tweaked this map
This was SVN commit r11295.
2012-03-10 02:10:03 +00:00
48b744a7f5 Fixed blue player color.
This was SVN commit r11294.
2012-03-10 01:36:33 +00:00