Commit Graph

8101 Commits

Author SHA1 Message Date
dde91b8c66 The attack notification should be less frequent.
This was SVN commit r14946.
2014-04-20 14:35:02 +00:00
2336f97ead Spartans get Oxybeles (but no Lithobolos).
This was SVN commit r14945.
2014-04-20 12:50:59 +00:00
ff77676c60 Fixed auras and tooltips for some heroes.
Added some techs for houses and removed some from the Civic Center.
Makes a lot more sense this way.

This was SVN commit r14944.
2014-04-20 11:36:23 +00:00
0bbf43dc5f upgraded sarissa's models
This was SVN commit r14943.
2014-04-20 00:34:48 +00:00
cf04dc9601 Missing units to use the new pikemen attack animation
This was SVN commit r14942.
2014-04-20 00:09:40 +00:00
78f8afd912 Changed some formation spacing.
This was SVN commit r14941.
2014-04-20 00:01:50 +00:00
4f4455ec3a Added new attack animation for pikemen
This was SVN commit r14940.
2014-04-19 23:56:05 +00:00
b387458e33 Syntagma formation animations added to all hellenic pikemen.
This was SVN commit r14939.
2014-04-19 23:35:25 +00:00
2e7e46b399 Moves some blacksmith techs to Village Phase for Celtic civs. Fixes #2473
This was SVN commit r14938.
2014-04-18 11:28:28 +00:00
831d3ae69f This was SVN commit r14937. 2014-04-16 16:32:15 +00:00
fe4f17fd73 Only send game report if ranking is enabled.
This was SVN commit r14936.
2014-04-16 14:00:09 +00:00
a9b34da617 Fix some merge conflicts 9e2d0b9506 missed.
This was SVN commit r14935.
2014-04-16 13:58:56 +00:00
9e2d0b9506 Fix #2404. Rating auto-configure TODO (eg 2v2 games do not automatically show as being unrated). See #2276.
This was SVN commit r14934.
2014-04-16 06:03:49 +00:00
47a516df34 Fix some JS warnings. Refs #2372.
This was SVN commit r14933.
2014-04-15 01:12:48 +00:00
e1488fee56 Add an 'explore map' option to the game setup.
This was SVN commit r14931.
2014-04-14 19:52:49 +00:00
a9d0a3bcae Fix how per tech modification affects work + fix the technologies that implement it. Fixes #2366
This was SVN commit r14930.
2014-04-14 16:33:00 +00:00
bb71823aee Make the actor tech-modifiable. Fixes #2243
This was SVN commit r14928.
2014-04-14 15:00:49 +00:00
1073382e3b Sorts the lobby player list, ignoring case
This was SVN commit r14927.
2014-04-13 18:29:32 +00:00
b08e364e81 New shipwreck models
This was SVN commit r14926.
2014-04-13 11:16:30 +00:00
106638a9b8 This was SVN commit r14925. 2014-04-13 09:42:55 +00:00
01decbcd90 Train time changes.
Unlock champions tech more expensive.

This was SVN commit r14924.
2014-04-13 09:05:02 +00:00
40e2a1e065 Fixes some javascript warnings in the lobby.
This was SVN commit r14923.
2014-04-13 01:48:24 +00:00
180aa5c60d Makes the moderator prefix visible in the chatbox.
This was SVN commit r14922.
2014-04-12 23:40:36 +00:00
5a0c1a799b Some more portraits. Updated the portrait for the Macedonian siege workshop.
Tweaked some sandbox maps.

This was SVN commit r14921.
2014-04-12 14:55:04 +00:00
f02a8a4c59 Some population techs.
Tweaking some training techs.

This was SVN commit r14920.
2014-04-12 13:39:19 +00:00
5740e22cd5 Fix health for these cavalry spearmen.
This was SVN commit r14919.
2014-04-12 11:52:39 +00:00
c2d1aece02 Fixed female citizen selections.
This was SVN commit r14918.
2014-04-12 10:36:37 +00:00
08c1c8ed2d Minor tweaks to some particles.
Updated quinquereme tip image and text.

Minor updates to some maps.

Seleucids now use some Ptolemies ship actors temporarily.

This was SVN commit r14917.
2014-04-12 07:13:37 +00:00
ad36c0eb7b Parse entity ids to numbers again
This was SVN commit r14916.
2014-04-11 12:35:50 +00:00
41b8d06e27 remove forgotten debug printouts
This was SVN commit r14915.
2014-04-10 21:00:40 +00:00
f41c51359f Mauryan trader actor missing
This was SVN commit r14914.
2014-04-10 20:56:12 +00:00
bb8e14fae1 some minor tweaks to petra ai
This was SVN commit r14913.
2014-04-10 20:25:02 +00:00
7840fd3049 fix capitalisation
This was SVN commit r14912.
2014-04-10 14:00:44 +00:00
7f77bb7cb0 Small improvements to entitycollection + add a serialization method (serialization is never executed though)
This was SVN commit r14911.
2014-04-10 09:51:43 +00:00
ff2979ca68 Save formation rotation when loading a new formation
This was SVN commit r14910.
2014-04-09 18:01:12 +00:00
1f63325ede Rotate entities to the right angle when forming a formation
This was SVN commit r14909.
2014-04-09 11:15:00 +00:00
4ddf1ac4dc Added rowing, gathering, 3Idles and death animations for ptolemaic fisherman.
This was SVN commit r14908.
2014-04-06 21:06:17 +00:00
d27dffa31d Now really fix the issue with promoting and formation animations
This was SVN commit r14906.
2014-04-06 18:43:06 +00:00
833c2bac7a save/restore camera position and orientation in saved games, fixes #2354
This was SVN commit r14905.
2014-04-06 16:27:57 +00:00
fbfd87e7f7 Replace hawk with duplicated head bone with fixed version by stanislas69. Fixes #2454.
This was SVN commit r14904.
2014-04-06 16:00:12 +00:00
fb1827bee7 Fix ungarrisoning bug caused by promoting garrisoned entities. Fixes #2471.
This now uses the Autogarrsion order as both already work with an
already garrisoned entity.

This was SVN commit r14903.
2014-04-06 03:04:30 +00:00
fd4cd56224 fixed petra map management when not circular
This was SVN commit r14901.
2014-04-05 12:18:37 +00:00
c5e59d02e1 Fix formation animations with promoted units
This was SVN commit r14900.
2014-04-05 09:48:57 +00:00
1908723188 Testudo for a few more Roman units.
This was SVN commit r14899.
2014-04-05 08:47:29 +00:00
61da102371 Add testudo animations to the right actor files and use it in the formation template
This was SVN commit r14898.
2014-04-04 18:38:13 +00:00
776a098a1c Tetsudo formation test animation. Front and middle stances.
This was SVN commit r14897.
2014-04-04 10:17:15 +00:00
d04f035f9a numerous fixes and improvments to petra ai
This was SVN commit r14896.
2014-04-03 20:48:54 +00:00
ac9aaaa369 supplement the ai common-api
This was SVN commit r14895.
2014-04-03 20:31:59 +00:00
26fdf74de3 Mauryan trader basic commit with idle and move animations. Needs zebu animation and trader texture or use a mauryan one.
Model and texture by paperkat, move animation by Wijitmaker, blender
exportation by stan

This was SVN commit r14894.
2014-04-03 18:31:56 +00:00
3e03c9d08a Return something valid in a mock function to fix a warning while running tests.
This was SVN commit r14893.
2014-04-02 23:10:07 +00:00
b8b3542d25 Fix tests.
This was SVN commit r14892.
2014-04-02 23:09:59 +00:00
b287cbf805 New ptolemaic sail for merchant ship based on Lion's eagle.
fixes #2236

This was SVN commit r14891.
2014-04-02 02:52:13 +00:00
2f12068a8f Ptolemaic merchant ship commit.
Model by Stanislas69 with some fixes.

This was SVN commit r14890.
2014-04-01 20:35:49 +00:00
55bb33dec8 Particle tweaks.
Mediterranean Cove skirmish map.

This was SVN commit r14888.
2014-03-30 01:56:35 +00:00
84016df11c Map tweaks and map preview changes.
This was SVN commit r14887.
2014-03-30 01:38:20 +00:00
e715c60942 Cleaning up the scenarios folder.
This was SVN commit r14886.
2014-03-30 00:10:07 +00:00
22867fa9a3 Further complete the definitition of the entity state
This was SVN commit r14884.
2014-03-29 13:56:03 +00:00
8615f38803 Always define the entire entity state, but initialize it to null
This was SVN commit r14883.
2014-03-29 13:37:48 +00:00
132020f88e Fix some of the undefined warnings reported by the new SpiderMonkey. Initialize the player diplomacy arrays earlier in PlayerManager.
This was SVN commit r14882.
2014-03-29 11:03:00 +00:00
120f71d944 a couple a bugfixes
This was SVN commit r14881.
2014-03-29 08:51:09 +00:00
b815fa8dd9 Portraits for the Ptolemaic dieres, penteres, and octeres.
Actor and texture for Antiochus the Great.

Histories for the Ptolemaic warships.

This was SVN commit r14880.
2014-03-29 00:16:16 +00:00
6f6b841af3 Upgraded ptoemaic quinquereme textures and made the model narrower.
This was SVN commit r14875.
2014-03-28 16:03:32 +00:00
0419f5500e another set of petra improvments, main one is a first try to place markets for trade (was random before)
This was SVN commit r14873.
2014-03-27 22:10:03 +00:00
0a32b2d687 Ptolemaic trireme commit.
Fixed some texture stretching in the bireme.

This was SVN commit r14872.
2014-03-27 18:13:07 +00:00
bc428e1649 some fixes (i.e.building placement) and cleanings of petra
This was SVN commit r14871.
2014-03-26 21:07:47 +00:00
52af5b29a1 Ptolemaic bireme commit.
Fixed error in sparten temple when destroyed found bi Sanderd17

This was SVN commit r14870.
2014-03-26 20:34:54 +00:00
7c0c294814 Move some resources to passable terrain
This was SVN commit r14869.
2014-03-26 18:28:00 +00:00
d5ff29d181 fix a flaw in UnitAI trade management
This was SVN commit r14868.
2014-03-26 09:11:06 +00:00
3dfa858229 remove some leftover warnings in petra
This was SVN commit r14867.
2014-03-25 19:26:45 +00:00
5de3b30742 fix previous tag
This was SVN commit r14866.
2014-03-24 22:51:15 +00:00
97afd25171 commit first version of new ai bot (named Petra)
This was SVN commit r14865.
2014-03-24 22:33:50 +00:00
b03e3644ac add a few usefull functions in ai/common-api
This was SVN commit r14864.
2014-03-24 22:15:40 +00:00
90b9926ca1 Fixes warning showing up with the new SpiderMonkey.
The changed return value isn't related but returning false makes more
sense there IMO.

Refs #2372

This was SVN commit r14863.
2014-03-22 23:31:40 +00:00
5372b27142 Silences some warnings that show up on the gamesetup screen with the new SpiderMonkey without changing any behaviour.
Refs #2372

This was SVN commit r14862.
2014-03-22 13:54:10 +00:00
3fb46640cc Fix civ for Ptol Military Colony.
This was SVN commit r14861.
2014-03-21 22:51:47 +00:00
907ef01322 Added starting units to Deccan Plateau.
Added some detail to Nile River.

Updated Syria a little bit.

Added Pureons new tech portraits to some techs.

Portrait for Ptol champ elephant.

Gave the Military Settlement system to the Ptolemies. We'll use their
merc camp for a developing merc camp system. Ptol heroes can found civic
centers just like the Sele heroes.

This was SVN commit r14860.
2014-03-21 00:47:23 +00:00
2eeb7c2ba1 Workaround to reduce the impact of AI performance problems when planning new bases.
When no free territory was left on the map, the AI tried to place a CC
every 10th AI turn.
That's about all 10 seconds and it freezed the game for about a second.
Now when you played against 4 players it freezed aobut 4 seconds every
10 seconds, which is very bad.
I wanted to solve this properly but realized that I'd have to change a
lot in the terrain analysis code that will probably be replaced anyway
when we have a new pathfinder with a proper interface.
Also removes an unused variable (creating a territory map and not using
it can't be good for performance either).

This was SVN commit r14859.
2014-03-20 14:26:15 +00:00
6eaad6cbb6 new tech portraits
This was SVN commit r14858.
2014-03-20 00:58:54 +00:00
1c81a96a50 fix bug in AI
This was SVN commit r14857.
2014-03-18 21:34:23 +00:00
63248bdc33 Fix issue with GUI reveal map status display.
This was SVN commit r14856.
2014-03-18 01:13:02 +00:00
209799aa4c fix 94c02ec33c for AI
This was SVN commit r14855.
2014-03-17 21:23:40 +00:00
cde72788a2 * Add support for fallback fonts in the font builder.
* Replace DejaVu with Biolinium for the existign sans-styles.
* Add additional sans-styles using Biolinum.
* Update the GUI style definitions to use the sans-styles instead of
serif styles.
(Wait with updating custom defined fonts in strings, as it will cause a
mess with the internationalisation that's about to be included)
* Add fonts from the quite complete FreeFont family as fallback fonts.
* Render all glyphs supported by the different fonts to support as many
scripts as possible.
* Fixes #2457.
(Now hope I included all needed files)

This was SVN commit r14853.
2014-03-17 10:13:49 +00:00
c1b839c21b Military Colony's territory weight reduced.
Updated icon for Syria map. Updated nisian war horses portrait from
Pureon.

Reduced the volume of the attack notification a little.

This was SVN commit r14852.
2014-03-17 00:10:13 +00:00
84ef2c1335 A test for Latin names for animals. Won't complete this until after next alpha.
This was SVN commit r14851.
2014-03-17 00:08:24 +00:00
883f307b40 Implement a basic observer mode. Any player which joins a multiplayer game but is not assigned a player slot automatically becomes an observer. Refs #69
This was SVN commit r14849.
2014-03-16 23:29:27 +00:00
94c02ec33c Revert gather limits to be global instead of per-player. Refs #1387
This was SVN commit r14848.
2014-03-16 20:35:23 +00:00
19724f7f41 "Syria" skirmish map.
This was SVN commit r14846.
2014-03-15 23:10:06 +00:00
caeaf62723 Adjust widths in the lobby to make the map size dropdown fit.
This was SVN commit r14843.
2014-03-15 20:58:59 +00:00
722ad7264d Some updated maps. Acropolis Bay especially.
This was SVN commit r14842.
2014-03-15 19:56:51 +00:00
b18a899287 Added Ptolemaic healer body and head textures. Fixes #2234
This was SVN commit r14839.
2014-03-13 19:46:15 +00:00
e17dd1ac12 Applying the new improvements: Gulf of Bothnia.
This was SVN commit r14837.
2014-03-13 09:45:09 +00:00
a068935789 Ptolemaic dock upgrade. Fixes #2217
This was SVN commit r14834.
2014-03-12 18:38:16 +00:00
180b44e565 let the AI know that a unit has no more orders
This was SVN commit r14832.
2014-03-11 22:42:41 +00:00
6274c7ffe8 Added ptolemaic quinquereme. Fixes #2232
This was SVN commit r14830.
2014-03-10 13:37:18 +00:00
9f1bcc2475 fix AI error
This was SVN commit r14829.
2014-03-09 22:26:41 +00:00
0e0cd65134 Some GUI alignment/sizing improvements.
This was SVN commit r14828.
2014-03-09 19:24:17 +00:00
8959e63a53 Add back unintentionally removed idle workers button tooltip.
This was SVN commit r14826.
2014-03-09 02:42:42 +00:00
e6f7ef78dc Removes legacy "technologies" folder.
This was SVN commit r14824.
2014-03-09 00:10:41 +00:00
7698e75962 Pyrrhus template.
This was SVN commit r14823.
2014-03-09 00:08:25 +00:00
0603392f03 Acropolis Bay.
This was SVN commit r14822.
2014-03-09 00:08:00 +00:00
119849defc Pyrrhus hero.
Some map stuff and actor changes (remove the elephants from Pericles).

This was SVN commit r14821.
2014-03-09 00:07:28 +00:00
d214d8f61c Some map changes.
This was SVN commit r14820.
2014-03-09 00:02:33 +00:00
fb65288463 Fix hover effect not regenerating after mousedown events, minor GUI code cleanup, and fix #2414
This was SVN commit r14819.
2014-03-07 22:43:57 +00:00
a9368a4463 Updated tooltip to reflect the new max gatherer limit
This was SVN commit r14816.
2014-03-07 12:09:39 +00:00
66942c74fa Be more forgiving for training spaces (which cause empty strings on splitting) and avoid using bigger fonts for non-capitalisable signs in headings
This was SVN commit r14815.
2014-03-07 11:11:45 +00:00
32cf46f01c Fix some 'undefined' problems reported by Lion.Kanzen + improve coding style.
This was SVN commit r14814.
2014-03-07 08:27:13 +00:00
29f94a759c Fix an issue with lobby registration and a minor wording tweak.
This was SVN commit r14813.
2014-03-07 01:52:06 +00:00
abbd6efef1 Updates outdated/incorrect hotkeys.
This was SVN commit r14812.
2014-03-06 23:57:02 +00:00
8a98bca9b2 Fixes the last z order (hopefully) and a style inconsistency.
This was SVN commit r14811.
2014-03-06 22:45:13 +00:00
ec26f1de83 Reduces z order to fix ai dialog.
This was SVN commit r14810.
2014-03-06 22:34:15 +00:00
8f30e722ab Some inconsequential style adjustments.
This was SVN commit r14809.
2014-03-06 02:24:06 +00:00
ef76d24e66 Fixes z order and a capitalization error.
This was SVN commit r14808.
2014-03-06 02:00:12 +00:00
5f5cfb10ee Fixes a typo and makes naming of the fading consistent with other sprites.
This was SVN commit r14807.
2014-03-05 21:24:48 +00:00
5582409973 Converts most parts of the game to use Pureon's new UI
This was SVN commit r14804.
2014-03-04 02:23:01 +00:00
1a2f889bb9 7cba43c9db changed the behaviour in case of undefined values which was not intended even if there's a warning now.
This should revert to correct behaviour for undefined values again (even
though this value should never be undefined).

Refs 2372

This was SVN commit r14803.
2014-03-03 23:01:49 +00:00
7cba43c9db Fixes warnings printed by the new SpiderMonkey.
Sets SelectableInGameSetup to true in all civ json files that didn't
have it set.
Having this value set to undefined (not set) was interpreted as true,
which is quite arbitrary.
With the new SpiderMonkey a warning will be printed if the value is
undefined.
This avoids ambiguity but makes the setting mandatory.

Refs #2372

This was SVN commit r14802.
2014-03-03 21:58:15 +00:00
df43e32a59 Second try fixing the eol-styles
This was SVN commit r14801.
2014-03-03 21:36:24 +00:00
234f2003a3 Fix inconsistent line endings and add svn:eol-style property
This was SVN commit r14800.
2014-03-03 21:13:36 +00:00
2d0e996725 Added modified Stanislas69 Pyrrhus helmet with textures.
Added an extra variation for brass and iron textures variations of
ptolemaic_romanized and thracian horned helmets.
Added playercolor to the thracian horned helmet crest.

This was SVN commit r14799.
2014-03-02 10:59:36 +00:00
c2c172271f fix AI error, not reseting all units after a successful attack
This was SVN commit r14796.
2014-03-01 14:36:35 +00:00
05225a66ac Horned helmet to Thracian cavalry.
This was SVN commit r14794.
2014-03-01 10:37:45 +00:00
57e995e618 fix AI error, the freeze of this collection prevented promoted and packed units to be updated during attack
This was SVN commit r14793.
2014-03-01 09:35:30 +00:00
999490bbf5 Added playercolor to ptolemaic romanized crest helmet.
This was SVN commit r14791.
2014-02-28 11:46:23 +00:00
162a4c42f3 Stan's helmets ptolemaic romanized with and without crest, thracian horned cavalry and perseus hero. Heavily modified.
playercolor in crests still pending. Added brass and iron variations,
more subtle variations to come.

This was SVN commit r14790.
2014-02-28 11:32:23 +00:00
3573a6e9a8 Updated some portraits.
Added a Mercenary Thracian Swordsman.

Tweaked some textures.

Added a "gray skin" variation to the Ptolemaic elephant.

Added Saharan Oases skirm map.

This was SVN commit r14787.
2014-02-26 14:29:42 +00:00
6b94ae9f59 Added two ptolemaic howdah variations for the champion elephant.
This was SVN commit r14786.
2014-02-26 13:53:36 +00:00
d8903c0c6f fix AI error
This was SVN commit r14785.
2014-02-25 22:43:03 +00:00
33918a5c41 Fix AI error (with 3eaa9ac4d3) preventing promoted units to stay idle
This was SVN commit r14779.
2014-02-24 14:03:13 +00:00
50d93b4332 Was messed up by b3201acd93
This was SVN commit r14778.
2014-02-24 12:10:38 +00:00
c5f15a13d0 Modified Stanislas69 Seleucid romanized helmet and thracian helmet with several texture variations and organized in actors with variations.
Applied the romanized brass helmet with crest to the Seleucid heavy
swordman infantry.

This was SVN commit r14777.
2014-02-23 16:51:10 +00:00
3eaa9ac4d3 fix AI error
This was SVN commit r14776.
2014-02-23 09:51:07 +00:00
e38fc5f861 Increased Fanatic armor.
This was SVN commit r14774.
2014-02-22 13:10:54 +00:00
554cd510f2 Basic and Advanced Egyptian Pikemen textures.
Spec and norm maps for Mediterranean forest floor terrain.

This was SVN commit r14773.
2014-02-22 12:16:20 +00:00
a3e1c68b9a Fix #2373. Have player resign if not returning to a networked game. Also notify host of networked game that by leaving all other players will be disconnected. Based off patch by boeseRaupe
This was SVN commit r14772.
2014-02-21 20:02:23 +00:00
8c21ec4dfd Quilted helms for Egyptian pikemen, based on work by Enrique.
This was SVN commit r14771.
2014-02-21 14:38:09 +00:00
42d31da1bb ptolemaic quilted helmet commit.
This was SVN commit r14770.
2014-02-21 14:13:46 +00:00
0ea3b7b7dd Adds the moderator prefix to the playerlist in the lobby.
This was SVN commit r14767.
2014-02-20 23:26:36 +00:00
a725266337 Slightly better options menu.
This was SVN commit r14766.
2014-02-20 22:45:43 +00:00
facf119241 Farm fields back to 5 workers.
This was SVN commit r14763.
2014-02-19 17:54:34 +00:00
2429f1e93c Displays ratings on the gamesetup page and formats ratings less than 1000 correctly.
This was SVN commit r14762.
2014-02-19 00:40:35 +00:00
a4ec034bb5 fixes some AI errors
This was SVN commit r14761.
2014-02-18 18:19:33 +00:00
039b06e012 Enable selection of dogs when selecting idle warriors. Patch by tau. Fixes #2436
This was SVN commit r14760.
2014-02-17 21:40:47 +00:00
b5c8faa367 Aura tooltip for Ptolemaic heroes. Auras themselves are not complete.
This was SVN commit r14759.
2014-02-17 15:54:17 +00:00
41534b1eda Arrow shooting buildings only increase arrows when ranged infantry are garrisoned inside.
Removing some unused textures.

This was SVN commit r14758.
2014-02-17 15:11:47 +00:00
c3dd79aa22 Ptolemaic mercenary camp commit.
This was SVN commit r14757.
2014-02-17 13:13:25 +00:00
322d78b9a5 remove debug warning
This was SVN commit r14755.
2014-02-16 15:23:50 +00:00
19965ce37a Fix missing territory decay when moving out of territory without changing the actual territory. Add possibility to check movement over territory boders in the JS simulation part. Based on patch by niektb
This was SVN commit r14754.
2014-02-16 15:22:11 +00:00
f92a46330d Anti-disconnect addition to the gamesetup screen. Also fixes typo in the lobby bot README.
This was SVN commit r14753.
2014-02-16 06:22:16 +00:00
be881dc420 Reformat the database to accept the additional summary counters as well as adding a couple summary counters. Also deletes unnecessary welcome message and deletes whitespace. Refs #686.
This was SVN commit r14752.
2014-02-16 06:06:16 +00:00
ab9a6b6303 Stanislas69' iberian tower modification commit.
This was SVN commit r14751.
2014-02-14 21:46:37 +00:00