5064f2728f
Fix tech pairing visuals + hiding
...
This was SVN commit r15359.
2014-06-15 07:56:40 +00:00
f460057700
Fix error for entities that require a technology to be trainable.
...
This was SVN commit r15357.
2014-06-14 22:28:06 +00:00
e152223a53
fix fix
...
This was SVN commit r15355.
2014-06-14 18:21:48 +00:00
b93877571f
Add missing quotation mark to quote.
...
This was SVN commit r15354.
2014-06-14 17:20:09 +00:00
86ca3b2142
Small cleanup: i, numbButtons and numberOfItems all contain the same value anyway
...
This was SVN commit r15352.
2014-06-14 15:57:42 +00:00
7f172037ac
Clean up a big part of unit_commands.js, and bring most data to a separate JS object (instead of having deep nests of switches and if-else structures)
...
This was SVN commit r15351.
2014-06-14 15:35:13 +00:00
e2b493bb67
fix double-click on a garrisoned hero button should select its holder, even if from autogarrison
...
This was SVN commit r15348.
2014-06-14 14:21:30 +00:00
7cf927baec
fix typo from 2b8758745f
...
This was SVN commit r15347.
2014-06-14 14:14:33 +00:00
55247e926a
Remove legacy trading pane
...
This was SVN commit r15341.
2014-06-13 12:06:57 +00:00
2b8758745f
put the unit commands in a JS object
...
This was SVN commit r15340.
2014-06-13 11:35:16 +00:00
2b408e766b
Fix problem with setting up trade routes
...
This was SVN commit r15339.
2014-06-13 08:01:06 +00:00
2e00628562
Take the action definitions out of input.js, and in a separate JS object that can be edited by other scripts. This makes it possible to easier add new actions by editing this new script, or (in mods) even by editing the object in other scripts.
...
This was SVN commit r15336.
2014-06-12 13:47:37 +00:00
2e4441b528
Minor typos in text strings
...
This was SVN commit r15335.
2014-06-12 13:24:36 +00:00
89f5e7b260
Improve gui moddability by allowing to load an entire directory of scripts at once, and being able to split up big gui XML files. Fixes #2622
...
This was SVN commit r15330.
2014-06-11 17:14:35 +00:00
3a2670f7fa
Take aura descriptions out of tooltip, let auras be defined in the entity template rather than in JSON files, as they can't be reused anyway. Fix tooltips and auras for all heroes from athen to gaul.
...
This was SVN commit r15317.
2014-06-09 14:15:05 +00:00
40b351a99a
Fixes error in silhouettes hotkey handler
...
This was SVN commit r15308.
2014-06-08 02:04:29 +00:00
53ea269af0
Add the ability to specify a log level when using dlopen and change it to normal for Atlas.
...
This way we do not have two error messages when starting Atlas, but the
dynamic Atlas lib is not available.
Patch by Gallaecio. Fixes #1540 .
This was SVN commit r15301.
2014-06-05 17:07:04 +00:00
c699409246
Add translation context to stances.
...
This was SVN commit r15299.
2014-06-05 14:06:15 +00:00
fd615c4c54
Round some alpha values for overlays.
...
This was SVN commit r15295.
2014-06-05 10:22:16 +00:00
a4f2c2ac90
Allow for unification in identity class matching + add the opportunity to combine with AND and OR. Fixes #2612
...
This was SVN commit r15294.
2014-06-05 09:39:36 +00:00
b67aca01c8
Fix color fade to not go beyond 255 and be integer.
...
This was SVN commit r15284.
2014-06-04 16:23:56 +00:00
685d5e0197
Switch default AI to Petra and remove an old Aegis warning.
...
This was SVN commit r15282.
2014-06-04 15:29:20 +00:00
b4f3b503f2
code style cleanup
...
This was SVN commit r15273.
2014-06-02 15:48:37 +00:00
49ca719049
Reinitialize music when hotloading. Fixes crash when hotloading GUI files.
...
This was SVN commit r15271.
2014-06-02 15:13:16 +00:00
59c9ae670f
Stop VFS from causing a crash when the AI player isn't found. Patch by Itms. Fixes #2558
...
This was SVN commit r15254.
2014-05-31 14:55:09 +00:00
17d83a8b4c
Add ungarrison button to ungarrison specific entities
...
This was SVN commit r15252.
2014-05-31 13:58:16 +00:00
e4d3189494
Lots of GUI fixes to issues pointed out by alpha123 on IRC.
...
This was SVN commit r15235.
2014-05-27 05:34:28 +00:00
39cfb6748d
Fixes flickering in main menu backgrounds on old Intel GPUs, by manually setting the z-values for each layer, fixes #2143
...
This was SVN commit r15220.
2014-05-26 04:38:47 +00:00
5ce12c2263
Start phasing out the use of CParser in the GUI. Makes GUI parsing generally faster and stricter while adding better tests and debug information.
...
This was SVN commit r15213.
2014-05-25 03:16:52 +00:00
9c908a5f46
improve 6764b15ae2
by allowing a selected button to be selected again
...
This was SVN commit r15212.
2014-05-24 16:23:11 +00:00
6764b15ae2
ease switch to 100% trade of one resource using Shift-click
...
This was SVN commit r15211.
2014-05-24 15:37:19 +00:00
9ee17342b1
Change developer overlay to only be openable through Alt+D shortcut. Fixes #2569
...
This was SVN commit r15205.
2014-05-23 00:18:16 +00:00
b55b6a9cf1
Add visible class names to all common buildings
...
This was SVN commit r15196.
2014-05-22 14:31:48 +00:00
ac1a9bf8d1
Clean up class parsing + add visible classes to be displayed in the GUI without adding them separatedly to our tooltips
...
This was SVN commit r15195.
2014-05-22 10:20:02 +00:00
eaa382a60c
This was SVN commit r15194.
2014-05-22 01:38:46 +00:00
ee50168096
Removes errant text from GUI XML files, fixes some untranslated text per [wiki:Internationalization]. Refs #2507
...
This was SVN commit r15193.
2014-05-22 01:36:45 +00:00
eae7978868
Makes a word consistent with American English
...
This was SVN commit r15192.
2014-05-21 20:24:37 +00:00
e0fb1223d6
Put the colon inside the translate tag.
...
This was SVN commit r15186.
2014-05-21 03:02:54 +00:00
153b1162fb
changes for the AI to deal with maps with celts and change comment on naval maps
...
This was SVN commit r15185.
2014-05-20 21:30:48 +00:00
672f5a8b11
Add sloppyness and separate icon path to formation templates (makes it possible to have multiple formation templates - like different settings for different civs - with only one icon file)
...
This was SVN commit r15180.
2014-05-20 17:18:40 +00:00
41bc9fa65e
Remove a newline in a tooltip.
...
There is no need for it.
Some translations also add the newline that, due to different words
length, appears in an unwanted place.
This was SVN commit r15178.
2014-05-20 10:41:09 +00:00
dfc7567561
Fix multiple observers on multiplayer games to work more reliably. Fixes #2529
...
This was SVN commit r15171.
2014-05-19 16:02:42 +00:00
196eebe803
Fix partial internationalisation of the limit changers
...
This was SVN commit r15167.
2014-05-19 08:22:20 +00:00
61b6eba4c1
Adds a config option for more detailed tooltips. Fixes #2549 .
...
This was SVN commit r15161.
2014-05-19 00:01:47 +00:00
d70abd548a
Move yellow modern buttons to their own style to correct naming issues (eg. ModernButtonRed was yellow). New name is ModernButtonYellow. Also switched the default button color back to red due to complaints by team members on IRC.
...
This was SVN commit r15144.
2014-05-11 03:25:34 +00:00
da8843127c
Fix displaying wrong text when no tooltip was defined, as reported by Kanetaka. Also cleans up the code to make it shorter.
...
This was SVN commit r15139.
2014-05-10 13:37:38 +00:00
2c1917176a
Use untranslated playerState.civ, if the civName 'Gaia' happened to be translated, this resulted in an undefined texture, which was the case in Chinese, and reported by Gameboy.
...
This was SVN commit r15135.
2014-05-08 14:07:48 +00:00
8e39a2297d
fix delete selection broken (again) in bb65358dac
. Code is changed to prevent this to happen again
...
This was SVN commit r15131.
2014-05-08 08:21:20 +00:00
a620cf8e17
Fixes an issue with unassigned players being functionally ready but not having the green marker
...
This was SVN commit r15130.
2014-05-08 04:47:57 +00:00
bb65358dac
After discussion with scythetwirler with input from Philip and Mythos, popup dialogs (like for delete, resign, and exit) should have no on the right as we want the user to click no in most of those cases. It's the 'recommended' action. In the case of save/cancel or continue/back, save and continue should always be on the right as that's the 'recommended' action. With some review, this placement seems consistant across operating systems.
...
This was SVN commit r15129.
2014-05-08 03:43:03 +00:00
19ca1e3ebf
Fix locale verification to also allow ICU locales without data, but still don't allow bogus locales. Patch by Yves. Fixes #2533 .
...
This was SVN commit r15122.
2014-05-07 08:14:57 +00:00
27382a7d78
Swap OK and Cancel positions on the AI config GUI page. (Also cleanup the XML a bit)
...
This was SVN commit r15120.
2014-05-06 19:02:34 +00:00
9fadc2709c
Clean up the gate transformation tooltips as it caused problems for mods.
...
This was SVN commit r15119.
2014-05-06 18:52:05 +00:00
9b136a45fc
Fixes a couple dialog buttons
...
This was SVN commit r15106.
2014-05-04 02:44:14 +00:00
b09925b27e
switch the game setup confirmation buttons and move the welcome screen buttons
...
This was SVN commit r15100.
2014-05-03 09:21:05 +00:00
542bc1b273
Further fix switched buttons
...
This was SVN commit r15099.
2014-05-03 09:07:31 +00:00
c1d5f6882c
Also switch the button name to disable the correct one.
...
4e0a588456
only switched the label and the action.
This was SVN commit r15098.
2014-05-03 08:59:31 +00:00
12ec51783d
Fix in-game manual display
...
This was SVN commit r15097.
2014-05-03 08:53:06 +00:00
4e0a588456
Switch more buttons, see 911be4e860
...
This was SVN commit r15096.
2014-05-03 08:45:19 +00:00
122dae799b
Don't allow returning an invalid locale from the advanced language menu.
...
This was SVN commit r15094.
2014-05-02 21:14:28 +00:00
15f56cd984
Fix armour and attack display of heroes
...
This was SVN commit r15091.
2014-05-02 10:32:21 +00:00
ace3269768
Fix problem with sprintf errors being thrown when the AI places structures on the wrong places, make the code more uniform. Fixes #2485
...
This was SVN commit r15090.
2014-05-02 10:09:53 +00:00
5658bb391b
fix delete selection no more working after #15074
...
This was SVN commit r15087.
2014-05-01 21:06:43 +00:00
b9af0ac0e4
Enlarge various elements of the lobby login page to fit other languages.
...
This was SVN commit r15085.
2014-05-01 12:59:50 +00:00
a64456e6d8
Fix small space issue in the lobby (still some work to do there)
...
This was SVN commit r15084.
2014-05-01 11:38:53 +00:00
d51f2a0c35
Version bump and regeneration of translation templates accordingly.
...
This was SVN commit r15081.
2014-05-01 00:44:47 +00:00
c7b0261860
Fix the numbering in the Terms of Use for the lobby. Reverts 813db55b08
.
...
This was SVN commit r15079.
2014-04-30 23:24:24 +00:00
62f5476dec
Add support for adding translation context to XML elements. Patch by Gallaecio.
...
Add translation context to some lobby headers.
This was SVN commit r15078.
2014-04-30 22:33:08 +00:00
11865a8865
Revert a hack that snuck into an earlier commit of mine.
...
This was SVN commit r15076.
2014-04-30 17:22:38 +00:00
911be4e860
The convention is confirm button on right, decline button on left (updates some in-game dialogs). Also enables GLSL.
...
This was SVN commit r15074.
2014-04-30 06:28:57 +00:00
e7b4c8b92a
Make game automatically resume after closing the options menu. Refs #2507
...
This was SVN commit r15072.
2014-04-30 05:31:44 +00:00
a88f1222c0
Update AI descriptions, closes #2500 . Also correct some capitalization and developer overlay transparency for #2507 .
...
This was SVN commit r15071.
2014-04-30 05:04:12 +00:00
748ebdfdb0
Various GUI fixes and cleanup.
...
This was SVN commit r15070.
2014-04-30 04:38:53 +00:00
dfacf5358c
New lobby connect/registration page. Not perfect but fixes most of the outstanding issues. Refs #2312
...
This was SVN commit r15069.
2014-04-30 00:46:57 +00:00
15e9ffa21b
Converts the save dialog to the modern UI. Refs #2507 .
...
This was SVN commit r15068.
2014-04-29 21:45:00 +00:00
29cab5f5ed
Also change reveal map to revealed map.
...
Fix typo in tutorial map. Remove message refering to finite fields.
This was SVN commit r15066.
2014-04-29 14:51:21 +00:00
b246017f9f
Explore_d_ map.
...
This was SVN commit r15065.
2014-04-29 13:10:56 +00:00
1e6614918b
Initial modern buttons. Lobby/prelobby now only rely on the modern common files.
...
This was SVN commit r15063.
2014-04-29 00:07:27 +00:00
c77826e9aa
Translate some message boxes when opening websites.
...
Fix a typo. Refs #2501 .
This was SVN commit r15062.
2014-04-28 22:30:40 +00:00
683170ea19
Enable/disable GenTangents when enabling/disabling PreferGLSL. Fixes #2505 .
...
This was SVN commit r15061.
2014-04-28 22:30:27 +00:00
876d0e4e66
Forgot to fix some strings
...
This was SVN commit r15060.
2014-04-28 20:19:32 +00:00
e6e5b9f11f
Add a link in the main menu to for translators. Patch by Stan, fixes #2501
...
This was SVN commit r15059.
2014-04-28 20:17:39 +00:00
64d3d0b4b2
Remove falsely attributed quote.
...
This was SVN commit r15058.
2014-04-28 17:59:02 +00:00
4695f3425b
Add the possibility to show the welcome screen on every update, next to the possibility to disable it completely. Patch by Itms, fixes #2116
...
This was SVN commit r15057.
2014-04-28 17:18:46 +00:00
f26a2917d3
Translate map name in the summary page
...
This was SVN commit r15056.
2014-04-28 15:54:47 +00:00
b8245da606
Improve disabled technology tooltip. Fixes #2497
...
This was SVN commit r15055.
2014-04-28 15:17:26 +00:00
b5dfacbf18
Translated map name in the loading screen, regenerated translation templates and updated translations from Transifex
...
This was SVN commit r15053.
2014-04-28 12:31:28 +00:00
fb80e29d41
Changes to English tooltips for consistency
...
Reported by an Italian translator, Fabio, at Transifex:
https://www.transifex.com/projects/p/0ad/translate/#it/public/13718374
https://www.transifex.com/projects/p/0ad/translate/#it/public/24494405
The periods were added in the main menu (only 2 tooltips without them)
and removed from the options menu (only 1 tooltip with it). In the
future, we might want to be consistent with tooltips through all the
GUI.
This was SVN commit r15052.
2014-04-28 10:11:11 +00:00
75713cc101
Don't display 'UNR' in the gamesetup on unranked players. This makes unranked lobby playernames consistant with those of rankless players who join via IP.
...
This was SVN commit r15051.
2014-04-28 05:39:18 +00:00
a8b50a66da
Fixes to the lobby internationalization by sanderd17 and me
...
All strings are now translated at the last point, right before they are
added to the GUI.
Some other fixes are included.
This was SVN commit r15046.
2014-04-27 20:24:48 +00:00
b3acb5657f
Fix moderater prefixes in the lobby.
...
This was SVN commit r15045.
2014-04-27 19:26:12 +00:00
251372a062
Missing var statement.
...
This was SVN commit r15044.
2014-04-27 19:10:28 +00:00
cfb72e990b
Make gamesetup chat formatting more similar to the lobby and note that all players must be ready before starting a multiplayer game.
...
This was SVN commit r15043.
2014-04-27 19:06:21 +00:00
8f53ddd6b9
Unifies some translatable strings on the gamesetup screen.
...
This was SVN commit r15042.
2014-04-27 19:03:15 +00:00
2f8487b84b
Adds translation support for the "More options" window on the gamesetup screen.
...
This was SVN commit r15041.
2014-04-27 18:41:56 +00:00
983abd1952
Updates splashscreen style and adds a background to the scrollbar to match the dropdown
...
This was SVN commit r15040.
2014-04-27 18:30:40 +00:00
a163ac1c11
Reverts a rogue copy-paste in the last commit.
...
This was SVN commit r15039.
2014-04-27 18:23:15 +00:00
b8d3ef71f7
Fixes the updated dropdowns for multiplayer clients broken in 65f4c8b0e8
...
This was SVN commit r15038.
2014-04-27 18:18:05 +00:00
461a17c95d
Reverted d91756b251
after breaking the fix for the lobby that sanders17 had implemented
...
This was SVN commit r15037.
2014-04-27 17:38:19 +00:00
65f4c8b0e8
Moves Select number of players to a more fitting and translation-friendly location. Also makes the map selection texts more translation-friendly in terms of space.
...
This was SVN commit r15036.
2014-04-27 17:24:37 +00:00