e969340b6c
Fix diplomacy for atlas.
...
This was SVN commit r12827.
2012-11-05 19:34:21 +00:00
c1da925786
Change some scenario water settings. Refs #1711 .
...
This was SVN commit r12825.
2012-11-05 17:31:28 +00:00
9ebdeff90e
mauryan fortress small fix
...
This was SVN commit r12824.
2012-11-05 16:30:57 +00:00
d52cac9c1a
Mauryan fortress commited, second mauryan texture (maur_struct_b.png) commited.
...
This was SVN commit r12823.
2012-11-05 16:15:15 +00:00
76676b1e38
Fix a non-fatal GL error, fix me forgetting to commit a file, remove the "3D" waviness setting as it was mostly redundant with HQ.
...
This was SVN commit r12822.
2012-11-05 12:14:04 +00:00
1e3c885f45
Allow trading with neutral players.
...
This was SVN commit r12821.
2012-11-04 23:01:12 +00:00
d8f22c860d
Fix when not using shadows.
...
This was SVN commit r12820.
2012-11-04 20:39:01 +00:00
e633196698
Updates the Belgian Bog settings. Changes the water shader to have refraction look more similar between different quality levels.
...
This was SVN commit r12818.
2012-11-04 18:07:41 +00:00
ed7c66eb82
Updates the water settings: features can now be enabled individually for more modularity. Fixes a few bugs. Allows it to be run at an acceptable speed in Atlas.
...
This was SVN commit r12817.
2012-11-04 15:54:36 +00:00
7848f4edef
Fixes Roman Mars temple by dvangennip, adds garrison prop point and fixes collada warning (unknown polygons set input). Fixes #1708
...
This was SVN commit r12816.
2012-11-03 21:08:17 +00:00
1048ab4a1d
Fixed water color in Belgian_Bog_night.xml, fixed normals in maur_long_sword.dae
...
This was SVN commit r12815.
2012-11-03 14:00:06 +00:00
b90a4ef776
Fixes some typos in civ json files, patch by grillaz. Fixes #1168
...
This was SVN commit r12814.
2012-11-02 23:07:42 +00:00
21e284f8eb
Adds the Belgian Uplands random map, and the Polynesia (Water Demo) demo scenario.
...
This was SVN commit r12813.
2012-11-02 21:18:46 +00:00
a0e13d9625
Fix tests. BuildingAI now handles DiplomacyChanged messages.
...
This was SVN commit r12812.
2012-11-02 17:20:32 +00:00
d75ae52f56
Particles now correctly update with the fog. Refs #276 .
...
This was SVN commit r12811.
2012-11-02 16:31:27 +00:00
9930500661
Diplomacy is now mutual. Refs #7 .
...
This was SVN commit r12810.
2012-11-02 13:44:35 +00:00
a3ddd7b1b3
Fix for some problems when using shadows with the superfancywater.
...
This was SVN commit r12809.
2012-11-02 13:08:58 +00:00
114593b9ad
Fix the "Advanced water" box from being ticked when then it shouldn't be on loading.
...
This was SVN commit r12808.
2012-11-02 09:59:15 +00:00
f63b795906
Fixed Mauryan shields origin and thickness, fixed mauryan club and spiked mace
...
This was SVN commit r12807.
2012-11-01 15:31:01 +00:00
cf23990192
Updates random maps with new settings for the new water shader. Type ambiguity tweaks in WaterManager.
...
This was SVN commit r12806.
2012-11-01 10:17:54 +00:00
f3984a6c0e
Forgot the waves shader.
...
This was SVN commit r12803.
2012-10-31 18:54:10 +00:00
fb035d08e3
fixes #1572 and fixes #932
...
Changes the water rendering in game to support higher quality effects
and to look nicer.
This was SVN commit r12802.
2012-10-31 18:42:17 +00:00
97b46d402c
Removing GL3 dependency from GPU skinning code.
...
This was SVN commit r12801.
2012-10-30 21:57:00 +00:00
608e01a5b2
Iberian walls and Roman gate use normal/parallax mapping now.
...
This was SVN commit r12800.
2012-10-30 18:31:05 +00:00
c5fae74ac7
Normal mapping for Craterus.
...
This was SVN commit r12799.
2012-10-30 17:34:40 +00:00
367c67d6ad
GPU-skinned tangent-space effects for non-instanced units, plus a bit of cleanup.
...
This was SVN commit r12795.
2012-10-29 13:20:21 +00:00
ae4b3cc9b6
Fixed player color for Mauryan shields.
...
Made a "Boudicca swordswoman" for fun.
This was SVN commit r12794.
2012-10-29 00:46:33 +00:00
0353177a94
This was SVN commit r12793.
2012-10-28 23:19:19 +00:00
37d3adcf23
Females now have an attack animation.
...
"Short hair" female head texture, ready for a turban prop.
This was SVN commit r12792.
2012-10-28 22:08:45 +00:00
8f573c9aae
New Mauryan shields.
...
New Mauryan weapons.
Mauryan champion infantry is now a mace man.
Resized Mauryan swordsman textures.
This was SVN commit r12791.
2012-10-28 00:34:03 +00:00
22b2343192
Fix name/color in diplomacy messages.
...
This was SVN commit r12790.
2012-10-27 23:31:16 +00:00
cb8123ffc9
Maiden Guard Archer, until we can combine them into one unit.
...
This was SVN commit r12789.
2012-10-27 22:52:08 +00:00
5d960a136a
Bactrian archer cav.
...
Tweaked HQDOF settings.
This was SVN commit r12788.
2012-10-27 22:18:29 +00:00
gregory
cd79b8e57b
Changed DOF size and position.
...
This was SVN commit r12787.
2012-10-27 21:26:33 +00:00
5ef6d1f92b
Adds "English Channel" random map.
...
This was SVN commit r12786.
2012-10-27 13:03:34 +00:00
gregory
97554bd726
Made sampling code remove blurring from around fully-focused foreground objects and cleaned up some of the code a bit.
...
This was SVN commit r12785.
2012-10-26 05:25:50 +00:00
7bd5872dd7
Fixed info in Rome civ json
...
This was SVN commit r12784.
2012-10-25 16:28:13 +00:00
749b685c64
Mauryans selectable in random map.
...
Fixed animations for Mauryan sword dudes.
Added placeholder Mauryan heroes.
This was SVN commit r12783.
2012-10-25 07:42:31 +00:00
9dc1724e57
Mauryan Maiden Guard.
...
This was SVN commit r12782.
2012-10-24 18:32:50 +00:00
ca4dedbc3e
Improve neutral and ally combat handling. Refs #7 .
...
This was SVN commit r12780.
2012-10-23 23:13:39 +00:00
c98a97924d
Fix some inconsistent newline characters from 902fc4a541 in unit_commands.js via unix2dos. Refs #1432
...
This was SVN commit r12779.
2012-10-23 20:42:03 +00:00
a21e01150a
Basic diplomacy. Refs #7 .
...
This was SVN commit r12778.
2012-10-23 16:31:07 +00:00
8208b52faf
Testing new hero selection ring.
...
This was SVN commit r12777.
2012-10-21 22:30:04 +00:00
932bb87046
New spec and normal maps for some Mediterranean terrains.
...
This was SVN commit r12776.
2012-10-21 22:28:04 +00:00
4a8e14004c
Make markets and traders non conquest critical (from alkazar).
...
This was SVN commit r12775.
2012-10-21 20:59:54 +00:00
gregory
9698b67400
Made manual DOF scale with focus.
...
This was SVN commit r12774.
2012-10-20 23:39:56 +00:00
347b5e18cf
Aviv's adjustment to the tooltips for trading.
...
This was SVN commit r12773.
2012-10-20 21:36:36 +00:00
gregory
753d151959
Added comments listing the changes from the original shader by Martinsh.
...
This was SVN commit r12772.
2012-10-18 20:06:25 +00:00
gregory
e963b43dcc
Made bokeh DOF blur stronger, made it use the postproc manager's zNear and zFar values, and moved its settings into its effect XML file.
...
This was SVN commit r12771.
2012-10-18 18:52:52 +00:00
0981911542
Test strat map city.
...
This was SVN commit r12770.
2012-10-18 18:18:10 +00:00
cc88d057ee
This was SVN commit r12769.
2012-10-18 18:17:56 +00:00
ec8b49e822
Fixing a small bug suggested by FeXoR.
...
This was SVN commit r12768.
2012-10-18 18:03:01 +00:00
2cb81bc87a
Adding a new cheat
...
This was SVN commit r12766.
2012-10-18 13:13:41 +00:00
742a68d055
Adding Syria random map. Updating the preview of Unknown random maps.
...
This was SVN commit r12765.
2012-10-18 06:34:14 +00:00
gregory
2c292798bc
Changed sample count on high-quality DOF to increase performance.
...
This was SVN commit r12764.
2012-10-18 01:31:13 +00:00
gregory
43ad3569e1
Added higher-quality DOF postproc filter.
...
This was SVN commit r12763.
2012-10-18 01:21:24 +00:00
7fafeec767
Fixes splash screen to display only once at startup. Fixes #1701 .
...
Adds some spacing between splash screen icons and text.
This was SVN commit r12762.
2012-10-17 20:33:50 +00:00
8e48beeeef
Added Belgian_Bog_night map
...
This was SVN commit r12761.
2012-10-17 16:32:34 +00:00
71b27dd281
Post processing updates to these maps.
...
This was SVN commit r12760.
2012-10-16 18:10:20 +00:00
gregory
092498f961
(hopefully) fixed errors with the boar skeleton.
...
This was SVN commit r12757.
2012-10-15 19:30:29 +00:00
9177683653
Match setup GUI revamp. Adds pop-cap and starting resource options. Refs #802
...
This was SVN commit r12756.
2012-10-15 15:19:24 +00:00
1fb7889539
Postproc manager
...
This was SVN commit r12755.
2012-10-15 10:34:23 +00:00
gregory
538286054a
Just some floating barrels.
...
This was SVN commit r12754.
2012-10-15 03:38:47 +00:00
cb3e94a746
New wood gathering tech (iron axes) at the Mill, paired with a capacity tech (wheelbarrows).
...
New special technologies for the Carthaginian faction: Colonisation
(research at the Civ Centre) and Exploration (research at the Super
Dock).
New special technology for the Macedonians: Hellenistic Metropolis
(research at the Library).
Athenian special tech Iphicratean Reforms now unlocks Cretan archers for
the Athenian Triremes.
Sandbox scenario for Macedonians.
This was SVN commit r12753.
2012-10-15 03:11:17 +00:00
93c21d8965
Reordering these sandbox maps by renaming them.
...
This was SVN commit r12752.
2012-10-15 01:54:15 +00:00
b581e54185
This was SVN commit r12751.
2012-10-15 00:59:05 +00:00
51496f1d40
Restructured phase_city techs so that phase_city is auto researched.
...
This means that there can be civ specific techs for phase_city, but
phase_city is always researched so can be used as a requirement.
Added phase_city_generic which is the tech which will actually be
researched from the building.
This was SVN commit r12750.
2012-10-14 16:12:22 +00:00
dd462c5b8f
Moved these civ bonus techs to their civ folders.
...
This was SVN commit r12749.
2012-10-13 20:51:12 +00:00
57a8fcc724
-Mauryan population cap bonus (+10%)
...
-Persian population cap bonus (+10%)
-"Immortals" technology for Persians. Reduces training time for Anusiya
by half. This is their "special" for now, since they are otherwise
unchanged from the default Champion Spearman.
-"Persian Architecture" technology for Persians (removes the inherent
health bonus and makes it a "special tech" instead).
-Added the Spartan City Phase civ bonus. Spartan citizen-soldiers now
promote directly from Basic to Elite after one kill. Pop cap is reduced
by -10% at the City Phase to balance.
-Updated civ JSON files (and their civ profiles on Trac).
-Adds map preview image for Acropolis 7.
This was SVN commit r12748.
2012-10-13 20:38:40 +00:00
7f8adcf8cb
Adding the demo Unknown-Nomad map.
...
This was SVN commit r12747.
2012-10-11 15:32:10 +00:00
6fd4a75312
This was SVN commit r12745.
2012-10-08 18:10:29 +00:00
fa6ce56fde
This was SVN commit r12744.
2012-10-08 17:42:47 +00:00
a27ef1c4b4
Adjusted some destruction dust to better hide the building->rubble transition.
...
This was SVN commit r12743.
2012-10-08 17:36:57 +00:00
a9417be899
Set some buildings to spawn stone_rubble 2x2, and added custom decals sizes for wall segments rubbles.
...
This was SVN commit r12742.
2012-10-08 00:51:24 +00:00
6f4b3b6e5c
This was SVN commit r12741.
2012-10-07 23:10:18 +00:00
3a816f0616
This was SVN commit r12740.
2012-10-07 22:21:20 +00:00
7d0e660fbb
Added Player/MaxPopulation for technologies.
...
This was SVN commit r12739.
2012-10-07 22:19:03 +00:00
cc34cf169c
Nerfed stone throwers based on gameplay and discussion with quantumstate. More game testing will be needed.
...
Tweaked some rubble stuff.
This was SVN commit r12738.
2012-10-07 21:19:01 +00:00
6a100996bf
Added civ requirement for technologies.
...
This was SVN commit r12737.
2012-10-07 20:34:37 +00:00
14d74055ef
Lowered the cost of 5 pop houses after discussion with quantumstate.
...
This was SVN commit r12736.
2012-10-07 18:05:36 +00:00
5ce5ef9286
Adds a splashscreen that appears on startup and informs the player about the status of the game (bugs, missing features). The splashscreen can be disabled for future startups by unckecking a checkbox on the splashscreen.
...
This was SVN commit r12735.
2012-10-07 12:43:08 +00:00
fc294e5ff9
Added rubble_stone_6x6 and set to CC deaths
...
This was SVN commit r12734.
2012-10-06 14:04:18 +00:00
45de2907ea
Added prop points for falmes to rubble_stone_3x3.dae
...
This was SVN commit r12733.
2012-10-06 11:21:13 +00:00
06d0c05a31
Spec and Normal maps for Mediterranean grass terrains.
...
This was SVN commit r12732.
2012-10-06 06:49:11 +00:00
868c5488b1
Added mountains and mountain passes to Oasis 11.
...
This was SVN commit r12731.
2012-10-05 18:09:17 +00:00
35b1a5305d
Enrique's stone rubble mesh and actor for 3x3 footprints (large houses).
...
This was SVN commit r12730.
2012-10-05 18:07:30 +00:00
9e328e6b9f
Changing sky manager to render sky using cubemaps, to avoid duplication of sky textures in memory.
...
This was SVN commit r12727.
2012-10-03 12:40:01 +00:00
222256bd59
This was SVN commit r12725.
2012-10-01 01:47:01 +00:00
85c8fa9aec
A test normal map for units. Causes error though.
...
This was SVN commit r12724.
2012-10-01 00:01:46 +00:00
7c7ab773a7
Normal map for destroyed farm field rubble actor.
...
Defense Towers added to Oasis 1 for a little variation.
This was SVN commit r12723.
2012-09-30 02:34:06 +00:00
01e36d1756
Added heroes to Persians Sandbox.xml
...
New farm field "rubble" actor. Looks pretty good. May need a normal map
to look excellent.
This was SVN commit r12722.
2012-09-30 00:55:52 +00:00
6820ee1fc3
Spec and normal maps for farm fields.
...
This was SVN commit r12721.
2012-09-30 00:05:42 +00:00
c4267fb3f8
This was SVN commit r12720.
2012-09-29 21:45:04 +00:00
439f67b5d8
3x3 Destruction mesh for example purposes. Others will need to make other rubble meshes based on this example.
...
Place and "delete/destroy" a Greek house to see in action.
This was SVN commit r12719.
2012-09-29 21:43:55 +00:00
03261b8ade
Adds rubble entities to most structures. This and bf55acadaa based on patch by quonter. Refs #1166
...
This was SVN commit r12718.
2012-09-28 22:06:07 +00:00
bf55acadaa
Implements SpawnEntityOnDeath property for entities (i.e. rubble). Fixes #1166 .
...
Adds some placeholder rubble entities. They currently reuse foundation
actors until proper rubble models are created.
This was SVN commit r12717.
2012-09-28 22:02:13 +00:00
9fadd9017f
Fixing the name of tamarix tree.
...
This was SVN commit r12714.
2012-09-27 08:15:53 +00:00
59f3f1830c
This was SVN commit r12713.
2012-09-27 06:23:53 +00:00
fb6493d33c
This was SVN commit r12712.
2012-09-27 06:23:19 +00:00
a9ae4e2c80
This was SVN commit r12711.
2012-09-27 06:15:28 +00:00
4c8159d47f
Adding cultures to the civs. Fixing the recent problem with random maps.
...
This was SVN commit r12710.
2012-09-27 06:12:25 +00:00
e72b603cce
Implements Vision/Range tech modification
...
This was SVN commit r12707.
2012-09-24 22:27:32 +00:00
ef81521dc9
Stop a technology from being queued multiple times.
...
Also fixed formatting in Attack.js
This was SVN commit r12706.
2012-09-24 20:20:14 +00:00
94f469e705
Added a Slaughter attack type which instantly kills all herdable animals with a melee attack. Fixes #1652 .
...
This was SVN commit r12705.
2012-09-24 19:31:31 +00:00
e464332c74
Fixing a bug in "random" map selection.
...
This was SVN commit r12704.
2012-09-24 11:13:37 +00:00
4c37e8de95
Adds hotkey for forcing unit attack (useful for destroying enemy farms), based on patch by quonter. Fixes #1489
...
This was SVN commit r12703.
2012-09-24 01:14:21 +00:00
de6653e255
Adds max attack range to training tooltip and unit details panel for ranged units.
...
Adds attack type to unit details panel. Refs #1657
This was SVN commit r12700.
2012-09-23 20:50:23 +00:00
b8baa54722
Implements Health/Max tech modification
...
This was SVN commit r12699.
2012-09-23 19:24:43 +00:00
7064e0673c
Adds TechnologyModification message for newly created entities, so they are notified of previously researched techs (this will streamline implementation of certain techs). Fixes #1410
...
This was SVN commit r12698.
2012-09-23 19:19:57 +00:00
8a57ed2e7b
Updated Persian stables portrait.
...
This was SVN commit r12696.
2012-09-20 17:43:39 +00:00
4b7ff6f375
Higher health for the Persian gardens.
...
This was SVN commit r12695.
2012-09-20 17:19:51 +00:00
d6ffba5e43
Updated Persian sandbox demo map.
...
This was SVN commit r12693.
2012-09-20 17:10:42 +00:00
9340e0bf8a
Fixed texture typo.
...
This was SVN commit r12692.
2012-09-20 17:04:31 +00:00
7cab4f2bce
Persian gardens template. Some normal and spec maps for Persian structures. Someone else please redo them, as they suck.
...
This was SVN commit r12691.
2012-09-19 18:13:11 +00:00
bead0319ab
Fixed gardens_water to no longer cast shadows. Updated gardens_struct and waterfall
...
This was SVN commit r12690.
2012-09-18 23:28:58 +00:00
94c15987d6
added prop points to gardens_struct
...
This was SVN commit r12689.
2012-09-17 23:49:55 +00:00
811a0aa5a2
Fixed pers_gardens_waterfall.dae
...
This was SVN commit r12688.
2012-09-17 22:37:25 +00:00
4b1df39d55
Macedonian Library template.
...
This was SVN commit r12687.
2012-09-17 17:51:22 +00:00
bf5b7938f4
First attempt at adding waterfall splashes...
...
This was SVN commit r12686.
2012-09-17 12:22:21 +00:00
bdab01b381
Making the "random" option in the map selection dropdown orange. Refs #1668
...
This was SVN commit r12685.
2012-09-17 08:24:04 +00:00
91f3463bd3
Adding the "Random" option in map selection. Fixes #1668
...
This was SVN commit r12684.
2012-09-17 02:58:47 +00:00
a03ce4d904
Removes skeletal animated pine tree
...
This was SVN commit r12683.
2012-09-17 01:05:54 +00:00
b8e0f02b31
Updates remaining actors to new format
...
This was SVN commit r12682.
2012-09-17 00:55:45 +00:00
987d677072
Cleaning up some unused/duplicate files
...
This was SVN commit r12681.
2012-09-17 00:54:21 +00:00
7153c50d10
Mace_library, spart_sissyton and pers_gardens commited. New waterfall and gardens_turf textures added.
...
This was SVN commit r12679.
2012-09-16 18:05:28 +00:00
3dd887a193
Roman army camp icon
...
This was SVN commit r12678.
2012-09-16 16:53:52 +00:00
bdde574ade
Wall build orders shouldn't always be queued. Fixes #1673 .
...
This was SVN commit r12676.
2012-09-15 05:45:49 +00:00
c4c65c02ac
Need to explicitly return values to silence warnings.
...
This was SVN commit r12675.
2012-09-14 20:55:49 +00:00
27c390cdf2
Always abort the FSM transition when failing to enter a state. Fixes #1669 .
...
This was SVN commit r12674.
2012-09-14 20:00:03 +00:00
f91111aec8
Load default MP player name from the config.
...
This was SVN commit r12673.
2012-09-14 05:38:29 +00:00
8bd54eef71
Handle nested garrison holder death properly.
...
This was SVN commit r12672.
2012-09-13 22:47:47 +00:00
f732fd801e
A bunch of stuff.
...
This was SVN commit r12670.
2012-09-13 18:22:09 +00:00
710ed7adb6
Some AI name stuffs.
...
This was SVN commit r12669.
2012-09-13 17:24:47 +00:00
c78ab91740
This was SVN commit r12668.
2012-09-13 17:13:17 +00:00
064c28408d
Fixing some tooltips from changeset 513876ffd6
...
This was SVN commit r12667.
2012-09-13 06:21:01 +00:00
4365cc639d
Default ai player names patch: Codes. Fixes #1582 .
...
This was SVN commit r12666.
2012-09-13 06:18:01 +00:00
513876ffd6
Default ai player names patch: Names
...
This was SVN commit r12665.
2012-09-13 06:17:03 +00:00
41e5f88aae
Support appending and global selection via the 'find idle' keys.
...
This was SVN commit r12664.
2012-09-12 21:37:04 +00:00
958fce0438
Prevent naval gatherers from trying to reach land drop sites.
...
This was SVN commit r12663.
2012-09-11 21:03:08 +00:00
7ff34fedc4
Turn formation Gather orders into GatherNearPosition if necessary.
...
This was SVN commit r12662.
2012-09-11 00:56:23 +00:00
820d6856ee
Map updates. Made "Reservoir" a demo map.
...
This was SVN commit r12661.
2012-09-10 17:21:09 +00:00
34b9bd4bca
Reservoir test map.
...
This was SVN commit r12660.
2012-09-09 21:15:54 +00:00
fdc3322eec
New treasure icon
...
This was SVN commit r12659.
2012-09-09 20:46:54 +00:00
0784d75dfe
Removed out-of-date, often-forgotten civilization count.
...
This was SVN commit r12657.
2012-09-09 18:52:47 +00:00
37cdcdc6fa
Removing use of textureGrad function in shaders, as it requires too new a version of OpenGL.
...
This was SVN commit r12656.
2012-09-09 14:53:34 +00:00
25682da568
Improving the layout of "Unknown" random map. Improving the random biome system. Adding "Unknown Land" random map.
...
This was SVN commit r12654.
2012-09-09 08:38:36 +00:00
7618625884
Tweaking Persian Highlands random map.
...
This was SVN commit r12653.
2012-09-09 07:19:11 +00:00
8e71ae35e7
Fixing the texture parameter of iceberg.
...
This was SVN commit r12652.
2012-09-09 04:28:35 +00:00
7d8ef7a2ef
Add support for non-integer GarrisonHolder regen rates; round health up in the GUI. Refs #1633 .
...
This was SVN commit r12651.
2012-09-09 00:52:10 +00:00
502311fe5c
Normal and spec maps for Tropic Cliff B.
...
This was SVN commit r12650.
2012-09-08 23:39:47 +00:00
