Commit Graph

1257 Commits

Author SHA1 Message Date
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
a8c85035f8 Ignore gaia in PlayerData when loading maps.
This was SVN commit r16116.
2015-01-06 00:16:06 +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
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
e8d1acfa41 preserve random civ in saved game settings, refs #2963
This was SVN commit r16095.
2014-12-31 15:34:48 +00:00
2c20936ce3 Save map settings. Patch by @aBothe. Fixes #2963.
This was SVN commit r16089.
2014-12-31 00:21:24 +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
9a17a96054 Fix warning when following units. Fixes #2971.
This was SVN commit r16081.
2014-12-29 18:56:00 +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
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
96c45eac61 Fix missing escapes.
This was SVN commit r16056.
2014-12-21 02:23:17 +00:00
a13cc54fc3 Use correct variable. Fix #2957.
This was SVN commit r16052.
2014-12-16 21:05:24 +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
92ee34d76f Properly localize tribute messages.
This was SVN commit r16038.
2014-12-12 01:11:04 +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
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
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
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
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
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
1b91421e5e Escape special character.
This was SVN commit r15975.
2014-11-16 22:06:18 +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
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
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
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
518d2d0c2a Translation fixes.
This was SVN commit r15927.
2014-11-05 00:22:11 +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
23cabedec8 Translate map size of lobby games on the client.
This was SVN commit r15895.
2014-10-26 00:28:38 +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
1f8cd485d4 fix translation of ai chat messages (allowing for parameters)
This was SVN commit r15865.
2014-10-14 18:58:41 +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
807fd8c236 fix bonus caption display, thanks to Polakrity
This was SVN commit r15839.
2014-10-05 13:57:59 +00:00
e91215d5c9 improve gui performance, refs #2179 comment 21
This was SVN commit r15836.
2014-10-04 11:40:53 +00:00
20956c94b0 Update some strings.
This was SVN commit r15809.
2014-09-26 14:26:21 +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
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
6b2677a3fd Adds profiles to the multiplayer lobby. Fixes #2504.
This was SVN commit r15768.
2014-09-20 15:35:26 +00:00
6999295b7e Fixes #2768.
This was SVN commit r15763.
2014-09-19 03:14:46 +00:00