Commit Graph

9039 Commits

Author SHA1 Message Date
27560e72fe Visualise auras by adding status icons to affected units. Implement the visualisation for the temple aura. Fixes #3180
This was SVN commit r16611.
2015-05-02 16:15:59 +00:00
18a97cc82a Add structure tree to the game session. Based on patch by Louhike. Fixes #3101
This was SVN commit r16610.
2015-05-02 12:22:25 +00:00
af37b00f4b Add QueryMiragedInterface. Fixes #3189.
QueryMiragedInterface allows to make writing Mirage-aware code
(GuiInterface)
simpler and less prone to error.
Replaces ResourceSupply's GetGatherers() with GetNumGatherers() as the
former
was never used in a way other than the second.

This was SVN commit r16607.
2015-05-01 17:03:37 +00:00
7d20695412 petra: fixes and tweaks of the previous commits for capture
This was SVN commit r16606.
2015-05-01 14:13:59 +00:00
385c47fe6b do not transfer the unused full gatherer list to the AIs, refs #3189
This was SVN commit r16605.
2015-05-01 12:53:41 +00:00
7d8dee27cc Autocomplete observer nicks in-game. Patch by elexis. Fixes #3203.
This was SVN commit r16604.
2015-04-30 22:12:56 +00:00
d3de7c6594 Adjust gui Relax NG grammar for size parsing changes in 5ce12c2263.
Moves sound_group grammar files to the mod mod to prevent an error
loading it with #245.

This was SVN commit r16603.
2015-04-30 22:05:46 +00:00
522bd8b37c petra: let the ai capture gaia structures
This was SVN commit r16602.
2015-04-30 19:07:28 +00:00
fe9eeedd66 Serialise messages in the GuiInterface to allow players to see them on a saved game or after a rejoin. Fixes #3185
This was SVN commit r16601.
2015-04-30 18:01:38 +00:00
41113f6f9b Adjust gui Relax NG grammar to <repeat> changes in 622614de02.
This was SVN commit r16600.
2015-04-30 04:39:50 +00:00
43a31ce494 petra: use a map instead of object for garrison bookkeeping
This was SVN commit r16599.
2015-04-29 19:44:41 +00:00
b0f7c00622 petra: continuation on capture adaptation
This was SVN commit r16598.
2015-04-29 17:59:29 +00:00
6389dba54f Allow players to unload all their units when garrisoned in allied buildings. Patch by maveric. Fixes #2857
This was SVN commit r16597.
2015-04-29 17:32:17 +00:00
296d363812 Remove forgotten warning
This was SVN commit r16593.
2015-04-28 13:12:13 +00:00
5e5799a45a Fix tests
This was SVN commit r16592.
2015-04-28 12:16:33 +00:00
7cc2d65ec7 Revert b0c74699b0 until problems with nested maps are solved. Refs #3164
This was SVN commit r16591.
2015-04-28 12:13:48 +00:00
1e98b7d37e Add useful decay message for the AI, and fix a style issue
This was SVN commit r16590.
2015-04-27 18:38:00 +00:00
f9a025ba6b petra: some cleanings and tweaks
This was SVN commit r16589.
2015-04-27 18:34:24 +00:00
04c4e666de Put territory decay in the Capture regen timer to avoid jumpyness of GUI elements
This was SVN commit r16588.
2015-04-27 18:04:58 +00:00
40eb747bc4 Express tooltip for placing defensive buildings in meters. Patch by maveric. Fixes #3079
This was SVN commit r16587.
2015-04-27 13:47:47 +00:00
8ff8667ed0 add initialization of capturePoints in AIProxy + some cleanings
This was SVN commit r16584.
2015-04-26 18:07:55 +00:00
42c04cdad2 Show the maximum population setting in a tooltip. Patch by elexis. Fixes #3197
This was SVN commit r16583.
2015-04-26 09:42:54 +00:00
a959fcf337 Disable resign button after resigning once. Patch by elexis. Fixes #3193
This was SVN commit r16582.
2015-04-26 08:57:26 +00:00
8099fe01de Drop off resources when building dropsite. Patch by maveric. Fixes #3093
This was SVN commit r16581.
2015-04-26 08:35:10 +00:00
604538a63a Fix issue with preferences in BuildingAI. Refs #1731
This was SVN commit r16580.
2015-04-26 08:21:43 +00:00
6c13bd92fd improve 632c8bd17e
This was SVN commit r16579.
2015-04-25 17:29:22 +00:00
632c8bd17e petra: continuation of adaptation to capture
This was SVN commit r16578.
2015-04-25 17:00:15 +00:00
4d1dee171e Explicitely add the UnitAI target to the BuildingAI target list to circumvent the range mismatch. Refs #1731
This was SVN commit r16577.
2015-04-25 12:54:34 +00:00
9a8c03093b Fix line endings of some template files, and add the native line endings svn prop
This was SVN commit r16576.
2015-04-25 09:33:42 +00:00
d7960fa775 Try out some replacement animations for capturing on athenian infantry
This was SVN commit r16575.
2015-04-25 08:16:55 +00:00
9b5560b383 fix rounding when returning resources from aborted foundation, patch by elexis, fixes #3132
This was SVN commit r16574.
2015-04-24 17:51:27 +00:00
e8accbe565 petra: inform allied players when advancing to the next phase, patch by maveric, fixes #2757
This was SVN commit r16573.
2015-04-24 17:37:46 +00:00
e0606468df Translate some tooltips as plurals. Unify aura tooltip code.
This was SVN commit r16571.
2015-04-23 18:58:39 +00:00
6e58781e51 Make Sicilia Nomad a skirmish map and fix the description.
This was SVN commit r16570.
2015-04-23 17:33:49 +00:00
5cbf2404af Fix tower tech tooltip. Patch by elexis. Fixes #3191.
This was SVN commit r16568.
2015-04-23 00:33:54 +00:00
2e6a248ade Pass some properties as null instead of undefined to circumvent serializer limitations. Based on patch by elexis. Fixes #3187.
This was SVN commit r16566.
2015-04-22 22:10:18 +00:00
d8f1f19f94 Save game type and victory scripts before random map is selected. Fixes #3184
This was SVN commit r16565.
2015-04-22 13:48:45 +00:00
d08fdf43d7 Fix some issues with capturing and miraged entities
This was SVN commit r16564.
2015-04-22 09:59:59 +00:00
6c7eb93e1c Add temporary capture cursor
This was SVN commit r16563.
2015-04-22 08:20:41 +00:00
885aec20dd fix a typo in 9be10939cb
This was SVN commit r16562.
2015-04-21 19:25:54 +00:00
625cfb79d3 petra: another fix for capture events
This was SVN commit r16561.
2015-04-21 19:00:51 +00:00
7bb30ef6b0 Fix some more flags
This was SVN commit r16560.
2015-04-21 17:58:07 +00:00
9be10939cb petra: react to more capture events and some tweaks on attacks
This was SVN commit r16559.
2015-04-21 17:15:19 +00:00
2972cb3202 Small fix
This was SVN commit r16558.
2015-04-21 14:33:28 +00:00
fa878c2f31 Force attack instead of capture when the attack hotkey is pressed
This was SVN commit r16557.
2015-04-21 13:21:19 +00:00
701663afaa Add minimap ping alert for capture attack
This was SVN commit r16556.
2015-04-21 08:27:26 +00:00
999f3e3497 Fix gui problem when selecting a combination of capturable and non-capturable entities
This was SVN commit r16554.
2015-04-20 16:26:58 +00:00
6766401510 Fix the resign problem with capturing
This was SVN commit r16553.
2015-04-20 16:22:48 +00:00
535d612e06 Small fixes.
This was SVN commit r16552.
2015-04-20 14:51:06 +00:00
a8c44d947c Fix tests
This was SVN commit r16551.
2015-04-20 07:47:07 +00:00
ad27deeb9d Implement building capturing. Fixes #996
This was SVN commit r16550.
2015-04-20 07:45:45 +00:00
751c46c60b petra: let the AI know it can build a new base around a captured cc,refs #996
This was SVN commit r16549.
2015-04-18 18:28:02 +00:00
b8b3f66027 petra: improve attack management and let some parameters vary with maxpopulation, fixes #3173
This was SVN commit r16548.
2015-04-17 18:43:07 +00:00
06916dde43 Yet another fix for the gamesetup persistent settings.
Patch by elexis, fixes #3165

This was SVN commit r16545.
2015-04-15 21:22:39 +00:00
120ff2c60c Fix the structure tree a second time, this should also work on Windows.
This was SVN commit r16542.
2015-04-15 09:10:05 +00:00
a0340efab8 fix an unfortunate typo affecting the AIs
This was SVN commit r16539.
2015-04-14 20:23:42 +00:00
1ea1755ee7 Petra: follow-up on changes to deal with capture
This was SVN commit r16538.
2015-04-14 20:14:39 +00:00
a980d8fdfc Fix structure tree by allowing undefined templates in the productionqueue
This was SVN commit r16537.
2015-04-14 18:45:02 +00:00
03506a0eec fix typo creating 71fb9ef162
This was SVN commit r16536.
2015-04-13 21:04:49 +00:00
71fb9ef162 Add AI safety guard. I had a game with an undefined template, but that shouldn't happen at that point.
This was SVN commit r16535.
2015-04-13 10:10:38 +00:00
d139a75de3 new button in diplomacy to request an attack to allies, works also for AIs, fix #3157
This was SVN commit r16533.
2015-04-11 18:46:05 +00:00
7fbab6dd10 Petra: update the target of an attack when it has been captured
This was SVN commit r16532.
2015-04-11 18:26:47 +00:00
528dc9179a Fix mace and ptol skirmish replacements
This was SVN commit r16529.
2015-04-10 11:58:12 +00:00
41550ea849 add a missing protection following changes for capture
This was SVN commit r16528.
2015-04-09 19:53:03 +00:00
d41fb4612f Fix athen archer selection
This was SVN commit r16527.
2015-04-09 17:36:27 +00:00
27601c5b8b Adapt naval manager to deal with structures from different civs. Similar to 107185d7dd
This was SVN commit r16526.
2015-04-09 12:27:03 +00:00
eb9e7ee84d Make all champion, hero and siege producing buildings ready for capture. Fixes #2614 (hopefully)
This was SVN commit r16525.
2015-04-09 09:44:24 +00:00
2700f74dd3 Make docks ready to capture. Refs #2614
This was SVN commit r16524.
2015-04-09 08:22:29 +00:00
bdfedb1c49 Rename Seleucid mercenary units to reflect their mercenary state
This was SVN commit r16523.
2015-04-09 08:08:20 +00:00
b92fac170a Rename ptolemaic mercenary units to reflect their mercenary state
This was SVN commit r16522.
2015-04-09 07:44:16 +00:00
6250990bfd Make barracks ready to capture. Refs #2614
This was SVN commit r16521.
2015-04-09 07:15:50 +00:00
107185d7dd adapt the AI API to deal with structures from different civs for capture
This was SVN commit r16519.
2015-04-08 16:23:39 +00:00
19692c0acc Fix entity names in map files.
This was SVN commit r16518.
2015-04-08 08:15:47 +00:00
358b1c06d8 Petra: start changes needed to support capture
This was SVN commit r16514.
2015-04-07 20:23:12 +00:00
1dcfd75e62 Fix typo
This was SVN commit r16513.
2015-04-07 13:34:26 +00:00
b0c74699b0 Use Maps instead of Objects in the Auramanager to improve performance. Also remove the IonMonkey v24 workaround. Refs #2684
This was SVN commit r16512.
2015-04-07 09:52:06 +00:00
481cf0f754 Modify ProductionQueue of Civil Centres in preparation of capturing. Refs #2614
This was SVN commit r16511.
2015-04-07 07:37:25 +00:00
b4cbc14490 Style fixes
This was SVN commit r16510.
2015-04-07 07:15:59 +00:00
abe6347554 Some cheat code cleanup.
This was SVN commit r16509.
2015-04-06 22:43:54 +00:00
f2c76cc75d Fix a number of issues related to historical messages and initial join in the multiplayer lobby. Fixes #3156
This was SVN commit r16507.
2015-04-06 19:33:37 +00:00
71a84682ad Fix the productionQueue for capturing. Needs the AI to be fixed in a similar way, and still needs template changes to see the full effect. Refs #2614
This was SVN commit r16506.
2015-04-06 15:02:37 +00:00
c8401bd737 Rename cart mercenary units to distinguish them from regular units
This was SVN commit r16505.
2015-04-06 12:47:12 +00:00
165bebb00e Rename some _2_ templates to regular names. This is possible since the pikemen were renamed too
This was SVN commit r16504.
2015-04-06 12:08:45 +00:00
97ef1c542d Rename spearmen with pikes into pikemen. This avoids problems with civs that have both pikemen and spearmen.
This was SVN commit r16503.
2015-04-06 11:49:23 +00:00
8eebb5d118 Rename Athen marine archer as a special unit should have a non-standard name
This was SVN commit r16502.
2015-04-06 11:23:02 +00:00
2b57410021 Better tested summary screen update. Also make modern tooltip style more consistant with the general light on dark theme.
This was SVN commit r16501.
2015-04-06 06:17:09 +00:00
18ff57c316 Update version in mod.json.
This was SVN commit r16500.
2015-04-05 17:14:47 +00:00
43508ce3a0 some petra code reshuffling
This was SVN commit r16496.
2015-04-04 15:38:53 +00:00
c735f9a579 Revert wrong commit 14b7e7568c
This was SVN commit r16495.
2015-04-04 09:11:05 +00:00
14b7e7568c Rename athen archer, as it's not a default unit. Naming it as a default unit makes any capture code more difficult.
This was SVN commit r16494.
2015-04-04 08:56:14 +00:00
0131f2e4d5 Fix gamesetup options for lobby games
This was SVN commit r16493.
2015-04-03 09:40:50 +00:00
dfd7978cb2 fix typo (particate → participate)
This was SVN commit r16492.
2015-04-03 07:39:25 +00:00
8d3d9616a2 be more generic with starting entities of nomad maps
This was SVN commit r16491.
2015-04-02 21:01:19 +00:00
afbf6e8e40 cleanings of AIInterface
This was SVN commit r16490.
2015-04-02 20:28:02 +00:00
1482a84875 replace some slow (foreach in) loops
This was SVN commit r16489.
2015-04-02 20:22:33 +00:00
4e763ef26e Move civ JSON files to simulation/data. Patch by MattDoerksen. Fixes #2562.
This was SVN commit r16485.
2015-04-01 23:48:33 +00:00
7695d2fcb9 Refine checks for invalid player ids for mirages. Patch by elexis. Fixes #3149.
This was SVN commit r16484.
2015-04-01 23:48:26 +00:00
aa808baabf Fix the stumped maps in Alpine Mountains
This was SVN commit r16481.
2015-03-31 17:30:59 +00:00
7ed45213a9 Allow heightmaps to be 8 times as high by lessening precisions. Includes conversion script and modified standard maps. Bump the map version number. Fixes #3112
This was SVN commit r16478.
2015-03-31 16:48:31 +00:00
a84765fc75 Add all non-structure starting entities to Unknown Nomad. Patch by elexis. Fixes #3153.
This was SVN commit r16477.
2015-03-30 23:44:48 +00:00
072afdcede Fix line endings for random maps.
This was SVN commit r16476.
2015-03-30 23:41:12 +00:00
b5593bf1a9 petra changes in the choice of player to be attacked
This was SVN commit r16475.
2015-03-30 20:21:46 +00:00
ec9a49562b Remove debug warning + fix typo
This was SVN commit r16474.
2015-03-30 18:49:54 +00:00
a05f146c79 Disable data gathering in AIInterface when no AI players are loaded
This was SVN commit r16473.
2015-03-30 18:44:02 +00:00
8712ad835c Fix buildingAI in case of modifications (techs, auras, ownership changes, ...) + clean up the code a bit
This was SVN commit r16472.
2015-03-30 09:25:20 +00:00
809cc074fa petra: small tweaks and cleanings
This was SVN commit r16471.
2015-03-29 13:01:38 +00:00
569b5e244d fix computation of foundation refund when destroyed, fixes #3132
This was SVN commit r16470.
2015-03-26 19:17:37 +00:00
798cd2963e Add option to disable treasures on skirmish and random maps
This was SVN commit r16469.
2015-03-26 08:31:50 +00:00
1cd41e33c6 Niektb's Northern Island skirmish map.
This was SVN commit r16468.
2015-03-25 19:50:37 +00:00
61590f28d3 let AIProxy deal with new entities created without ownership, fixes #3142
This was SVN commit r16467.
2015-03-25 18:22:23 +00:00
3e98d379ab LordGood's Alpine Mountains skirmish map with some modifications by niektb.
This was SVN commit r16466.
2015-03-25 15:56:30 +00:00
2fe444269e Game Speed display over UI, Fixes #3129
This was SVN commit r16465.
2015-03-25 13:20:54 +00:00
6bc34da330 Emblem button states
This was SVN commit r16464.
2015-03-25 00:35:52 +00:00
5950d16500 Some structree improvements for issues exposed by mods. Changes by s0600204.
This was SVN commit r16463.
2015-03-24 18:12:42 +00:00
28abcb3bcc cache some formation info in gui + some cleanings, see #3078
This was SVN commit r16460.
2015-03-23 18:38:27 +00:00
a430e03d1d Petra: fix for nested loops using same loop index
This was SVN commit r16459.
2015-03-23 18:06:31 +00:00
58d955e426 Some cleanup.
This was SVN commit r16458.
2015-03-23 13:34:23 +00:00
e35970b700 Petra: rewrite of the dock placement. It should be more robust and compatible with the new pathfinder now
This was SVN commit r16457.
2015-03-22 22:00:59 +00:00
64adec79da fix a wrong copy&paste in 86054bcf7e
This was SVN commit r16456.
2015-03-22 21:51:57 +00:00
f680caa14f Escape lobby game names. Fixes #3118.
This was SVN commit r16452.
2015-03-21 16:24:29 +00:00
09ff1f8bea fix some cases where a water nomad random map could end up without water
This was SVN commit r16451.
2015-03-19 21:43:55 +00:00
2a1fcc88e3 Expands game speed dropdown by 10 pixels to accommodate German text and hopefully most other languages
This was SVN commit r16448.
2015-03-19 01:43:04 +00:00
5dd3cbb254 Random nomad maps are now in default filter.
The number of starting units has been increased to speedup the startup
(building of cc)
Treasures are added when the starting resources are not sufficient to
either build a dock in water maps, or build a cc in land maps.

This was SVN commit r16447.
2015-03-17 22:03:33 +00:00
bed480c433 remove some obsolete variables after #16416
This was SVN commit r16446.
2015-03-17 21:43:48 +00:00
e288bb7c4e Some gamesetup cleanup. Refs #3049.
This was SVN commit r16445.
2015-03-16 23:56:42 +00:00
312155d22f Use arrays for specifying StartingTechnologies, DisabledTechnologies, and DisabledTemplates.
Also add an example for StartingTechnologies to the Carthagian sandbox
map. Refs #1404.

This was SVN commit r16444.
2015-03-16 21:54:32 +00:00
09796350c8 Fix changephase cheat broken in af8a6f5e8c.
This was SVN commit r16443.
2015-03-16 18:50:51 +00:00
14f5eed8c7 Restores action-heal cursor from 1d3adefacc now that the engine supports indexed color PNGs, refs #2823
This was SVN commit r16440.
2015-03-16 02:38:03 +00:00
b1c4e29ac8 Fixes inconsistencies in spelling of colour/color by preferring "color" (only wxWidgets remains with some API that requires "colour"), fixes #1029.
NOTE: requires update-workspaces and may require correction of some
modded actors/scenarios

This was SVN commit r16438.
2015-03-15 23:59:48 +00:00
7334f76af6 Fix some issues in af8a6f5e8c.
This was SVN commit r16437.
2015-03-15 23:56:18 +00:00
2395204011 fixes some typos in previous commits
This was SVN commit r16433.
2015-03-15 20:58:33 +00:00
2b6bde800c some changes to let Petra build structures with the new PathFinder branch
This was SVN commit r16432.
2015-03-15 18:25:03 +00:00
f29d059617 Remove conditional defines as those served a very doubtful purpose with parallax, replacing it with something dynamic in the shader. This cleans the C++ side of the renderer as conditional defines were very ugly.
This was SVN commit r16430.
2015-03-15 12:22:36 +00:00
5a4ddb52a2 Change the tooltip for number of builders to give more useful information and add one on the healthbar of foundations.
This was SVN commit r16429.
2015-03-15 12:00:28 +00:00
5d6f95321d Fix actor errors revealed by 618fe81814.
This was SVN commit r16428.
2015-03-15 11:45:33 +00:00
618fe81814 Check when loading an actor that it defines all the texture samplers required by its material. Print out a readable error otherwise. Fixes #1613 (note that this does not check for unnecessary samplers as that is non-trivial and does not lead to graphical glitches).
Also add a shortcut for some defines to clean-up material files slightly
and make the link between sampler and shader more explicit.

This was SVN commit r16427.
2015-03-15 11:37:26 +00:00
372a016311 do not let animals be preferredTarget
This was SVN commit r16426.
2015-03-15 11:30:04 +00:00
24cdf6b851 Petra: check EjectHealth level before trying to garrison
This was SVN commit r16425.
2015-03-15 10:57:04 +00:00
866e00d154 Petra AI now warns its allies when in need of a tribute
This was SVN commit r16424.
2015-03-15 10:28:48 +00:00
cb2da36527 few tunings for Petra
This was SVN commit r16423.
2015-03-15 10:20:20 +00:00
86054bcf7e reduce time of some rndm map generation, i.e. alpine_lakes is about 3 times faster now
This was SVN commit r16422.
2015-03-15 10:08:16 +00:00
a3335b39e5 fix AI init crash when more than 255 disconnected regions in some random maps
This was SVN commit r16421.
2015-03-15 10:00:16 +00:00
09dc9e6f1d fix rounding problem in AI health, fixes #2446
This was SVN commit r16420.
2015-03-15 09:54:48 +00:00
47cb6c01db fix #16416
This was SVN commit r16419.
2015-03-15 09:52:15 +00:00
af8a6f5e8c Removes generic hele and celt civs. Based on patch by prodigalson and
comments by s0600204. Fixes #2619.

Also removes the theb civ json file.

This was SVN commit r16416.
2015-03-15 04:16:24 +00:00
82b08db6ec Remove grouping from civ info screen. Only show playable civs. Refs #2619.
Does not use loadCivData(true) as the civ info screen can also be opened
from the
gamesetup screen and both use g_CivData.

This was SVN commit r16415.
2015-03-15 04:15:59 +00:00
38a007f6fa Properly escape a string.
This was SVN commit r16414.
2015-03-15 04:15:57 +00:00
6f3e682484 Extract strings from the structree. Fixes #3064.
This was SVN commit r16413.
2015-03-15 04:15:53 +00:00
1303b4d39b Fix a couple oversights and address cavalry skirmishers.
This was SVN commit r16409.
2015-03-09 02:05:32 +00:00
eaa8f89ffc Reverts action-heal cursor from 1d3adefacc, it was modified to indexed color not currently supported by the engine, fixes #3082, refs #1640. Reapplies the transparent color removal, refs #2823.
Deletes unused test-old cursor

This was SVN commit r16407.
2015-03-06 22:01:11 +00:00
206aeaf99f Revert 37da37dbd5. Refs #3072.
This was SVN commit r16406.
2015-03-03 23:56:00 +00:00
c3f62542a4 Expands area for release name slightly, as it was cut off at 1024x768 resolution
This was SVN commit r16404.
2015-03-03 21:37:59 +00:00
54e806e3c6 Slight ranged cavalry health nerf and cost adjustment for cavalry archer.
This was SVN commit r16402.
2015-03-03 04:12:30 +00:00
7901f4087d Revert 1d3adefacc on unused test-old.png (and optimize with optipng and advdef anyway), apparently imagemagick trick mess it up. It could be eventually be removed if not needed.
Refs #2823.

This was SVN commit r16400.
2015-03-02 10:26:12 +00:00
e4bf24dc9a Adjusts female citizen attack.
This was SVN commit r16395.
2015-03-01 19:58:06 +00:00
839264b279 Adds missing GLSL normal definitions to terrain_decal effect (no visible difference on my system but technically correct), refs #2046
This was SVN commit r16394.
2015-03-01 19:33:04 +00:00
8a2638a8f5 Nerfs bolt shooters, especially against buildings.
This was SVN commit r16392.
2015-02-28 20:56:19 +00:00
37da37dbd5 Cleanup post-game summary page again. Fixes #3072
This was SVN commit r16391.
2015-02-28 18:32:50 +00:00
ea2eb2bd57 Removes some outdated techs due to string freeze.
This was SVN commit r16390.
2015-02-28 16:55:28 +00:00
2d7d5b446d Fix Atlas so that changing water type will actually change water type.
Fix the water shader so that object reflections are more visible. Looks
better.

This was SVN commit r16388.
2015-02-28 13:50:52 +00:00
b04761f1b8 binaries/data/mods/mod/art/textures/cursors/test.png and binaries/data/mods/public/art/textures/cursors/arrow-default.png were previously a copy of the same file (same md5), during conversion in 1d3adefacc they were indipendently converted and had different md5 (just the date inside the png was different). Use again the same file just to make obvious they are identical.
Refs: #2823.

This was SVN commit r16387.
2015-02-28 08:09:30 +00:00
1d3adefacc Fixes cursor with dirty transparency.
I used elexis script and also optimized pngs with optipng -o 5 and
advdef -z -4

Thanks elexis for the imagemagick script!

Fixes #2823.

This was SVN commit r16386.
2015-02-27 10:13:24 +00:00
3a25256960 Revert d69ecad481. Refs #3072.
This was SVN commit r16385.
2015-02-25 19:10:10 +00:00
d69ecad481 Cleanup post-game summary page. Fixes #3072
This was SVN commit r16384.
2015-02-25 14:51:52 +00:00
72b0f5aaed Increases swordsmen damage slightly to match spear.
This was SVN commit r16383.
2015-02-25 07:33:51 +00:00
fc58b52396 Building defense adjustments for health/armor values for organic units.
This was SVN commit r16377.
2015-02-22 18:55:22 +00:00
4860957fa6 Adjusts skirmisher cavalry closer to that of their infantry counterpart.
This was SVN commit r16371.
2015-02-21 19:37:06 +00:00
b9cf610562 Makes palisade fort cheaper than defense tower.
This was SVN commit r16370.
2015-02-21 19:08:26 +00:00
cdc9d98e00 do not apply multiple leavefoundation orders, fix #3010
This was SVN commit r16369.
2015-02-21 17:40:59 +00:00
e67379a25f Buffs rams for better durability.
This was SVN commit r16368.
2015-02-21 15:14:04 +00:00
0817808e9b Check visibility of units before moving the camera to their position, when using selection groups.
Fixes #3065.

This was SVN commit r16367.
2015-02-21 10:53:56 +00:00
f8ff206169 Recreate some tech modified values upon deserialization. Fixes #3055.
Also check for some possible null pointers.

This was SVN commit r16364.
2015-02-21 01:41:24 +00:00
0da0b062e1 Return the correct projectile id to fix serialization test failure.
This was SVN commit r16363.
2015-02-21 01:41:09 +00:00
8ecfa6cf7c Nerfs skirmishers slightly.
This was SVN commit r16361.
2015-02-20 15:17:29 +00:00
6b364ad240 Reverts half of 6317e320f2 due to string freeze.
This was SVN commit r16355.
2015-02-18 19:32:08 +00:00
6317e320f2 Nerfs hero aura and deletes hardcoded health.
This was SVN commit r16354.
2015-02-18 19:30:22 +00:00
27e4122d44 fix damages on nearby units which, because of wrong argument (3d instead of 2d) was tested on x-y distance instead of x-z, resulting in faraway entities being damaged
This was SVN commit r16353.
2015-02-18 19:20:14 +00:00
3dbe3a364f Adds "demo" keyword to some unplayable, unfinished maps so they are hidden in game setup, patch by thamlett, refs #2881
This was SVN commit r16352.
2015-02-17 21:26:24 +00:00
4b921d89da prevent JS warning
This was SVN commit r16348.
2015-02-16 19:40:27 +00:00
5871c2c16d fix #3058, patch from Stan
This was SVN commit r16347.
2015-02-16 19:02:40 +00:00
6a12dab20f Some hacks to fix game setup persisting problems, patch by @aBothe.
Fixes #3033, #3034.

The whole gamesetup.js system should be eventually re-factored to remove
those hacks and to improve the robustness of the code: see #3049.

This was SVN commit r16346.
2015-02-16 17:48:27 +00:00
6f9c5efd76 Nerfs the robustness of ranged siege against melee units.
This was SVN commit r16344.
2015-02-16 15:19:41 +00:00
ba210c4d59 Fix c229b46ac2.
This was SVN commit r16343.
2015-02-16 14:38:13 +00:00
72ff88880c Buffs walkspeed of pikemen slightly.
This was SVN commit r16341.
2015-02-16 00:26:43 +00:00
f8bd862512 Updated a few structure icons. Some new tech icons.
This was SVN commit r16340.
2015-02-15 12:32:55 +00:00
a3374d3164 Icons for palisade wall and palisade fort
This was SVN commit r16339.
2015-02-15 11:17:18 +00:00
c229b46ac2 Move visibility component activation check to C++. Patch by Itms.
This improves performance quite a lot because it avoids a huge number of
calls from C++ to JS. Check the ticket for performance measurements.
Refs #2913

This was SVN commit r16337.
2015-02-14 17:13:50 +00:00
f18a6981bb Fixes extraneous attack. Reported by zzippy.
This was SVN commit r16336.
2015-02-14 14:55:32 +00:00
bf4b8bfe9c Siege balancing.
This was SVN commit r16331.
2015-02-13 07:05:54 +00:00
5725ceda9d Petra: really fix the bug supposed to be fixed in 04fa2dd4ec
This was SVN commit r16327.
2015-02-12 21:04:29 +00:00
5775485421 Fix a bug that triggered errors when loading Roman champion cavalry.
This was SVN commit r16322.
2015-02-11 22:21:11 +00:00
e407b97d0e Updates pikemen counter bonus to match that of spearmen.
This was SVN commit r16321.
2015-02-11 22:20:29 +00:00
42d96cfde7 ...
This was SVN commit r16320.
2015-02-11 22:06:41 +00:00
b239bcd8b9 protection against JS warning
This was SVN commit r16319.
2015-02-11 20:27:04 +00:00
cd9eeef1b7 force garrisoned units as turrets to have stance standground, fixes #2905
This was SVN commit r16318.
2015-02-11 18:34:06 +00:00
04fa2dd4ec Petra: more tunings for new ranges and fix a bug in attack preparation
This was SVN commit r16317.
2015-02-11 18:20:30 +00:00
51a37e6d0f String changes, based on input from Transifex users:
- Fix a typo in the options screen
- Add an indication to Persian heroes dates, that are actually dates of
reign.

This was SVN commit r16316.
2015-02-11 15:08:09 +00:00
cf30c90732 Nerfs melee cavalry slightly and increases spearman bonus.
This was SVN commit r16313.
2015-02-10 00:37:21 +00:00
a8f726df55 fix #3043 by increasing the minimum distance between civs
This was SVN commit r16312.
2015-02-09 19:21:56 +00:00
cc0c21d46b Update the Survival of the Fittest map description for more clarity. Refs #2817
This was SVN commit r16310.
2015-02-09 18:06:46 +00:00
26d303d854 Improve mod support of the structree. Patch by s0600204.
Adapt structree for changes from the balancing branch.

This was SVN commit r16308.
2015-02-08 23:07:18 +00:00
5d447432ec fix previous fix
This was SVN commit r16307.
2015-02-08 23:03:47 +00:00
1f52d98856 fix game description of unknown_nomad
This was SVN commit r16306.
2015-02-08 22:58:19 +00:00
1af4a60b7c Petra: some tweaks for new ranges from balance brabnch
This was SVN commit r16305.
2015-02-08 21:32:55 +00:00
c58a2a3c79 Hero balancing.
This was SVN commit r16302.
2015-02-08 20:54:34 +00:00
d09beef3de Allow cavalry spearmen to do a little more hack to better counter siege.
This was SVN commit r16301.
2015-02-08 20:49:24 +00:00
001179da6e Lessens the range difference between units and adjusts vision accordingly.
This was SVN commit r16300.
2015-02-08 20:12:07 +00:00
e1f61ea8f8 Fix tab/space issues with 6e37d6698b.
This was SVN commit r16299.
2015-02-08 18:17:56 +00:00
6bdd912146 Fix double-escape in the lobby chat.
This was SVN commit r16298.
2015-02-08 17:37:33 +00:00
75d295b25e Add /allies to chat with mutual allies. Patch by trompetin17. Refs #1767.
This was SVN commit r16297.
2015-02-08 17:37:24 +00:00
92701639f6 Update g_Players on diplomacy changes so the GUI actually knows about them.
This was SVN commit r16296.
2015-02-08 17:37:15 +00:00
a11bf075b1 Some text fixes reported by translators.
This was SVN commit r16295.
2015-02-08 15:46:26 +00:00
1b82389cf8 Reduces cavalry vision and makes palisade fort count as a village structure instead of town.
This was SVN commit r16294.
2015-02-08 15:07:35 +00:00
6e37d6698b MessageBox cleanup.
This was SVN commit r16293.
2015-02-08 05:48:33 +00:00
f9c95b6953 Do not send gaia stats for rated games.
This was SVN commit r16292.
2015-02-08 01:59:02 +00:00
486094298e Properly escape user chat.
This was SVN commit r16291.
2015-02-08 01:24:23 +00:00
37912c05ca Increases tower range and nerfs archer accuracy.
This was SVN commit r16290.
2015-02-07 22:53:36 +00:00
f28c3b2392 fix the fix of 9ccd986bde
This was SVN commit r16289.
2015-02-07 22:47:09 +00:00
e882479e1a Add tab-completition to game setup screen. Patch by trompetin17.
This was SVN commit r16288.
2015-02-07 21:57:57 +00:00
19ec4ced91 Clean up the splashscreen. More concise wording, only modern styling, alignment fixes, larger click/touch targets, and code cleanup.
This was SVN commit r16287.
2015-02-07 19:18:06 +00:00
f56102967f Balance branch merge.
This was SVN commit r16285.
2015-02-07 18:50:36 +00:00
3c2a450679 Updates splashscreen. Fixes #3025.
This was SVN commit r16284.
2015-02-07 18:30:16 +00:00
0f98bdb7ee Fix a typo.
This was SVN commit r16282.
2015-02-07 15:51:45 +00:00
da0f33f137 Reduce drastically the number of mirages by making fogging conditional: entities will be miraged only if their health/resource amount is modified, or if they have a non-gaia owner.
Fixes the animals hidden in the FoW, and adds the missing status bars
for mirages.

Also small cleanup of the code.

Refs #2913

This was SVN commit r16281.
2015-02-07 15:48:32 +00:00
dab6836378 modified version of the skirmish/Sicilia map, to feature news in A18: starting without cc and with units garrisoned
This was SVN commit r16279.
2015-02-07 13:15:14 +00:00
9ccd986bde fix initialization when changing maps, refs #2803
This was SVN commit r16278.
2015-02-07 12:49:00 +00:00
08827a9d64 fix a typo
This was SVN commit r16277.
2015-02-07 12:44:51 +00:00
932dbc7221 Import s0600204's structree.
Taken from https://github.com/s0600204/0ad-structree-mod with some
improvements from my fork.
On small resolutions some buildings might not be fully visible (see
#3038).

This was SVN commit r16276.
2015-02-07 01:37:05 +00:00
18a1820d9c Remove stray character.
This was SVN commit r16273.
2015-02-06 16:50:22 +00:00
766d2f833f Fix gather rally points for formations (batches). Patch by stanislas69. Fixes #3037.
Also clean up some whitespace.

This was SVN commit r16272.
2015-02-06 02:11:39 +00:00
f0ae351158 read starting tech, disabled tech, ... from map JSON file, refs #1404
This was SVN commit r16270.
2015-02-05 22:29:36 +00:00
e12f53c48d Some more gui cleanup.
This was SVN commit r16269.
2015-02-05 17:42:16 +00:00
94507bf7ee Remove entirely the unit in the Celt outpost. Also clean out the dae model to remove the associated prop point.
Fix by stanislas69, fixes #2876.

This was SVN commit r16268.
2015-02-04 17:39:24 +00:00
d5aab3f056 hotkey button should have no effect when button is disabled, fix #3031
This was SVN commit r16266.
2015-02-03 18:22:41 +00:00
2eff0348c5 remove unused argument
This was SVN commit r16265.
2015-02-03 18:19:14 +00:00
b08941ba8d Add back some data to the basic simulation state, works around 2ef3c0c42e.
Fixes #3016.

This was SVN commit r16264.
2015-02-03 17:35:34 +00:00
0aa7e882b7 More gui cleanup.
This was SVN commit r16263.
2015-02-03 02:37:42 +00:00
e1b13dead9 Clean up tooltip code a bit more.
Remove useless tooltip from spart citizen, as the classes should be done
using visible classes.

This was SVN commit r16262.
2015-02-03 02:02:51 +00:00
53b335f5ae Improve auto-completition of nick names and add it to the in-game chat. Patch by trompetin17. Refs #1767.
This was SVN commit r16261.
2015-02-02 23:44:06 +00:00
3ee30f125c update online manual
This was SVN commit r16260.
2015-02-02 21:18:39 +00:00
0038fb2e1e Petra: small tweaks in defense
This was SVN commit r16259.
2015-02-02 20:52:45 +00:00
e1e5979d73 Petra: garrison siege units when useful
This was SVN commit r16252.
2015-01-30 18:41:33 +00:00
ad4e995bd4 clean 499d41ad80
This was SVN commit r16251.
2015-01-30 18:15:03 +00:00
1564a10120 Move back the computation of most of the visibilities from JS to engine, to improve performance.
Also fix the remaining TODO left by #958, as a use case of the scripted
Visibility component.

Refs #2913, #958.

This was SVN commit r16248.
2015-01-30 15:28:06 +00:00
7d282f6bb1 Petra: improve late game when resources rely mainly on trade
This was SVN commit r16246.
2015-01-29 21:49:38 +00:00
499d41ad80 Shift key when deleting a saved game do not need confirmation, addresses #3018
This was SVN commit r16245.
2015-01-29 21:18:48 +00:00
c599f92875 Big cleanup of the summary page internals, making use of nested tags in the xml and organizing the logic in a more flexible way.
Patch by trompetin17, fixes #2952.

This was SVN commit r16240.
2015-01-27 21:38:05 +00:00
965a6f3838 update online manual, refs #3018
This was SVN commit r16239.
2015-01-27 18:24:33 +00:00
8af1c907fa Reset victory conditions on map change. Refs #3001.
This was SVN commit r16238.
2015-01-27 17:46:57 +00:00
b38a6e9383 add hotkey for deleting saved games, addresses #3018
This was SVN commit r16236.
2015-01-26 21:05:31 +00:00