e916c7e91f
add display of trading goods when multiple selection
...
This was SVN commit r16144.
2015-01-12 21:39:31 +00:00
77dba7a8bb
Remove some duplication in the gui tooltip code.
...
This was SVN commit r16134.
2015-01-09 17:08:12 +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
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
809189d953
Fixes "quit" command and GUI notification for AI debugging, fixes #2755
...
This was SVN commit r15758.
2014-09-16 02:50:49 +00:00
b2a479cc74
reset some map attribute, addresses #2803
...
This was SVN commit r15757.
2014-09-15 21:59:51 +00:00
28c0b00b2e
Sorts games in gamesList by status, then name. Refs #2463 , #2448 .
...
This was SVN commit r15754.
2014-09-14 22:11:03 +00:00
7b80c86645
Updates a comment forgotten in 113f72a503. Refs #2463 , #2448 .
...
This was SVN commit r15753.
2014-09-14 21:23:49 +00:00
16a99e5ad3
Fixes some untranslated text in the multiplayer lobby (map name, type, and description), refs #2547
...
This was SVN commit r15752.
2014-09-14 21:10:49 +00:00
113f72a503
Makes running games visible in the lobby. These will be colored in red. Refs #2463 , #2448 .
...
This was SVN commit r15751.
2014-09-14 20:59:35 +00:00
67c3a80c42
reset the trigger script when changing map, fix #2793
...
This was SVN commit r15750.
2014-09-14 16:52:33 +00:00
0605232aaf
Updated the welcome screen to inform players about the temporary removal of formations.
...
This was SVN commit r15747.
2014-09-13 20:34:27 +00:00
ab4a1952f5
Small tweak for the options page, requesting game restart when enabling postproc effects.
...
This was SVN commit r15740.
2014-09-13 10:13:48 +00:00
83dda90662
Remove last traces of removed persian background images. Patch by dan@sstrev.com. Fixes #2777 .
...
This was SVN commit r15733.
2014-09-12 21:14:07 +00:00
bdd8bc1f44
update the in-game hotkeys page following 2f1d143dc2
...
This was SVN commit r15722.
2014-09-09 17:22:13 +00:00
e027981f95
Fixes missing functions_utility_list.js in initial mod selector screen
...
This was SVN commit r15714.
2014-09-07 23:29:33 +00:00
13b229d503
Gameplay rebalance after a long period of testing and rebalancing. See https://github.com/scythetwirler/0ad for details on changes.
...
This was SVN commit r15713.
2014-09-07 21:47:26 +00:00
2b1efa5035
Revert an unoptimized GUI update from f7e591c9f2. Instead, notify directly the GUI in case of miraged entities, and treat them the same way we treat renamed entities.
...
Fixes #2778
This was SVN commit r15703.
2014-09-06 13:34:54 +00:00
c0621ee28f
Stop updating some data after the end of a game.
...
This prevents game music from being played again, just after
defeat/victory.
Fixes #2714 , #2744
This was SVN commit r15689.
2014-08-27 18:37:20 +00:00
b2d07d5e5a
complete 2f1d143dc2 for moveAttack in rallyPoint + some cleaning
...
This was SVN commit r15682.
2014-08-26 19:35:43 +00:00
be2f0e69fc
Make the modmod standalone.
...
Mount public in case we are starting Atlas and no mods are specified in
the config.
If users remove all mods and save this to the config and try to start
Atlas it will
crash, as it cannot find some needed files.
This was SVN commit r15678.
2014-08-25 16:38:54 +00:00
64bfa089af
Add mod selection mod.
...
Includes some contributions by rada and sanderd17.
This was SVN commit r15677.
2014-08-25 16:02:54 +00:00
2f1d143dc2
give possibility to choose type of targets in moveAttack, fixes #2740
...
This was SVN commit r15671.
2014-08-24 11:51:03 +00:00
40365ee815
Surprise.
...
100% brand new rebalance for every unit in the game, after lengthy
discussion with Enrique.
Some updated portraits.
A couple new tips.
Stan's "cataphract" mask and helmet (the helmet needs a texture).
This was SVN commit r15644.
2014-08-15 23:10:44 +00:00
aa6de51793
Fix FPS, real time, and game time overlay hotkeys. Fixes 704d0f9511.
...
This was SVN commit r15643.
2014-08-15 22:03:12 +00:00
704d0f9511
Add config settings for FPS, realtime, and gametime overlays.
...
This was SVN commit r15634.
2014-08-13 18:56:07 +00:00
ada7691bce
Add current time counter which can be triggered using Alt+T. Fixes #2718 . Patch by thamlett.
...
This was SVN commit r15630.
2014-08-13 02:35:29 +00:00
016d4599e1
Added the ability to disable training/building of entities by triggers. Changes survival of the fittest random map to work with this. Refs #52
...
This was SVN commit r15614.
2014-08-05 12:49:12 +00:00
f7e591c9f2
Hide changes to buildings in the fog-of-war.
...
To achieve this, mirage entities are created per player, to replace the
real entities when these ones fall into the fog-of-war. These mirage
entities are created on-the-fly, and destroyed when they get back in
sight.
This depends heavily on the VisibilityChanged message added in
2174eaaeee#2709 .
Fixes #599
This was SVN commit r15612.
2014-08-04 22:49:19 +00:00
cf563657b6
Add some information about gathered resources to the multiple selection panel's tooltips. Refs #2695
...
This was SVN commit r15588.
2014-07-31 12:46:33 +00:00
cd3b35ed52
Handle callback functions when using the "leave" hotkey (by default Esc) to close a message box.
...
Fixes #2635
This was SVN commit r15584.
2014-07-30 09:27:46 +00:00
c2579c3c22
let allies build and repair stuff
...
This was SVN commit r15581.
2014-07-29 15:57:42 +00:00
7c82e59ce5
Replace or remove uses of Engine.Console_Write. Patch by Adrian Fatol. Fixes #2141 .
...
Cleans up list utility functions a bit.
Removes Engine.Console_Write.
This was SVN commit r15556.
2014-07-24 21:27:24 +00:00
a4e3422a22
Fix the hero flickering overlay after healing. Fixes #2666 . Patch by Adrian
...
This was SVN commit r15510.
2014-07-11 17:48:01 +00:00
9d335f2e22
Fix typos found by FalseVision
...
This was SVN commit r15507.
2014-07-10 19:17:45 +00:00
7e81f4f52a
Update the "number of builders" tooltip to be slightly more helpful.
...
This was SVN commit r15502.
2014-07-08 18:48:08 +00:00
56bcbd59a0
Fix allied garrison issue.
...
This was SVN commit r15500.
2014-07-07 09:28:34 +00:00
334ba4b740
SpiderMonkey now supports default parameters!
...
I've just modified those places with TODO comments, but there are most
likely others that could benefit of the feature to make the code a bit
cleaner and easier to understand.
Thanks to Fabio for pointing it out.
Refs #1886
This was SVN commit r15496.
2014-07-05 13:58:51 +00:00
404e808ed5
Add yes-no dialog and general dialog code to present choices to players. Can be used by triggers.
...
This was SVN commit r15480.
2014-07-02 14:48:22 +00:00
c844589f48
Add missing translate() call.
...
This was SVN commit r15479.
2014-07-01 21:05:33 +00:00
ab30e0d4fb
Change the water texture to a new, bigger one, created in Blender (thanks to Enrique). Change settings so that they are more logical, yet allow reverting back to an even lower quality setting. Add a WIP high setting (with foam) which isn't finished yet.
...
Change the shader itself so that the effects look nicer and are more
consistent across settings.
Rework the water mesh generation (simpler system). Fix a few issues.
May work oddly with Atlas since I haven't been able to compile yet.
Refs #1875 (maybe fix), Fixes #2077 (I'll assume it does), Fixes #2114
(assumption again), refs #48 .
This was SVN commit r15473.
2014-07-01 16:05:05 +00:00
66485bcd17
Check that at least one assignment exists before tryintg to copy it.
...
This was SVN commit r15469.
2014-06-30 17:21:12 +00:00
dd3fdf6800
Correct assignment dropdowns to always be adjustable by the game controller.
...
This was SVN commit r15454.
2014-06-28 05:02:29 +00:00
b1307c83be
fix guard command broken in recent commits
...
This was SVN commit r15452.
2014-06-26 21:15:16 +00:00
bb4b911e99
Remove remaining warnings about AI naval map support. Also hide player assignment dropdowns on network clients.
...
This was SVN commit r15444.
2014-06-24 22:53:02 +00:00
17c473f2f3
Add a trigger to the gallic fields map + fix a typo.
...
This was SVN commit r15429.
2014-06-23 18:12:51 +00:00
8915037631
Turn victory conditions into trigger scripts. Gui needs to be updated to allow combining of different victory conditions + to allow different lists per map. So there are no specific missions yet.
...
This was SVN commit r15427.
2014-06-23 17:37:27 +00:00
7b781f82d3
Fix capitalisation issue
...
This was SVN commit r15413.
2014-06-22 20:35:16 +00:00
f1e077d7e9
Fix hero overlay by requiring at least one unit to be trained
...
This was SVN commit r15412.
2014-06-22 20:00:34 +00:00
c793da5368
Don't allow changeing disabled dropdowns using the scrollwheel. Also corrects some things in b9a4af4cc6.
...
This was SVN commit r15406.
2014-06-21 00:25:12 +00:00
b9a4af4cc6
Fix #2595 by validating cheats are disabled in rated games. Also forces locked teams in ranked games and adds a scrollbar to the lobby subject.
...
This was SVN commit r15405.
2014-06-20 23:59:04 +00:00
160a83b73f
Bits of cleanup
...
This was SVN commit r15403.
2014-06-20 03:45:19 +00:00
