1
0
forked from 0ad/0ad
Commit Graph

7286 Commits

Author SHA1 Message Date
49721cff33 Increasing the generation speed of the maps: Unknown Land
This was SVN commit r14162.
2013-11-13 14:30:27 +00:00
62551be685 New Random Map: Mainland. A simple map without any body of water. Also the space between the forests is increased. Optimizing the map for relatively lag-free games.
This was SVN commit r14161.
2013-11-13 13:36:47 +00:00
0d323c020b Increasing the generation speed of the maps: Archipelago, Gulf of Bothnia, Lorraine Plain
This was SVN commit r14160.
2013-11-13 13:17:22 +00:00
5dac329c78 Increasing the generation speed of the maps: Aegean Sea
This was SVN commit r14159.
2013-11-13 10:20:22 +00:00
65bd13ac1e Increasing the generation speed of the maps: Syria
This was SVN commit r14158.
2013-11-13 08:07:05 +00:00
4acbf86ffb Trying to fix crazy elephant armature
This was SVN commit r14157.
2013-11-12 21:30:25 +00:00
2f0d6ee1e8 Upgraded asian elephant animations.
This was SVN commit r14156.
2013-11-12 19:13:45 +00:00
17fdb515f4 fix error when selecting multiple elephants
This was SVN commit r14155.
2013-11-12 19:03:12 +00:00
7cb4c0dcfc Partial fix of minimap rendering for GLES.
Replaces glBegin/End with glDrawArrays, GL_QUADS with GL_TRIANGLES, and
modifies shaders as needed.

This was SVN commit r14153.
2013-11-12 01:31:52 +00:00
7dec618898 Some attempts to fix GLES build in smooth LOS and post proc manager.
Replaces glBegin/End with glDrawArrays, GL_QUADS with GL_TRIANGLES, and
replaces glPush/PopAttrib by resetting the viewport manually.
Adjusts GLSL shaders for these changes.

This was SVN commit r14152.
2013-11-12 01:30:17 +00:00
54abce1a3c hellenic walltower rotated 180 to match the droppoint with the wall RMS
This was SVN commit r14147.
2013-11-12 00:05:26 +00:00
df1d5d2260 fix tag 2102648f7c which had unwanted changes
This was SVN commit r14146.
2013-11-11 16:29:44 +00:00
0e74e3a521 Removed Ostorius.
This was SVN commit r14145.
2013-11-11 16:09:00 +00:00
2102648f7c Allows autogarrison of newly trained units, fixes #1044
This was SVN commit r14144.
2013-11-11 15:37:16 +00:00
fad8f7fce0 adds some needed protection
This was SVN commit r14143.
2013-11-11 15:03:22 +00:00
4406be3a69 Fix crash when trying to join the lobby again if the host disconnected in the game setup screen.
This was SVN commit r14137.
2013-11-10 22:42:48 +00:00
f070bf9d1e Prohibit the user from picking the 'system' lobby name, as that's reserved for special messages.
This was SVN commit r14136.
2013-11-10 21:52:38 +00:00
e01445818a Nerf/rebalance siege towers.
- Armor changed from 2h/20p/10c to 5h/20p/2c
- Attack changed from 25p to 10p/5c
- Bonus added: 2x vs structures
- Ranged reduced from 65 to 55
- Elevation bonus of 10 added
- PreferredClasses is now 'Structure'
- Ungarrisoned arrow count decreased to 0 from 2
- Build time increased to 60 from 50
- BuffHeal is now 0 (decreased from 1)
- Health reduced from 800 to 500
- Walking speed reduced to 5 from 6

The idea is for siege towers to be useful for siege, but also for
cleaning out large numbers of units. Previously they were very good at
the latter and useless for the former. They should still be very
powerful units, but not uncounterable and massing siege towers
(previously unbeatable if enough were acquired) should no longer be
feasible.

This was SVN commit r14135.
2013-11-10 20:21:50 +00:00
2811d4c367 Fixed this map.
This was SVN commit r14134.
2013-11-10 19:22:24 +00:00
912e485a64 Elephant changes and tweaks.
This was SVN commit r14133.
2013-11-10 19:08:38 +00:00
85e9a2b0ce Added 3 idle animations and attack, death and walk animations for all asian elephants.
Maurya hero howdah added with normal and specular maps

This was SVN commit r14132.
2013-11-10 17:39:04 +00:00
a2477f9d40 Increasing the generation speed of the maps: Alpine Lakes
This was SVN commit r14131.
2013-11-10 17:29:40 +00:00
59da5fad2a Fix some spidermonkey lobby complaints when run in strict mode.
This was SVN commit r14127.
2013-11-10 04:09:03 +00:00
174f636fd2 Fixes tests
This was SVN commit r14126.
2013-11-10 03:24:29 +00:00
37cedb8133 Make filters work and add a skirmish map filter.
This was SVN commit r14125.
2013-11-10 00:45:19 +00:00
4fb6896fd8 Fix warning when the hosted game is a random rms.
This was SVN commit r14124.
2013-11-09 23:57:31 +00:00
dcb3c0ad7a Increasing the generation speed of the maps: Continent
This was SVN commit r14120.
2013-11-09 16:00:01 +00:00
d3fade285b Basic Nubian archer textures.
Map preview for Corsica and Sardinia.

This was SVN commit r14119.
2013-11-09 14:42:32 +00:00
2d2853dd6f Fix problems with EndGameManager in Atlas by waiting for the first turn
This was SVN commit r14118.
2013-11-09 10:09:28 +00:00
3a278df3f7 Move ship to shoreline when tasking units to garrison inside, fixes #1391
This was SVN commit r14115.
2013-11-08 23:22:59 +00:00
81cf02cc13 Fix building with --without-lobby. Fixes #2249.
This was SVN commit r14113.
2013-11-08 15:28:44 +00:00
0f8d3e23db ;
This was SVN commit r14112.
2013-11-08 15:28:38 +00:00
da6abe630a Fix error message on starting game due to missing global variable.
This was SVN commit r14110.
2013-11-08 09:52:48 +00:00
7547dae0e2 Fixing the revert by the previous commit.
This was SVN commit r14109.
2013-11-08 08:04:35 +00:00
f88b5be079 Increasing the generation speed of the maps: Islands, Lake.
This was SVN commit r14108.
2013-11-08 08:02:32 +00:00
bb28e0eb70 Fix some system message/spam filter bugs in the lobby.
This was SVN commit r14107.
2013-11-08 00:57:58 +00:00
62b92af925 Fix lobby registration errors.
This was SVN commit r14105.
2013-11-07 22:07:26 +00:00
bffe917914 Multiplayer lobby based on the XmPP protocol. Special thanks to Philip, alpha123, scythetwirler, and anyone else who has helped build, debug or test the lobby.
This was SVN commit r14098.
2013-11-07 20:07:24 +00:00
fe0510c079 Again increasing the generation speed of Islands random map by using the new chain placer. As a side effect, the map is more beautiful.
This was SVN commit r14095.
2013-11-07 19:02:09 +00:00
3743e58f9a allow enabling the game clock as a persistent setting
This was SVN commit r14092.
2013-11-07 18:06:52 +00:00
6d62b3bf40 Added a new "placer" function for the rmgen library.
This new placer generates terrain features that are less "predictable".
It also increases the map generation time considerably.

Currently it is only implemented on Persian Highlands random map.

This was SVN commit r14091.
2013-11-07 14:50:16 +00:00
b7751a277c Cleanup
This was SVN commit r14090.
2013-11-07 12:38:41 +00:00
5ec4962184 Decreasing the generation time of Islands random map to about 2/3 of the original.
This was SVN commit r14089.
2013-11-07 12:00:04 +00:00
9b98585275 Remember the last market for back-to-order trading, fixes #2248
This was SVN commit r14088.
2013-11-06 21:07:19 +00:00
9ffe235b2f Clean up EndGameManager. Fixes #2130
This was SVN commit r14087.
2013-11-05 19:40:50 +00:00
68fa9f4631 Fix building contstruction, but still don't allow positive regenrate for unhealable entities
This was SVN commit r14086.
2013-11-05 17:45:39 +00:00
24bc451852 Corsica and Sardinia skirmish map. Needs Iberian circuit wall.
This was SVN commit r14085.
2013-11-05 16:12:58 +00:00
8540740b35 disallow healing of unhealable entities via all ways
This was SVN commit r14084.
2013-11-05 07:07:10 +00:00
6fae05b5f6 fix
This was SVN commit r14083.
2013-11-03 17:41:59 +00:00
0362453035 test some components before use, adresses #2206
This was SVN commit r14082.
2013-11-03 17:18:43 +00:00
53a270347a Map preview for Zagros Mtns.
Changed preview for Greek acrpolis.

Fixed quote attribution. Thanks anfialro.

This was SVN commit r14081.
2013-11-03 16:39:28 +00:00
f1100f10c1 Standardized Cav Spearmen animations.
This was SVN commit r14080.
2013-11-03 14:17:33 +00:00
c62cc3ee44 rename technology modifier 'multiplier' to 'multiply' for consistency with auras, and it looks better next to the existing 'add'
This was SVN commit r14079.
2013-11-03 14:09:32 +00:00
e4f2ddb738 Renamed a bunch of maps.
This was SVN commit r14078.
2013-11-03 14:06:49 +00:00
5dc553bf91 More shield changes.
Tweaked number of 5-pop houses on Sicilia skirmish map.

New "Sahel" Skirmish map.

This was SVN commit r14077.
2013-11-03 14:01:45 +00:00
34e09220a4 Normal and spec maps for a bunch of shields.
This was SVN commit r14076.
2013-11-03 13:36:16 +00:00
e0161bd355 small code style fix
This was SVN commit r14075.
2013-11-03 13:15:44 +00:00
6dca6910c3 Recursively count garrisoned units to avoid overcapacity
This was SVN commit r14074.
2013-11-03 13:13:30 +00:00
37f5aa5351 Standardized animations for cavalry swordsmen. Will do the same for cavalry spearmen. This is to help the player differentiate the unit types better.
This was SVN commit r14072.
2013-11-03 10:31:57 +00:00
768c821f13 Acropolis 7 scenario renamed to "Acropolis Night."
Cycladic Archipelago 06 and Deccan Plateau 01 scenarios deleted.

Gambia River skirmish map (still needs 2 out of 3 Iberian wall
circuits).

This was SVN commit r14071.
2013-11-03 10:14:43 +00:00
096fc43f9e Three new skirmish maps. 2 need Iberians walls though.
Deleted a couple of scenarios.

This was SVN commit r14070.
2013-11-03 09:51:16 +00:00
f4bd08427c Trader speed tech!
This was SVN commit r14069.
2013-11-03 05:40:43 +00:00
8aa6485d78 Fix shader errors with OpenGL ES
This was SVN commit r14067.
2013-11-02 22:58:38 +00:00
ba5b572ccc Iberian walls for Caspian Sea skirmish map.
Rubble for these houses.

This was SVN commit r14066.
2013-11-02 16:54:15 +00:00
c1c45bd7c8 Caspian Sea skirmish map.
Clouds.

This was SVN commit r14065.
2013-11-02 15:28:33 +00:00
ce7c97b79f Improve back to work behaviour (queues taken into account), fix #2206, patch from Itms
This was SVN commit r14063.
2013-11-01 22:00:06 +00:00
358e8f5992 Remove ResourceGatherer for animals
This was SVN commit r14062.
2013-10-31 19:37:42 +00:00
552a4527ca Iberian walls for Deccan Plateau skirmish map.
Specific Name for Mauryan maiden guards (Visha Kanya).

Clarified the Iberian json a bit.

Some tooltip tweaking.

This was SVN commit r14060.
2013-10-31 17:21:10 +00:00
543ec3a8c7 Fix launching skirmish maps without selecting a civ
This was SVN commit r14059.
2013-10-30 17:01:11 +00:00
60fb5ed1c3 - Fix garisson and formation aura types
- Implement tech mods for UnitMotion speeds, Fixes #1958, based on patch
by wraitii
- Implement athen_hero_themistocles ship speed aura as a test

This was SVN commit r14058.
2013-10-30 16:12:53 +00:00
11c7c44a0b Fixed typos reported in Transifex by qwertz and Loki.
This was SVN commit r14056.
2013-10-29 23:22:09 +00:00
b67c411b33 Fix typos in template files. Refs #2185.
This was SVN commit r14055.
2013-10-28 20:26:35 +00:00
15f09f7005 Fix typos in civilization files. Refs #2185.
This was SVN commit r14054.
2013-10-28 20:21:27 +00:00
538c250d67 Fix typos in descriptions of random maps. Refs #2185.
This was SVN commit r14053.
2013-10-28 20:19:09 +00:00
dd7445262c Typo: enemey → enemy.
This was SVN commit r14052.
2013-10-28 20:01:51 +00:00
fcde137b30 Viriato.
This was SVN commit r14051.
2013-10-28 14:35:25 +00:00
3173722099 Copy this.entites in GarrisonHolder before passing and modifying it. Patch by mimo. Fixes #2238.
This was SVN commit r14049.
2013-10-27 16:37:51 +00:00
31e79e6709 Reorders the game setup drop list for maps.
This was SVN commit r14048.
2013-10-26 15:20:13 +00:00
30af350e31 New Neareastern Badlands skirmish map and it's awesome with Whizbang Graphics (WBG) enabled.
Tweaked some stuff on a few maps.

Fixed Iberian Walls for Nile River skirmish.

Changed names for Ptolemaic warships.

A couple of technology portraits for Advanced and Elite upgrades (these
techs are not implemented, but planned).

This was SVN commit r14047.
2013-10-26 15:10:15 +00:00
OmriLahav
597da2ff9d Alpha 14 remake
This was SVN commit r14045.
2013-10-26 11:10:21 +00:00
a45b074b07 Renamed the Arabian Oasis maps to Libyan Oasis, because the Egyptian eye candy assets insinuate the Libyan Desert instead of the Arabian Desert.
Changed Nile River maps to "naval" maps because the AI gets stuck trying
to cross the river.

Renamed the "ptol" statue ruins to "egyptian" statue ruins. Makes them
more generically "Egyptian".

Ensured siege engines can only be built in City Phase.

This was SVN commit r14044.
2013-10-26 10:31:52 +00:00
64dc783a18 Simplified the Spartan population penalty.
Changed costs on a few units.

New tooltips and hero auras for Carthaginian heroes Hannibal, Hamilcar,
and Maharbal. (see: wiki civ profile)

Fixed specificname for some Carthaginian units.

Added a field entity for "skirmish" maps.

This was SVN commit r14043.
2013-10-26 09:40:21 +00:00
fe6d508a82 Punjab skirmish map.
Some map tweaks.

This was SVN commit r14042.
2013-10-26 03:07:03 +00:00
1ee4c52779 All 4 players on Nile River skirmish map now have Iberian walls.
This was SVN commit r14041.
2013-10-25 09:00:46 +00:00
10ddc2aed6 Fixed starting unit for Ptolemies.
Nile River skirmish map (still needs Iberian walls for 2 of the
players).

New map preview for Arabian Oasis.

Moved Civic Center back to Town Phase, but made it take twice as long to
build.

Fixed elephant template.

Fixed up Persian Highlands skirmish map based on some notes from
Alpha123.

This was SVN commit r14040.
2013-10-25 08:02:55 +00:00
OmriLahav
14166af0ac This was SVN commit r14038. 2013-10-24 09:46:26 +00:00
4e86b00a05 Remove inconsistencies in the manual. Refs #2185.
Fix player name.
Make log messages when saving games use quotes around paths.

This was SVN commit r14037.
2013-10-23 22:18:40 +00:00
2117f77812 Fixed some resource placement.
This was SVN commit r14033.
2013-10-20 01:18:59 +00:00
50a2bddf77 Fixed some goats.
This was SVN commit r14032.
2013-10-20 01:10:02 +00:00
34d927f25c These two skirmish maps are now complete with walls for Iberians.
This was SVN commit r14031.
2013-10-19 23:52:28 +00:00
15f565f316 Corinthian Isthmus and Persian Highlands skirmish maps (wip).
This was SVN commit r14030.
2013-10-19 20:54:41 +00:00
742c489353 Fix typos, remove BOMs and add newlines before EOF. Refs #2185. Patch by Gallaecio.
This was SVN commit r14029.
2013-10-19 20:13:48 +00:00
71a41ba401 Line endings. Refs #2185.
This was SVN commit r14028.
2013-10-19 20:07:20 +00:00
45d4e92782 Fixed building requirements for Town Phase.
Changed Brit Wonder to the new Stonehenge model. :)

Trying out some new hunting changes from sanderd. Might just be
temporary. Refs #2092

This was SVN commit r14027.
2013-10-19 18:20:25 +00:00
c0b628bcac Fix some typos. Patches by Swyter (Spanish translator). Fixes #2210, #2211.
This was SVN commit r14022.
2013-10-18 20:33:08 +00:00
5778484a77 Refactor text renderer
Replace unifont with CFont and CFontManager, since the h_mgr interface
was
needlessly inconvenient.

Load the font textures through CTextureManager, to support dynamic
reloading (e.g. when resetting GL state - see #741).

Add CFontMetrics as a convenient wrapper for code that just wants to
measure text.

Fixes #1117.

This was SVN commit r14016.
2013-10-18 15:53:07 +00:00
9802adf92f celt_stonehenge with normal and spec maps. Fixes #2053
This was SVN commit r14013.
2013-10-18 14:29:10 +00:00
f3968c0d4c fix some flaws in the preferred classes. Patch by Jammus, Fixes #1985
This was SVN commit r14011.
2013-10-16 19:08:01 +00:00
e6d9094c98 Remove InitSavedGame, but keep the rallypoint problem it solved. Fixes #1762, Patch by mimo.
This was SVN commit r14010.
2013-10-16 17:58:12 +00:00
OmriLahav
6c3c6cfd3a This was SVN commit r14009. 2013-10-16 14:08:47 +00:00