1
0
forked from 0ad/0ad
Commit Graph

9370 Commits

Author SHA1 Message Date
2a7dc39d07 some cleanups of gui code
This was SVN commit r16984.
2015-09-04 17:50:04 +00:00
9e3ee0e849 Petra: make a bit more use of cavalry
This was SVN commit r16983.
2015-09-04 17:47:54 +00:00
847fbea820 Apparently SVN messed up when I applied the patch for 0c14436c26, so fix it.
Also include some fixes to elexis's oversights, refs #3355.

This was SVN commit r16979.
2015-09-03 07:32:32 +00:00
c0d8645a6d remove some unnecessary object<->array copies + some parentheses cleanup
This was SVN commit r16978.
2015-09-02 18:14:26 +00:00
0c14436c26 Move player and team number limits to a centralized file which will also eventually hold various kinds of settings.
Patch by elexis, refs #3355

This was SVN commit r16975.
2015-09-02 17:45:01 +00:00
0c4c6e499d Fix the LeaveFoundation order in UnitAI in the case of animals. The code used was a hack using the fleeing tactics, so use the regular "Order.LeaveFoundation" code shared with non-animal units.
Fixes #3372

This was SVN commit r16973.
2015-09-02 17:36:20 +00:00
bcc75b2156 fix buggy test
This was SVN commit r16972.
2015-09-02 17:11:29 +00:00
5ff31a1e33 small cleanup of unit_actions.js
This was SVN commit r16970.
2015-09-01 20:49:37 +00:00
c599019b0a fix crash when switching to gaia perspective while controlAllUnits is enabled
This was SVN commit r16969.
2015-09-01 20:46:49 +00:00
025391db35 fix behavior when under alert, fixes #3273
This was SVN commit r16968.
2015-08-31 19:54:06 +00:00
2c87ccb66e Fix typo causing errors for building placement.
This was SVN commit r16967.
2015-08-30 23:07:25 +00:00
9451cf38f7 Fixes Esc key opening options dialog in match setup, introduced by a964e83c79
This was SVN commit r16966.
2015-08-30 21:31:03 +00:00
1a15131d2d Lobby bot optimizations.
This was SVN commit r16964.
2015-08-30 17:50:16 +00:00
f47cb2c711 Fix the OOS reported by elexis in #3335, and clean some whitespace and style.
The list of modified entities was thrown out on global visibility
updates (those happen on rejoin) but only in-world entities were
actually updated then, causing problems with garrisoning.

Now the list of modified entities can happen to be large, so replace the
hacky check for infinite loops by a real check.

This was SVN commit r16962.
2015-08-30 17:42:10 +00:00
45a39e7dfd Fix 3171 by moving some logic to C++. These changes do not optimize the presence buffer and only fix the state bug.
This was SVN commit r16961.
2015-08-30 12:56:48 +00:00
acf7b7aefb Some gamesetup and in-game messages code convention related cleanup. Based on patch by elexis.
This was SVN commit r16958.
2015-08-30 03:34:07 +00:00
870237cce4 Do not create range queries in case we aren't at war with anyone. Fixes #3382.
This was SVN commit r16957.
2015-08-30 02:49:49 +00:00
8befb23db3 In-game chat code cleanup. Based on patches by elexis.
This was SVN commit r16956.
2015-08-30 02:21:17 +00:00
90a99a1589 Prevent observers from using most chat commands. Refs #2879.
Chat prefixed with /all could circumvent the check. Fix this by only
allowing /me.
(Note that this is not a full solution, see #3270.)

Refactors the cheat and chat input code based on changes in some of
elexis' patches.

This was SVN commit r16953.
2015-08-29 23:30:41 +00:00
a67b3b8942 UnitAI cleanup. Setup*RangeQuery. Refs #3080.
Do not create range queries when being destructed.
rangeMan -> cmpRangeManager.

This was SVN commit r16952.
2015-08-29 22:49:52 +00:00
6f0850f6bc Improve UnitAI's FindNearby* functions.
Stop them from starting a range query in case we have no ownership (or
-1).
Make use of Array.find() to make them a bit nicer.

This was SVN commit r16950.
2015-08-29 22:49:46 +00:00
31113cb8c3 UnitAI cleanup.
Use Array.{some,every,forEach,find} to simplify existing code.
Also make use of some fat arrow functions.
Some code style fixes.
Let FindNewHealTargets call RespondToHealableEntities to remove code
duplication.

This was SVN commit r16949.
2015-08-29 22:49:44 +00:00
5a7b4e380a Rename some occurences of *Man to cmp*Manager.
This was SVN commit r16948.
2015-08-29 22:49:42 +00:00
2b1c128b66 Change the attack hotkey to Ctrl.
This is both easier to press, and also does not introduce any hotkey
conflict.

This was SVN commit r16947.
2015-08-29 22:49:38 +00:00
39343a8c84 Fix test failure.
This was SVN commit r16946.
2015-08-29 22:49:32 +00:00
e56dddbefb Optionally allow observers to rejoin a game when they weren't here during the game setup.
Patch by elexis, fixes #3242.

This was SVN commit r16945.
2015-08-28 20:20:10 +00:00
d31ebaa47a add a new Repairable component defining a ratio of repairTime/buildTime for repairable entities. Fixes #633
This was SVN commit r16943.
2015-08-27 20:31:10 +00:00
e3208c8784 fix rallyPoint on foundation, (it worked only by chance because all structures are repairable)
This was SVN commit r16940.
2015-08-25 15:39:11 +00:00
217a478ac7 Improved materials for wooden towers (spec maps, AO maps, parallax). Patch and AO map by stanislas69, fixes #3352.
This was SVN commit r16938.
2015-08-24 07:09:05 +00:00
8923768bff Fix spelling of "Feminization" in the summary screen and in associated code.
This was SVN commit r16935.
2015-08-23 18:00:17 +00:00
47bca54228 Fixes the computation of team values for some of the summary counters, and reorder columns. Refs #3311
This was SVN commit r16934.
2015-08-23 17:57:51 +00:00
a63b7a0126 Add ability to query the map control percentage, and use this value in the summary screen. Patch by s0600204, fixes #3321
This was SVN commit r16933.
2015-08-23 17:44:37 +00:00
b694ab41d9 Show the number of trade carts and looted resources in the summary screen. Patch by bb, fixes #3311
This was SVN commit r16932.
2015-08-22 17:57:41 +00:00
d821601978 Revert changes when clicking "Cancel" in the options page.
Patch by Stefan, fixes #3324

This was SVN commit r16930.
2015-08-21 07:54:21 +00:00
c7edc09f51 Revert 7cc2d65ec7.
The problem caused by nested Maps is actually #3374.
Cloning the data object saved by the !AuraManager fixes #3188.
Also, using Map fixes a serialization problem, refs #3375.

On top of those changes, some reordering of add/multiply to avoid any
ordering mistake.

Fixes #3164, Refs #3374

This was SVN commit r16929.
2015-08-21 07:29:08 +00:00
a63e9c521d Optionally limit the framerate in menus to 50 FPS, to save power. Patch by elexis, fixes #2882
This was SVN commit r16927.
2015-08-20 13:22:44 +00:00
bd8f9b7824 Fix enemy corpses visible in the fog of war. Fixes #3179.
This was SVN commit r16919.
2015-08-16 09:29:34 +00:00
c333ae3fc2 Escape [ char in a gui caption.
This was SVN commit r16911.
2015-08-02 23:10:08 +00:00
3c8fe51712 complete b3f7b8633a for (un)packing
This was SVN commit r16910.
2015-08-02 17:24:04 +00:00
b3f7b8633a fix incoherent UnitAI state when changing ownership of a cheering or garrisoned unit
This was SVN commit r16908.
2015-08-02 09:39:08 +00:00
591771a0be make siege tower able to capture, fixes #3356
This was SVN commit r16907.
2015-08-02 09:32:47 +00:00
94302a4149 Move engine version to common file. Patch by elexis. Fixes #3359.
This was SVN commit r16906.
2015-08-01 23:03:13 +00:00
701f1dbb51 Fix sudden main-menu background jumps. Patch by s0600204. Fixes #3312.
This was SVN commit r16905.
2015-08-01 23:02:57 +00:00
2a6eac3bd4 Petra: fix order of event processing in defenseManager
This was SVN commit r16904.
2015-07-31 16:55:38 +00:00
4f91b16d0f Allow pausing during visual replays. Patch by elexis. Refs #3341.
This was SVN commit r16896.
2015-07-30 15:55:19 +00:00
356b08ec5d update heroes and their auras for capture, fixes #3331
This was SVN commit r16891.
2015-07-29 17:54:08 +00:00
f2f3076bd7 minor cleanup
This was SVN commit r16890.
2015-07-29 17:50:04 +00:00
7b81f9a866 add garrison flag for wooden tower, patch from stanislas69, fixes #3059
This was SVN commit r16889.
2015-07-29 17:15:40 +00:00
2cae918059 Same as previous commit, but nicer. Refs #3329
This was SVN commit r16886.
2015-07-27 20:39:46 +00:00
c81f243b58 Use the mirage data to determine the best attack in case of capture attack. Fixes #3329
This was SVN commit r16885.
2015-07-27 19:54:40 +00:00
be36bec6df Replace a translation string by an equivalent that is already used thrice.
This was SVN commit r16883.
2015-07-27 01:08:27 +00:00
2a655d1363 cleanup of 4054e5cb04
This was SVN commit r16880.
2015-07-26 14:54:52 +00:00
27de859f9b Petra: minor tweaks in farming
This was SVN commit r16879.
2015-07-26 14:49:01 +00:00
4054e5cb04 make a wooden tower template for each civ, refs #3059
This was SVN commit r16878.
2015-07-26 14:43:21 +00:00
edd03ad557 disable the delete button when less than 50% cp, fixes #3300, patch by bb
This was SVN commit r16877.
2015-07-22 17:06:06 +00:00
eb47670cd1 Some string fixes reported by translators.
This was SVN commit r16874.
2015-07-21 21:19:41 +00:00
a61c7560eb petra: minor attack tweaks
This was SVN commit r16873.
2015-07-21 19:30:54 +00:00
b0a5087dda Prevent observers from pausing the game. Patch by Stefan. Fixes #3341.
This was SVN commit r16871.
2015-07-19 23:03:03 +00:00
1e79b3a8af Update templates to reflect the recent obstruction changes for units.
Fixes #3294.

This was SVN commit r16868.
2015-07-18 12:30:26 +00:00
128a603287 Use the terrain-only grid for terrain edges in the short pathfinder algorithm. This grid is updated on each terrain change, whereas the passability grid is updated once a turn. This caused OOS on rejoin, fixes #3292.
However, using the terrain-only grid reveals one discrepancy between the
short pathfinder (which uses unit radii) and the long one (which uses
unit clearances). So I implemented the change proposed by sanderd17 in
#3294, which is removing unit radius and using only the pathfinder
clearance. Refs #3294
Now some tweaking has to be done in the templates, so that units get a
passability class suited to their apparent size. In the meantime the
unit motion is quite bugged.

This was SVN commit r16867.
2015-07-18 08:37:49 +00:00
35071dd44b allow changing the trading gain with tech + rework of market techs, fixes #3326
This was SVN commit r16866.
2015-07-17 19:27:15 +00:00
a0d21e8d9e do not fill changedTemplateInfo when no AIs to prevent OOS, refs #3133
This was SVN commit r16865.
2015-07-17 17:45:15 +00:00
b471975332 improve consistency between decay and regen rates for buildings, fixes #3332
This was SVN commit r16864.
2015-07-16 18:29:53 +00:00
76d5374e77 Some string changes based on translators' feedback.
This was SVN commit r16863.
2015-07-16 17:07:55 +00:00
f9440a964a minor petra tweaks
This was SVN commit r16860.
2015-07-15 17:29:06 +00:00
b0386d7fab Fix gamesetup for observer games. Thanks to elexis
This was SVN commit r16854.
2015-07-14 11:26:14 +00:00
d08279ceb6 some fixes for petra
This was SVN commit r16853.
2015-07-13 13:05:14 +00:00
74b600d661 modify also capture points in the civ specific techs affecting structure health, fixes #3333
This was SVN commit r16852.
2015-07-13 12:46:26 +00:00
c946ebbf7c prevent structures without territory influence to decay in allied territory
This was SVN commit r16851.
2015-07-12 18:46:44 +00:00
f74215e96c rounding needed for houses with popBonus%5 != 0, fixes #3328
This was SVN commit r16848.
2015-07-12 15:23:34 +00:00
0f10e21ab1 Keep ownership when changing formation. Fixes #3154, fix proposed by sanderd17.
This was SVN commit r16847.
2015-07-12 08:48:31 +00:00
9161cd7e24 petra: rework of the management of captured/decaying structures
This was SVN commit r16843.
2015-07-11 17:00:21 +00:00
c4389abceb let petra use wooden towers in village phase
This was SVN commit r16841.
2015-07-09 20:46:09 +00:00
1b88eaf1cd Do not reset victory conditions when changing map selection. The behavior is now coherent with everything else (players, etc.) when selecting random maps.
Patch by elexis, fixes #3209

This was SVN commit r16840.
2015-07-09 16:52:12 +00:00
b3fa75529b All work and no play... refs #3253
This was SVN commit r16839.
2015-07-08 19:17:32 +00:00
cf21c34e3f Give players and bots their actual name during the game, for better experience.
Patch by elexis, fixes #3253

This was SVN commit r16838.
2015-07-08 19:03:14 +00:00
542061dbed Handle gaps in the teams list in the summary screen, plus code cleanup.
Patch by elexis, fixes #3323

This was SVN commit r16837.
2015-07-08 17:01:34 +00:00
4a0bb47a62 AI: various cleanings and fixes
This was SVN commit r16836.
2015-07-07 17:32:35 +00:00
7ca2084e89 Fix #3072
This was SVN commit r16831.
2015-07-04 18:00:51 +00:00
b7a1b9fbd4 fixes some wonder templates
This was SVN commit r16830.
2015-07-04 16:46:20 +00:00
32252ea00c fix persian conscription_cavalry which needs persian levy_cavalry
This was SVN commit r16829.
2015-07-03 17:01:19 +00:00
512f69379b Fix the male variation of non-Roman healers. Fixes #3318
This was SVN commit r16828.
2015-07-02 16:59:16 +00:00
e500de4dc6 AI: clean up
This was SVN commit r16826.
2015-06-30 19:10:57 +00:00
6a9019564e AI: clean up some obsolete code
This was SVN commit r16823.
2015-06-28 19:08:00 +00:00
7b298cccdb Increase bench size to meet minimum obstruction size. Fixes #3316.
This was SVN commit r16822.
2015-06-28 19:05:22 +00:00
dc29884f6e Fix a shader glitch I left in when removing conditional defines. Fixes #3119 .
We ought to add more anisotropic filtering on normal textures with
parallax too or it breaks the effect too quickly.

This was SVN commit r16821.
2015-06-28 13:16:05 +00:00
3efa4be02c AI completes the removal of the JS pathfinder and fixes naval transport
This was SVN commit r16819.
2015-06-27 13:30:44 +00:00
575d708fca Correct the outpost tooltip for capturing.
Adapt the Theatron tooltip to the new specific name of the technology.
Add a final stop.

This was SVN commit r16818.
2015-06-25 20:14:45 +00:00
0b8597fd2d Petra: improve performance of initialization in naval maps
This was SVN commit r16817.
2015-06-25 18:19:12 +00:00
ae0c051e83 Petra: remove some huge spikes when profiling
This was SVN commit r16813.
2015-06-24 18:42:09 +00:00
4f331c1359 cleanup of previous commits
This was SVN commit r16810.
2015-06-22 20:04:11 +00:00
7ac4b53cb8 AI: start switch from the internal JS pathFinder to the c++ one, thanks to Itms implementation. Still wip
This was SVN commit r16809.
2015-06-22 17:19:24 +00:00
d045bb87d6 fix the market placement following new pathFinder changes
This was SVN commit r16808.
2015-06-22 16:49:49 +00:00
fae2caed1a adapt AIs to changes in e6d1afe48b
This was SVN commit r16807.
2015-06-22 16:47:42 +00:00
e6d1afe48b Add a terrain passability class for water. Fixes #3308
This was SVN commit r16806.
2015-06-22 15:30:23 +00:00
30d96af5a2 a bit of cleanup in petra naval code
This was SVN commit r16799.
2015-06-20 20:49:31 +00:00
92832b1dc7 Petra fixes for naval maps
This was SVN commit r16797.
2015-06-19 21:09:41 +00:00
cc4af6d2d4 Allies only share vision when researching a tech. Based on patch by niektb. Fixes #2055
This was SVN commit r16795.
2015-06-19 09:24:55 +00:00
eeee79e7f3 AI fix for building placement + some cleanings
This was SVN commit r16793.
2015-06-18 19:19:24 +00:00
008fb80855 AI: remove code from old pathFinder
This was SVN commit r16789.
2015-06-17 21:03:49 +00:00