Commit Graph

9096 Commits

Author SHA1 Message Date
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
2eabb799b9 Clear the victory conditions properly. Refs #3001.
This was SVN commit r16232.
2015-01-25 20:52:10 +00:00
0423f6cc29 Petra: tweaks the starting strategy for scenarios with lot of units
This was SVN commit r16229.
2015-01-25 11:23:06 +00:00
59503b9ae9 Add basic support for GUI scaling factor, to help with high-res displays (e.g. 4K monitors and 1080p tablets).
Use the config setting "gui.scale = 0.5" to make the GUI bigger.

This was SVN commit r16223.
2015-01-24 20:06:37 +00:00
c02a7e1a7b SpiderMonkey 31 upgrade
This upgrade also introduces exact stack rooting (see to the wiki:
JSRootingGuide) and fixes problems with moving GC. This allows us to
enable generational garbage collection (GGC).
Measurements a few months ago have shown a performance improvement of a
non-visual replay of around 13.5%. This probably varies quite a bit, but
it should be somewhere between 5-20%. Memory usage has also been
improved. Check the forum thread for details.

Thanks to everyone from the team who helped with this directly or
indirectly (review, finding and fixing issues, the required C++11
upgrade, the new autobuilder etc.)! Also thanks to the SpiderMonkey
developers who helped on the #jsapi channel or elsewhere!

Fixes #2462, #2415, #2428, #2684, #1374
Refs #2973, #2669

This was SVN commit r16214.
2015-01-24 14:46:52 +00:00
b9e46f386b Disable online reporting of profiler data.
Nobody ever looks at the data, and it takes up a lot of server disk
space. The feature should probably be restored in the future once we've
fixed all the obvious performance problems, since a wider range of data
lets us search for system-dependent issues (e.g. some GL drivers are
particularly slow with particular features), but it's not worthwhile
now.

This was SVN commit r16213.
2015-01-24 14:29:05 +00:00
236f67d45f Petra: fix defensive garrison by using GarrisonArrowClasses + several small fixes
This was SVN commit r16212.
2015-01-24 13:28:17 +00:00
f1f36232d8 fix limit changer when stating limit = 0
This was SVN commit r16211.
2015-01-24 12:03:31 +00:00
a2efd97476 fix js error
This was SVN commit r16201.
2015-01-23 17:34:46 +00:00
f8bfe3eafb Clean up redundancies in templates for the Visibility component, refs #2913
This was SVN commit r16175.
2015-01-22 17:23:25 +00:00
ad1adbe027 Implement the Rotary Mill aura for Celtic factions. Patch by niektb, fixes #2900.
Also remove the placeholder technology and the rotary mill generic
Celtic template, and rename the rotary mill portrait. Refs #2619.

This was SVN commit r16174.
2015-01-22 10:16:26 +00:00
b5b9c0f2ae Improve template code style for the Decay component.
This was SVN commit r16171.
2015-01-21 21:45:05 +00:00
b65dcaba48 Prevent observers from using the team chat. Patch by trompetin17, fixes #2879.
This was SVN commit r16170.
2015-01-21 21:18:55 +00:00
df3222a073 Petra: improve choice of target when attacking, to prevent cases where most units would follow the same target
This was SVN commit r16167.
2015-01-20 18:31:57 +00:00
7a48606471 GLES compatibility for particle shader
This needs to use the model-view matrix, not model-view-projection (the
transform uniform), else the axes won't be unit vectors and the particle
sizes will be wrong. But GLES doesn't have the pre-defined matrices, so
pass it in explicitly.

This was SVN commit r16165.
2015-01-19 21:44:53 +00:00
4554ed676e continue to display research overlay after victory, fixes #2983
This was SVN commit r16161.
2015-01-18 16:55:52 +00:00
10f90fd8cf Petra: fix missing line in 0a5089c841
This was SVN commit r16159.
2015-01-18 10:28:30 +00:00
0a5089c841 Petra: prevent melee units to try to attack ships + tweaks on buildings
This was SVN commit r16154.
2015-01-17 17:50:27 +00:00
993d9c72d3 Petra: various small tweaks
This was SVN commit r16152.
2015-01-17 12:53:33 +00:00
702fb7344e allow maps to handle garrisoned units, fixes #2984
This was SVN commit r16147.
2015-01-13 17:59:55 +00:00
f2d71164e6 Fixes game mode defaulting to Conquest when Endless mode is selected.
Patch by niektb, thanks!

Fixes #3001.

This was SVN commit r16146.
2015-01-13 12:08:54 +00:00
528ed2d15e prevent error when switching perspective to gaia
This was SVN commit r16145.
2015-01-12 22:03:03 +00:00
e916c7e91f add display of trading goods when multiple selection
This was SVN commit r16144.
2015-01-12 21:39:31 +00:00
9855717840 Petra fix js warning when building cart super_dock, addresses #2998
This was SVN commit r16143.
2015-01-12 20:47:14 +00:00
320cfa0bfc Petra: complete the rework of starting game to allow more flexibility (i.e. support of nomad maps)
This was SVN commit r16142.
2015-01-11 22:47:24 +00:00
873399b294 fix a typo, addresses #2998
This was SVN commit r16136.
2015-01-10 19:41:02 +00:00
731e3dd13c Petra: continue rework of starting game to allow more game type
This was SVN commit r16135.
2015-01-10 14:34:26 +00:00
77dba7a8bb Remove some duplication in the gui tooltip code.
This was SVN commit r16134.
2015-01-09 17:08:12 +00:00
539b4d8372 Remove an old, useless and possibly broken call.
This was SVN commit r16133.
2015-01-09 16:59:01 +00:00
5cf2086a33 Fix the initial exploration of territories, which shouldn't be performed in Atlas.
Also clean up the code a bit.

Fixes #2969

This was SVN commit r16129.
2015-01-08 22:36:13 +00:00
006faaeaeb Petra: tunings for 9b79b5b844
This was SVN commit r16128.
2015-01-08 22:01:38 +00:00
0f21151c4b Some gui code cleanup/restructuring.
Moving some tooltip code that only needs templates to common/ to
allow to use that for the structree mod.

This was SVN commit r16127.
2015-01-08 21:37:59 +00:00
57ecf88ac2 Move some technology template and template information retrieval code
to globalscripts, so that the gui is able to use it without needing the
simulation.

This helps remove code duplication in the structree mod.

This was SVN commit r16125.
2015-01-08 19:55:10 +00:00
e8fb23e940 Fix tests broken in bd31f83587.
This was SVN commit r16124.
2015-01-08 19:20:34 +00:00
bdb1145f63 remove some debug printout forgotten in 9b79b5b844
This was SVN commit r16123.
2015-01-07 21:55:21 +00:00
9b79b5b844 Petra: first step of base management rework needed for nomad maps
This was SVN commit r16122.
2015-01-07 21:40:10 +00:00
bb6003ea0c rename civ specific player template following 4243433f94 convention
This was SVN commit r16121.
2015-01-07 21:18:59 +00:00
bd31f83587 Check if components exist before using them.
Remove EntityLimits and TechnologyManager from the gaia player template.

This was SVN commit r16120.
2015-01-07 20:48:36 +00:00
4243433f94 Use a gaia specific player entity.
Fix some code that assumed components exist instead of testing for them.
EntityLimits and TechnologyManager are not needed for gaia and will be
removed in the future.

This was SVN commit r16119.
2015-01-07 20:33:19 +00:00
c6bb3df43a following #2877, civilCentre must be disabled for this kind of scenario
This was SVN commit r16118.
2015-01-07 20:29:01 +00:00
01fb25fdab Fix variable name.
This was SVN commit r16117.
2015-01-07 19:52:33 +00:00
a8c85035f8 Ignore gaia in PlayerData when loading maps.
This was SVN commit r16116.
2015-01-06 00:16:06 +00:00
d8b1549883 Seleucid farmstead
This was SVN commit r16114.
2015-01-04 12:46:57 +00:00
045fea23aa Properly adjust Atlas for the init changes.
This was SVN commit r16112.
2015-01-03 17:42:42 +00:00
c21514b844 Do not include domestic animals in military selection. Patch by trompetin17. Fixes #2978.
This was SVN commit r16111.
2015-01-03 15:44:28 +00:00
dadfcb06d2 Specify icons for base phase techs.
This was SVN commit r16110.
2015-01-03 15:15:55 +00:00
d13821fa7d Village phase icon
This was SVN commit r16109.
2015-01-03 12:01:21 +00:00
0195cdb374 Seleucid storehouse
This was SVN commit r16108.
2015-01-03 04:03:22 +00:00
abb62b0662 fix a typo in petra, thanks to brian
This was SVN commit r16106.
2015-01-02 19:35:35 +00:00
21f525c966 Seleucid temple now has fully articulated stairs!
This was SVN commit r16105.
2015-01-02 14:43:07 +00:00
5bad08d66b Seleucid civ center placeholder
This was SVN commit r16102.
2015-01-02 13:21:40 +00:00
8097eeb8ab Fix RMS library forgotten in the previous commit.
Changes some direct accesses to use the library function.

This was SVN commit r16100.
2015-01-01 23:57:00 +00:00
a472944689 Clean up LoadPlayerSettings.
Include gaia to make iteration easier.
Add TemplateExists() to the TemplateLoader. Refs #2877.

This was SVN commit r16099.
2015-01-01 23:10:24 +00:00
8e30410109 Improve PickEntitiesAtPoint
First, do a ray intersection test with the bounding-sphere for all
entities on the map and then check the more detailed selection shape for
the remaining candidates. Do checks that require component lookups after
the ray intersection tests because these are relatively expensive.
The old method for figuring out which entities are below the mouse
cursor was incorrect because it does a 2D check to filter out the first
candidates which can lead to incorrect results with lower camera angles
and high buildings or buildings with a large footprint. Such problems
were avoided with quite a large radius for this 2D test and resulted in
a large number of candiate entities after this first test (200-500).
Also rename PickEntitiesAtPoint to PickEntityAtPoint and make it return
only one (the closest) match.

I've tested performance with the tracelogger by starting a map and then
moving the mouse in circles for one minute. The results were relatively
stable. I've compared the total time percentage of input.js:836, which
spends nearly all of the time in PickEntityAtPoint.
Ardennes Forest - Normal size:       Original: 41.46%    Patched: 31.6%
Ardennes Forest - Giant size:        Original: 40.59%    Patched: 51.55%

As we see, it's faster on normal map sizes but slower on giant maps with
a lot of entities.
This approach can be further improved with some kind of spatial
subdivision for the culling (like an octree), which would help the unit
renderer too. This way it should be possible to make it faster (and
still correct) on all map sizes and with a large total numbers of
entities.

This was SVN commit r16098.
2015-01-01 23:05:26 +00:00
7ac837fb90 allow the removal of entity limits when some requirements are satisfied. This allows to have starting games without cc
This was SVN commit r16097.
2015-01-01 18:28:21 +00:00
95e0763ac9 Seleucid temple commit! Minor edits to Sele_struct_2 texture file.
This was SVN commit r16096.
2015-01-01 16:28:32 +00:00
e8d1acfa41 preserve random civ in saved game settings, refs #2963
This was SVN commit r16095.
2014-12-31 15:34:48 +00:00
802320e753 some petra cleanings
This was SVN commit r16094.
2014-12-31 09:59:47 +00:00
9329506e0d add support for civ specific player template, see #2877
This was SVN commit r16092.
2014-12-31 09:31:41 +00:00
f984ba40ee Seleucid house commit
This was SVN commit r16091.
2014-12-31 07:27:07 +00:00
2c20936ce3 Save map settings. Patch by @aBothe. Fixes #2963.
This was SVN commit r16089.
2014-12-31 00:21:24 +00:00
555601fe51 Petra: avoid creating unused entitycollections
This was SVN commit r16085.
2014-12-29 23:56:37 +00:00
f337905f14 Actually focus the group instead of following it. Patch by trompetin17. Fixes #2972.
This was SVN commit r16083.
2014-12-29 20:40:37 +00:00
53023b7efc This was SVN commit r16082. 2014-12-29 19:26:37 +00:00
9a17a96054 Fix warning when following units. Fixes #2971.
This was SVN commit r16081.
2014-12-29 18:56:00 +00:00
354bd8b088 Only delete/create players until the needed number is reached. Patch by trompetin17. Fixes #1953.
Previously we removed all players and created them anew. This caused
issues in Atlas,
as some components were recreated, but did not get informed about
already existing
entities (eg cmpTechnologyManager). By only creating/deleting players
until we obtain
the new number of players we do not have this issue.

This was SVN commit r16080.
2014-12-29 17:33:39 +00:00
f2edd35989 Enable LoadCivData to only load playable civs. Patch taken from s0600204's structree work.
This was SVN commit r16079.
2014-12-29 16:24:42 +00:00
8608b0fe89 Seleucid Tower and textures
This was SVN commit r16078.
2014-12-29 12:29:41 +00:00
0406f62ea0 Fix a typo, reported by t4nk004 on IRC.
This was SVN commit r16076.
2014-12-28 16:35:32 +00:00
92af594986 Petra: rewrite a stupidly inefficient function spotted by the traceLogger
This was SVN commit r16073.
2014-12-27 18:44:34 +00:00
0dd6711afa make Petra support passability and territory maps of different resolutions, addresses #2960
This was SVN commit r16072.
2014-12-27 15:23:20 +00:00
2ef3c0c42e Compute the actual percentage of map explored by the team in the summary screen.
Fixes #2587.

This was SVN commit r16071.
2014-12-26 19:13:40 +00:00
dbb4b2c920 Update the Greek Acropolis (4) map description to remove the reference to the old non-skirmish map.
This was SVN commit r16070.
2014-12-26 18:07:10 +00:00
ec9e0dfeed Add missing file in 286112e0aa.
Refs: #2937.

This was SVN commit r16065.
2014-12-25 14:22:15 +00:00
286112e0aa Fixes #2937. Thanks to Lion_Kanzen and Pureon for making icons.
This was SVN commit r16064.
2014-12-25 05:12:39 +00:00
b2650e08ba Fixes obelisks for player 2 and player 3 that were inverted.
Patch by silure, thanks!

Fixes #2962.

This was SVN commit r16063.
2014-12-24 15:26:45 +00:00
9684bcd360 add AI support of maps of different dimensions, see #2960
This was SVN commit r16062.
2014-12-23 14:17:52 +00:00
4ce667412b Improve performance when looking for new targets.
Tested in combat demo huge where nearly 50% of the replay time is spent
looking for new targets, and GetPreference is called a lot as used to
sort possible targets.
Caching the preferred classes before the second loop, the replay time of
combat demo huge is reduced by about 15%. Replacing the "for each" loops
by "for of" loops gains an additionnal 7%.

This was SVN commit r16057.
2014-12-21 14:30:47 +00:00
96c45eac61 Fix missing escapes.
This was SVN commit r16056.
2014-12-21 02:23:17 +00:00
01e2a33486 various small improvements in petra (choice of units in start game, ram management and team warnings when new trade route available)
This was SVN commit r16054.
2014-12-19 17:57:24 +00:00
39f6a8d3cd reshuffle the petra deserialization to prevent it to modify the metadata infos
This was SVN commit r16053.
2014-12-16 21:33:07 +00:00
a13cc54fc3 Use correct variable. Fix #2957.
This was SVN commit r16052.
2014-12-16 21:05:24 +00:00
a143c847e2 small fixes for petra
This was SVN commit r16051.
2014-12-14 21:35:24 +00:00
9b6981465a improve a bit the fix of 639a174388
This was SVN commit r16048.
2014-12-13 21:30:13 +00:00
639a174388 petra: fix choice of target when enemy resigned + some cleanings
This was SVN commit r16047.
2014-12-13 16:47:37 +00:00
add113a2a1 Remove duplicated layers of unescaping which required multiple escapes in some places.
This was SVN commit r16043.
2014-12-13 01:08:29 +00:00
a22f30c9b0 Improve AI performances thanks to traceLogger diagnostics. The gain is about 10% of AI time. The patch includes also some code cleanings.
This was SVN commit r16042.
2014-12-12 17:41:10 +00:00
34855896d0 fix typo in 30fb8d0f57
This was SVN commit r16041.
2014-12-12 07:36:34 +00:00
30fb8d0f57 ResourceGatherer cleanup.
s/var/let/, check if cmpPlayer != null before using it, some whitespace.

This was SVN commit r16039.
2014-12-12 01:11:06 +00:00
92ee34d76f Properly localize tribute messages.
This was SVN commit r16038.
2014-12-12 01:11:04 +00:00
539046f750 Improves performance for the ResourceGatherer component
The tracelogger has shown one of the functions as 4.9% and one as 2.2%
before the patch. After the patch, both functions were below 0.5%. 100%
is the time for all JS code being executed during a non-visual replay,
including GC, overhead for the tracelogger and JIT code compiling.

This was SVN commit r16036.
2014-12-11 23:12:08 +00:00
e435ef2704 several optimisations on the ai, refs #2370
This was SVN commit r16035.
2014-12-11 20:24:33 +00:00
21ecb22432 remove some now empty functions following previous patch
This was SVN commit r16032.
2014-12-09 20:30:27 +00:00
bce404adf2 Fixes the translation of the map size in the rihgt sidebar of the lobby
Fixes #2547

This was SVN commit r16031.
2014-12-09 20:11:16 +00:00
ae7c2f9586 ai: entitycollections switch to maps, see #2370
This was SVN commit r16030.
2014-12-09 19:55:37 +00:00
36187ea64a petra: allow replacing civ center in game
This was SVN commit r16029.
2014-12-08 18:23:27 +00:00
6a785f791a additional fix for inefficient EC, thanks to Yves for noticing
This was SVN commit r16028.
2014-12-07 22:19:59 +00:00
3e09cf4797 improve petra performances, see #2370
This was SVN commit r16027.
2014-12-07 16:36:56 +00:00
37ae9f4ad2 fix previous tag
This was SVN commit r16026.
2014-12-06 16:13:13 +00:00
0facb07ca6 petra: changes in farms and tributes management
This was SVN commit r16025.
2014-12-06 14:48:06 +00:00
b05879e151 Move template items GetRetainInFog and AlwaysVisible from Vision to Visibility.
Refs #2913

This was SVN commit r16022.
2014-12-05 18:33:59 +00:00
0df90c5c2b ai common api : use maps for entitycollection lists + cleanings
This was SVN commit r16019.
2014-12-03 20:22:13 +00:00
4931652263 Non-fighting ships should not be agressive by default
This was SVN commit r16017.
2014-12-01 20:58:46 +00:00
5403c19cf0 petra: internal functions are now serialized
This was SVN commit r16016.
2014-11-30 19:05:39 +00:00
c0092aaca5 petra: some cleanings + (small) timing optimizations
This was SVN commit r16012.
2014-11-29 18:53:17 +00:00
049312e5a2 various small tunings for petra
This was SVN commit r16011.
2014-11-26 22:01:40 +00:00
89cc0fd0e1 Add support to escape dots (.) by using double dots (..) for aura keys. Fixes #2945 (I think)
This was SVN commit r16010.
2014-11-26 19:59:08 +00:00
1430efa9d6 Properly handle auto-research promotion techs at game start.
This was SVN commit r16009.
2014-11-25 22:47:02 +00:00
7102f86de3 petra: avoid updating some no-more-used entitycollections
This was SVN commit r16008.
2014-11-25 19:00:17 +00:00
347ffabaeb Change the way we filter out selected entities when we draw a selection box. Add a hotkey to allow selecting only idle units.
Patch by Rolf Sievers, fixes #2407.

This was SVN commit r16007.
2014-11-24 16:46:05 +00:00
882c1383e1 Add wall style for Seleucids in the random map scripts. Currently, Hellenic walls are used. Fixes a bug in the Fortress random map.
Patch by FeXoR.

Fixes #2942, refs #2619.

This was SVN commit r16006.
2014-11-24 16:19:17 +00:00
04343a8407 Fix a comment written too quickly
This was SVN commit r16005.
2014-11-23 21:47:15 +00:00
a7cc670a2d petra: stop (after some time) to try gathering inaccessible resources (i.e. chicken inside buildings in random maps) + some cleanings
This was SVN commit r16004.
2014-11-23 14:48:26 +00:00
5f9c908abb Allow techs to modify the resources that can be dropped of at dropsite. Patch by niektb. Fixes #2629.
This was SVN commit r16003.
2014-11-22 23:21:11 +00:00
87d5d37488 Some source string fixes.
This was SVN commit r16002.
2014-11-22 22:21:54 +00:00
d1cdf8f952 display victory conditions when selecting a map, fixes #2727
This was SVN commit r16000.
2014-11-21 18:30:17 +00:00
0cc9cfd40c fix a JS error in petra
This was SVN commit r15999.
2014-11-21 17:46:07 +00:00
2734982657 Escape a character.
This was SVN commit r15998.
2014-11-20 22:19:35 +00:00
f90841cf78 add a very-easy level for AI, addresses #2899
This was SVN commit r15990.
2014-11-18 21:21:21 +00:00
da1af993f7 petra: better AI recovery after its economy is badly damaged + some fixes
This was SVN commit r15989.
2014-11-18 19:56:23 +00:00
afecbf02f3 Extend the config parser to support ini-style config files. Refs #1810.
Config settings in a section are stored as "sectionname.setting"
internally.
Do not write section headers when writing config files as we would need
to write
settings without a dot first or ignore them. This can be changed once
all settings
belong to a section.

This was SVN commit r15986.
2014-11-18 03:57:07 +00:00
3e4c701ab6 ensure that there are no dupes in buildable list
This was SVN commit r15983.
2014-11-17 23:07:57 +00:00
334f391446 Oxford comma.
(We seem to use it elsewhere in the UI, so be consistent.)

This was SVN commit r15979.
2014-11-16 23:44:40 +00:00
cbc49f43e6 The show full games filter in the lobby should be off by default.
This was SVN commit r15978.
2014-11-16 22:40:00 +00:00
947abde749 Flip the buttons in the leave game confirmation dialog to the no/yes order to match other dialogs.
Per the Apple Human Interface Guidelines the confirmation button should
be on the right. We do that for all(?) other dialogs, but not this one.

This was SVN commit r15977.
2014-11-16 22:21:57 +00:00
caed74df23 Fix line endings.
This was SVN commit r15976.
2014-11-16 22:21:06 +00:00
1b91421e5e Escape special character.
This was SVN commit r15975.
2014-11-16 22:06:18 +00:00
30b7a34112 Rename Arcadia 2 to Arcadia, because there doesn't seem to be an Arcadia 1 any more.
This was SVN commit r15974.
2014-11-16 22:03:47 +00:00
f88ee2766e use by default a random seed for the AI to make it less repetitive
This was SVN commit r15973.
2014-11-16 19:53:29 +00:00
94e6e29a34 Properly escape a character and remove a stray tag.
This was SVN commit r15972.
2014-11-16 18:00:02 +00:00
ccb5366e40 fixes #2935
This was SVN commit r15971.
2014-11-16 10:09:20 +00:00
df4c07238d Change GUI tag parsing to use a FSM instead of using CParser. Refs #2589.
Parameters now have to be quoted with ".
Supports " in parameters by escaping them with \.
Tag start characters can be included in normal text by escaping them
with \.
Better error handling and a error messages to help with fixing
invalid/malformed strings.

This was SVN commit r15969.
2014-11-16 02:10:28 +00:00
d15e2f0cf6 Check for availability of XmppClient.
Move Lobby script function registration to the lobby JS interface.

This was SVN commit r15968.
2014-11-16 02:10:24 +00:00
8a290b3204 Fix mirages not flushed properly, introduced in 9ad2fc9fac.
This was SVN commit r15963.
2014-11-13 21:04:40 +00:00
1a0f9b086e GUI cleanup.
Remove toTitleCase(). Unify iColorToString() and rgbToGuiColor().
Translate XMPP errors (displayed when connecting).

This was SVN commit r15960.
2014-11-13 01:26:36 +00:00
6e788fb15e Clean up JSON parsing code. Refs #1374.
Fix Engine.ReadJSONFile() which did throw a JS exception that was not
caught. Discovered by s0600204.
Expose Engine.ReadJSONFile() to the gui scripts.

This was SVN commit r15959.
2014-11-13 01:26:22 +00:00
e1c77bb487 Fix tests.
This was SVN commit r15958.
2014-11-12 19:51:28 +00:00
6556aa8c1e fix petra serialization
This was SVN commit r15957.
2014-11-12 18:44:43 +00:00
9ad2fc9fac Slightly improve fogging performance by avoiding the constant deletion/re-creation of mirages.
This makes the simulation update faster per entity but also makes the
number of entities greater at a given moment. The performance gain is
positive.

This was SVN commit r15956.
2014-11-12 15:56:45 +00:00
7130997df9 still more fixes on ai serialization + some cleanings
This was SVN commit r15954.
2014-11-11 22:08:28 +00:00
b596f7a893 additional fixes for petra serialization
This was SVN commit r15953.
2014-11-11 19:02:35 +00:00
13a71f6ae4 some fixes and cleaning in petra saved game support
This was SVN commit r15952.
2014-11-11 11:07:57 +00:00
6bab40c139 some bugfixes on ai serialization
This was SVN commit r15951.
2014-11-10 20:22:10 +00:00
e4774066e2 complete the support of saved games by Petra. It is playable now, but still needs cleaning and bug fixes.
This was SVN commit r15950.
2014-11-10 18:35:52 +00:00
c236e8a877 further steps towards saved games support, but still wip
This was SVN commit r15948.
2014-11-10 09:03:03 +00:00
e1f354024a Persian temple upgrade
This was SVN commit r15945.
2014-11-09 11:30:50 +00:00
9040f8a3d3 Persian stables upgrade
This was SVN commit r15941.
2014-11-08 23:51:33 +00:00
edd9622050 wip petra support of saved games, still incomplete
This was SVN commit r15940.
2014-11-08 19:23:29 +00:00
b5c8646cea Fix actors not retained in FoW after d07d1a17f3.
Refs #2913.

This was SVN commit r15939.
2014-11-08 18:14:45 +00:00
db2f570ef6 Added several missing files of previous commit
This was SVN commit r15938.
2014-11-08 13:21:10 +00:00
e3e829c4b1 Upgraded persian fortress variation B.
Upgraded all cypress variations.
Added six tropical shrubs.

This was SVN commit r15937.
2014-11-08 13:07:45 +00:00
2db1f14015 Cart_fortress recentered.
This was SVN commit r15935.
2014-11-07 11:27:59 +00:00
259fcdd8ed Roman vesta temple and triumphal arch AO maps.
Added missing actor for persian barracks

This was SVN commit r15934.
2014-11-07 10:56:41 +00:00
a4b209bf2c Set text align for options to left, increase the size for labels for boolean options. Fixes #2918.
This was SVN commit r15933.
2014-11-07 01:24:13 +00:00
1d1c086e2a Allow translating some strings in the mod selector. Fixes #2919.
Also change column size so that the gd translation fits. (Verified with
long strings)

This was SVN commit r15932.
2014-11-07 00:57:09 +00:00
cbc151cb1e Persian barracks upgrade.
This was SVN commit r15931.
2014-11-07 00:29:31 +00:00
8200182399 Persian fortress variation upgrade. Second variation upgrade soon.
This was SVN commit r15930.
2014-11-06 11:29:14 +00:00
6ae21e1ce7 some ai cleaning
This was SVN commit r15929.
2014-11-05 21:03:25 +00:00
7dad37c78f Some cleanup. Fix a comment.
This was SVN commit r15928.
2014-11-05 00:22:14 +00:00
518d2d0c2a Translation fixes.
This was SVN commit r15927.
2014-11-05 00:22:11 +00:00
d07d1a17f3 Add a new Visibility component that will eventually allow scripted components and mods to influence an entity's visibility.
This first commit only refactors code and does not add any new feature.

Refs #2913 (see this ticket for more information about the change)

This was SVN commit r15925.
2014-11-04 20:53:25 +00:00
0855c1169b Upgraded persian Civic centre. Added new shrubs. New pers_cc variation in process
This was SVN commit r15924.
2014-11-04 11:45:20 +00:00
2cfab37485 Persian market variations upgrade. Added ao/normal/spec and made the stalls conform to the terrain.
This was SVN commit r15923.
2014-11-02 21:58:57 +00:00
6e30381acd petra: push priority of first market and remove some unnecessary ===
This was SVN commit r15922.
2014-11-02 20:45:57 +00:00
f9d7335e12 simplify the way petra deals with worker
This was SVN commit r15921.
2014-11-02 20:27:13 +00:00
7cdbd7a6fd Fixed ao map for the roman short wall segment
This was SVN commit r15920.
2014-11-02 17:00:29 +00:00
221d93da91 Upgraded persian buildings:
blacksmith, dock, farmstead, defense tower, wonder

This was SVN commit r15919.
2014-11-01 11:36:01 +00:00
69c1e4fc52 prevent petra to build siege towers as it does not know how to use them
This was SVN commit r15918.
2014-10-31 17:22:44 +00:00
772024a10c fix a JS error
This was SVN commit r15917.
2014-10-30 20:16:59 +00:00
f756cab1f8 Update sprintf.js to the latest version 1.0.2 (https://github.com/alexei/sprintf.js).
Update suggested and patch generated by Shane, fixes #2859.

This was SVN commit r15916.
2014-10-29 23:23:11 +00:00
5491faffba New unit mesh variations and heads with some example animations and units xmls
This was SVN commit r15915.
2014-10-29 22:48:48 +00:00
2b841f56ae petra: cleaning of the code for dock placement
This was SVN commit r15911.
2014-10-27 19:53:06 +00:00
e2536ae4bc Internationalizes in-game menu text, based on patch by Jaison, fixes #2540.
Fixes inconsistent use of "Settings" to refer to game options dialog

This was SVN commit r15906.
2014-10-27 01:32:11 +00:00
e3e86e2a29 Fixes init of post processing effects, so they can be cleanly enabled/disabled at runtime. Fixes #2890, refs #2672, #2893.
Updates descriptions on options screen and fixes comment in default.cfg
(smoothlos does not require preferglsl)

This was SVN commit r15905.
2014-10-27 00:53:31 +00:00
466942fc29 fix the choice of target in attacks + start changes in dock placement + some cleanings
This was SVN commit r15903.
2014-10-26 13:10:20 +00:00
b4997dc7c6 Fixes minimap GLES compatibility by making point size a uniform and passing into the shaders
This was SVN commit r15901.
2014-10-26 04:37:26 +00:00
21b83734f9 Fixes shader type error with some compilers
This was SVN commit r15900.
2014-10-26 01:44:58 +00:00
23cabedec8 Translate map size of lobby games on the client.
This was SVN commit r15895.
2014-10-26 00:28:38 +00:00
ae10d34d99 Switch i18n scripts to use Pology. Fixes #2539.
Still requires a patch to Pology to keep the source file ordering.

This was SVN commit r15894.
2014-10-26 00:28:35 +00:00
cf3e42f6fb Make map description end with a full stop.
This was SVN commit r15893.
2014-10-26 00:28:26 +00:00
c524542477 Make map description end with a full stop.
This was SVN commit r15892.
2014-10-21 20:03:06 +00:00
b2f9dc305c check that selected units still exist when rebuilding the selection
This was SVN commit r15891.
2014-10-21 16:26:27 +00:00
2a7c3a95f9 improve gui performance, refs #2179 comment 28
This was SVN commit r15889.
2014-10-18 16:37:53 +00:00
620399270d various small petra tunings
This was SVN commit r15880.
2014-10-17 17:15:06 +00:00
a29e233fdf Remove another leftover "Counter" string, see also d3351a645f.
Patch by thamlett, fixes #2830

This was SVN commit r15879.
2014-10-17 14:19:32 +00:00
ba5685eff3 cleaning of the Petra configuration
This was SVN commit r15877.
2014-10-15 20:52:23 +00:00
f7a64d4abc Prevents gaul defense_tower_a from showing a unit when not garrisoned. Fixes #2876
This was SVN commit r15876.
2014-10-15 19:08:15 +00:00
a63328d859 Upgraded persian struct texture missing in previous commit.
This was SVN commit r15875.
2014-10-15 16:20:59 +00:00
c1575e8f48 Upgraded persian houses and palace with normal and AO.
Upgraded persian textures (diffuse normal and spec) WIP

This was SVN commit r15872.
2014-10-15 13:59:55 +00:00
78896154fe Change a scope for a bunch of variables in the Attack component. This simple change allows modders to modify the whole attack schema.
Patch by Radagast, fixes #2671

This was SVN commit r15868.
2014-10-14 20:44:17 +00:00
d3351a645f Remove some "Counters/Countered by" tooltips as the hard counters system has been disabled.
Patch by thamlett, fixes #2830

This was SVN commit r15867.
2014-10-14 20:37:15 +00:00
8ce7c818f5 internationalization of ai chat messages
This was SVN commit r15866.
2014-10-14 19:43:19 +00:00
1f8cd485d4 fix translation of ai chat messages (allowing for parameters)
This was SVN commit r15865.
2014-10-14 18:58:41 +00:00
bb02dcd0e9 Fix broken tests.
This was SVN commit r15864.
2014-10-14 01:25:32 +00:00
7090334756 fix previous commit
This was SVN commit r15863.
2014-10-13 19:55:12 +00:00
20a9c9ab62 prevent the AI from using disabled templates
This was SVN commit r15862.
2014-10-13 19:52:03 +00:00
4ef63e8673 Change tooltips with incorrect garrison count. Patch by thamlett. Fixes #2748.
This was SVN commit r15860.
2014-10-12 23:15:28 +00:00
affdd9f548 Petra now send (if enough resources) tributes to allies in difficulty
This was SVN commit r15859.
2014-10-12 22:12:15 +00:00
443158869c let the AIs know when a tribute is sent
This was SVN commit r15858.
2014-10-12 22:00:19 +00:00
ec8e240e81 redesign of the trading for Petra, should me more efficient and supports naval trading
This was SVN commit r15856.
2014-10-12 20:21:47 +00:00
5d9029a1d9 stop trying to build when not enough resources, fixes #2835
This was SVN commit r15855.
2014-10-12 20:09:03 +00:00
7fd407ca1f update correctly the tradeRoute set on market foundations
This was SVN commit r15854.
2014-10-12 19:56:24 +00:00
3df4799dea enable test on tech for AI
This was SVN commit r15853.
2014-10-12 19:55:15 +00:00
3c8ef99007 Switch lobby room. Update mod version.
This was SVN commit r15850.
2014-10-12 19:27:42 +00:00
2af4272c07 allow war dogs to garrison in ships
This was SVN commit r15840.
2014-10-05 19:25:27 +00:00
807fd8c236 fix bonus caption display, thanks to Polakrity
This was SVN commit r15839.
2014-10-05 13:57:59 +00:00
642011e6c0 Fixes tests broken in e91215d5c9.
This was SVN commit r15838.
2014-10-04 15:37:33 +00:00
90c0957cef Fixes cavalry upgrade inconsistencies.
This was SVN commit r15837.
2014-10-04 14:13:14 +00:00
e91215d5c9 improve gui performance, refs #2179 comment 21
This was SVN commit r15836.
2014-10-04 11:40:53 +00:00
8a3435915b Slightly buffs swordsmen and fixes a couple inconsistencies.
This was SVN commit r15835.
2014-10-04 05:31:29 +00:00
54bc1c7173 Fixes #2831. Patch by prodigalson.
This was SVN commit r15834.
2014-10-04 05:17:36 +00:00
5c97a681d4 fix typo in Petra, thanks niektb for noticing
This was SVN commit r15829.
2014-10-02 19:01:26 +00:00
a18107aa7c Fix placing of some entities in various maps, refs #2560.
This was SVN commit r15822.
2014-09-28 16:53:19 +00:00
e07305fd9f Buffs melee cavalry attack by 20% and overall cavalry speed by 2.0.
This was SVN commit r15817.
2014-09-27 22:01:50 +00:00
b524f59657 check ResourceGatherer interface before trying to gather, fixes #2801
This was SVN commit r15812.
2014-09-26 21:23:32 +00:00
20956c94b0 Update some strings.
This was SVN commit r15809.
2014-09-26 14:26:21 +00:00
7ca08e2485 Fix type errors in cmpAttack by switching parameter and object.
This was SVN commit r15805.
2014-09-25 16:33:38 +00:00
eda8f3cc18 Tweak some strings, addressing concerns pointed out by translators on Transifex.
This was SVN commit r15804.
2014-09-25 15:36:18 +00:00
d7d1607021 Fix GUI errors when a client joins a multiplayer game setup room.
Based on a patch by cwprogger, fixes #2779

This was SVN commit r15802.
2014-09-25 15:05:10 +00:00
a815ca0de9 Nerfs sele hero aura, transitions a tech, and fix spaces.
This was SVN commit r15798.
2014-09-25 00:53:48 +00:00
d67ffa039c Handle an error of no suitable tiles being found gracefully in Schwarzwald RMS. Fixes #2787.
This was SVN commit r15797.
2014-09-24 20:48:19 +00:00
533fb6f7bc Load the public mod by default. Fixes #2754.
This was SVN commit r15796.
2014-09-24 17:49:22 +00:00
d6709d3e08 Ignore mods (in the modmod) that do not specify required properties. Fixes #2822. Refs #2794.
Fixes description display if filters are used.

This was SVN commit r15792.
2014-09-24 01:36:57 +00:00
091b958344 Fix an issue with filters and translations in the modmod.
This was SVN commit r15791.
2014-09-24 00:26:13 +00:00
03dd6908ec Petra: decreases size of attacking armies in easy level
This was SVN commit r15784.
2014-09-22 18:53:54 +00:00
a89d0190bd Use ES6 Maps in the AI API for applying tech and aura modification to entity templates.
This should improve performance a bit (check the ticket for details).

Refs #2475

This was SVN commit r15781.
2014-09-21 21:02:15 +00:00
bce96c99bb small fixes/improvments to the AI
This was SVN commit r15776.
2014-09-21 12:02:33 +00:00
357fa957c8 Add a translation comment for "Join Game" buttons in the main menu and the lobby, to clarify the translation context.
Fixes #2548

This was SVN commit r15775.
2014-09-21 08:35:21 +00:00
a8d8c6d101 Reverts the use of Set in f5336c42b8.
Sets don't support multiple elements with the same key which is required
here to fire timers multiple times per turn.
Refs #2475

This was SVN commit r15773.
2014-09-20 18:48:12 +00:00
f5336c42b8 Adds Serialization support for ES6 Maps.
Also includes the patch from Sanderd17 to use Maps and Sets for the
Timer components. Sets can't be serialized yet, but in this case they
don't require serialization.
Refs #2475

This was SVN commit r15770.
2014-09-20 17:14:53 +00:00
6b2677a3fd Adds profiles to the multiplayer lobby. Fixes #2504.
This was SVN commit r15768.
2014-09-20 15:35:26 +00:00
d62e3729d5 Improves SDL2 support, includes patch by yashi and fabio, refs #2041:
* Adds SDL color cursor implementation
* Adds config option for choosing preferred display in multimonitor
setup
* Uses text input API to better handle CJK input
* Fixes various hotkey and input bugs

SDL 1.2 is still the default and recommended, to test experimental SDL2
support, pass the --sdl2 flag to update-workspaces

This was SVN commit r15767.
2014-09-20 12:12:35 +00:00
55b12857b3 Buffs ranged units slightly as massing melee units was slightly overpowered.
This was SVN commit r15764.
2014-09-19 03:39:24 +00:00