90b9926ca1
Fixes warning showing up with the new SpiderMonkey.
...
The changed return value isn't related but returning false makes more
sense there IMO.
Refs #2372
This was SVN commit r14863.
2014-03-22 23:31:40 +00:00
5372b27142
Silences some warnings that show up on the gamesetup screen with the new SpiderMonkey without changing any behaviour.
...
Refs #2372
This was SVN commit r14862.
2014-03-22 13:54:10 +00:00
cde72788a2
* Add support for fallback fonts in the font builder.
...
* Replace DejaVu with Biolinium for the existign sans-styles.
* Add additional sans-styles using Biolinum.
* Update the GUI style definitions to use the sans-styles instead of
serif styles.
(Wait with updating custom defined fonts in strings, as it will cause a
mess with the internationalisation that's about to be included)
* Add fonts from the quite complete FreeFont family as fallback fonts.
* Render all glyphs supported by the different fonts to support as many
scripts as possible.
* Fixes #2457 .
(Now hope I included all needed files)
This was SVN commit r14853.
2014-03-17 10:13:49 +00:00
883f307b40
Implement a basic observer mode. Any player which joins a multiplayer game but is not assigned a player slot automatically becomes an observer. Refs #69
...
This was SVN commit r14849.
2014-03-16 23:29:27 +00:00
caeaf62723
Adjust widths in the lobby to make the map size dropdown fit.
...
This was SVN commit r14843.
2014-03-15 20:58:59 +00:00
0e0cd65134
Some GUI alignment/sizing improvements.
...
This was SVN commit r14828.
2014-03-09 19:24:17 +00:00
8959e63a53
Add back unintentionally removed idle workers button tooltip.
...
This was SVN commit r14826.
2014-03-09 02:42:42 +00:00
fb65288463
Fix hover effect not regenerating after mousedown events, minor GUI code cleanup, and fix #2414
...
This was SVN commit r14819.
2014-03-07 22:43:57 +00:00
66942c74fa
Be more forgiving for training spaces (which cause empty strings on splitting) and avoid using bigger fonts for non-capitalisable signs in headings
...
This was SVN commit r14815.
2014-03-07 11:11:45 +00:00
32cf46f01c
Fix some 'undefined' problems reported by Lion.Kanzen + improve coding style.
...
This was SVN commit r14814.
2014-03-07 08:27:13 +00:00
29f94a759c
Fix an issue with lobby registration and a minor wording tweak.
...
This was SVN commit r14813.
2014-03-07 01:52:06 +00:00
abbd6efef1
Updates outdated/incorrect hotkeys.
...
This was SVN commit r14812.
2014-03-06 23:57:02 +00:00
8a98bca9b2
Fixes the last z order (hopefully) and a style inconsistency.
...
This was SVN commit r14811.
2014-03-06 22:45:13 +00:00
ec26f1de83
Reduces z order to fix ai dialog.
...
This was SVN commit r14810.
2014-03-06 22:34:15 +00:00
8f30e722ab
Some inconsequential style adjustments.
...
This was SVN commit r14809.
2014-03-06 02:24:06 +00:00
ef76d24e66
Fixes z order and a capitalization error.
...
This was SVN commit r14808.
2014-03-06 02:00:12 +00:00
5f5cfb10ee
Fixes a typo and makes naming of the fading consistent with other sprites.
...
This was SVN commit r14807.
2014-03-05 21:24:48 +00:00
5582409973
Converts most parts of the game to use Pureon's new UI
...
This was SVN commit r14804.
2014-03-04 02:23:01 +00:00
1a2f889bb9
7cba43c9db changed the behaviour in case of undefined values which was not intended even if there's a warning now.
...
This should revert to correct behaviour for undefined values again (even
though this value should never be undefined).
Refs 2372
This was SVN commit r14803.
2014-03-03 23:01:49 +00:00
7cba43c9db
Fixes warnings printed by the new SpiderMonkey.
...
Sets SelectableInGameSetup to true in all civ json files that didn't
have it set.
Having this value set to undefined (not set) was interpreted as true,
which is quite arbitrary.
With the new SpiderMonkey a warning will be printed if the value is
undefined.
This avoids ambiguity but makes the setting mandatory.
Refs #2372
This was SVN commit r14802.
2014-03-03 21:58:15 +00:00
a3e1c68b9a
Fix #2373 . Have player resign if not returning to a networked game. Also notify host of networked game that by leaving all other players will be disconnected. Based off patch by boeseRaupe
...
This was SVN commit r14772.
2014-02-21 20:02:23 +00:00
0ea3b7b7dd
Adds the moderator prefix to the playerlist in the lobby.
...
This was SVN commit r14767.
2014-02-20 23:26:36 +00:00
a725266337
Slightly better options menu.
...
This was SVN commit r14766.
2014-02-20 22:45:43 +00:00
2429f1e93c
Displays ratings on the gamesetup page and formats ratings less than 1000 correctly.
...
This was SVN commit r14762.
2014-02-19 00:40:35 +00:00
039b06e012
Enable selection of dogs when selecting idle warriors. Patch by tau. Fixes #2436
...
This was SVN commit r14760.
2014-02-17 21:40:47 +00:00
f92a46330d
Anti-disconnect addition to the gamesetup screen. Also fixes typo in the lobby bot README.
...
This was SVN commit r14753.
2014-02-16 06:22:16 +00:00
be881dc420
Reformat the database to accept the additional summary counters as well as adding a couple summary counters. Also deletes unnecessary welcome message and deletes whitespace. Refs #686 .
...
This was SVN commit r14752.
2014-02-16 06:06:16 +00:00
d8152f1eda
exchange if order otherwise we can't make a trade route with a damaged market
...
This was SVN commit r14744.
2014-02-09 18:42:06 +00:00
df1221e9f5
Correct inverted sprites on modern tickbox and add a default modern tooltip style.
...
This was SVN commit r14739.
2014-02-09 05:31:25 +00:00
e4e32c8cd7
Fixes a typo from 1d3ac14d35.
...
This was SVN commit r14717.
2014-02-01 03:55:24 +00:00
60619dbf3f
Add technologies cheat. Fixes #2072 . Patch by boeseRaupe
...
This was SVN commit r14712.
2014-01-31 15:30:16 +00:00
9fe465884d
Implements resource trickle. Allows decimal player resources. Fixes #2413 .
...
This was SVN commit r14710.
2014-01-31 12:01:49 +00:00
ff4ed09b6f
Backend for special formatting of moderaters in the lobby userlist.
...
This was SVN commit r14706.
2014-01-30 15:46:19 +00:00
b9eea330d0
Strip some whitespace and fix a warning in session.js
...
This was SVN commit r14704.
2014-01-29 19:00:47 +00:00
1d3ac14d35
Better summary screen. Fixes #686 . Patch by Bajter and Kabzerek
...
This was SVN commit r14703.
2014-01-29 18:30:56 +00:00
459f13e72b
Clean up the colorfade code. Patch by boeseRaupe, fixes #2395
...
This was SVN commit r14702.
2014-01-29 14:49:36 +00:00
8953179e1a
allow the possibility to define route with waypoints when doing trade, fixes #1207 , #1821 and #1822
...
This was SVN commit r14697.
2014-01-28 18:56:39 +00:00
5e70bd3628
Fix and cleanup my recent changes.
...
This was SVN commit r14686.
2014-01-26 19:01:21 +00:00
3e1fc74add
improve alert tooltip, see #2353
...
This was SVN commit r14684.
2014-01-26 18:17:13 +00:00
5ec0dc8ae8
Fix a bug with one of the lobby settings I added to the options window.
...
This was SVN commit r14680.
2014-01-26 05:51:48 +00:00
39fef5c299
Add the ability to display chat messages when joining the lobby and quickly mostly update the options window to the new UI style.
...
This was SVN commit r14679.
2014-01-26 05:39:55 +00:00
a8fbe4eedc
Centralizes centering rating into one function.
...
This was SVN commit r14678.
2014-01-26 05:27:00 +00:00
041c6ab1b3
More lobby cleanup.
...
This was SVN commit r14677.
2014-01-26 04:25:35 +00:00
0db9a18d39
Fix issue where lobby spam was being sent to external clients.
...
This was SVN commit r14672.
2014-01-25 21:58:22 +00:00
851c05a038
Cleanup and spam blocker redesign in lobby.js.
...
This was SVN commit r14671.
2014-01-25 20:51:01 +00:00
5d4f509810
Update existing minimap idle button, add minimap idle button highlight and disabled, and some style fixes in session.xml. Refs #823 and refs #2357
...
This was SVN commit r14658.
2014-01-24 18:40:01 +00:00
b46a6de335
Allow using the XMPP room subject to display lobby information to user, make the lobby GUI code more readable, and cleanup the modern styles.
...
This was SVN commit r14656.
2014-01-24 18:20:15 +00:00
e5e634f768
Displays ratings in the userlist. Fixes #2371 .
...
This was SVN commit r14650.
2014-01-23 23:13:13 +00:00
df3bdcf8ca
add back some lines removed unintentionally by previous tag
...
This was SVN commit r14631.
2014-01-21 22:59:21 +00:00
41d3366f6a
check version and mods before loading a file, fixes #2361 and #2385 .
...
This was SVN commit r14630.
2014-01-21 22:49:42 +00:00
8845910f9c
Of course the time I don't test before committing is the time I make a syntax error. I think the RNG hates me.
...
This was SVN commit r14619.
2014-01-19 02:57:40 +00:00
7a520adbf3
Improve the wording of attack tooltips.
...
This was SVN commit r14618.
2014-01-19 02:01:21 +00:00
3cde5632ff
Fix StoneCrossBox sizing.
...
This was SVN commit r14613.
2014-01-18 20:29:21 +00:00
c4643d925d
Fix two bugs in attack tooltips. Add an extra Math.round to ensure we don't get huge decimals, and use a building's default arrow count as a minimum in rate calculation.
...
This was SVN commit r14610.
2014-01-18 19:20:17 +00:00
ea526eedd1
Adjust the attack tooltips. Make the formatting for attack rate more consistent and use meters instead of tiles for range.
...
This was SVN commit r14609.
2014-01-18 18:59:51 +00:00
1040cf2034
Add back a new minimap overlay, re-add and implement the original idle button, little whitespace cleanup, and delete some old unused ui images.
...
This was SVN commit r14599.
2014-01-18 02:38:07 +00:00
d80967111d
Fixes a problem with the renderpath screen not being displayed.
...
Refs #2241
This was SVN commit r14593.
2014-01-17 18:40:36 +00:00
aba3d8d9d5
Shield tweaking for the Bronze Shield and Gold Shield pikemen.
...
Adjusted hero health.
Made champions use arrow selections, while citizen soldiers use circles.
A bunch of updated portraits.
Seleucids changes.
Map updates.
New techs.
Roman siege walls a little weaker.
This was SVN commit r14589.
2014-01-16 23:21:57 +00:00
786afd9fcc
Implement the number of gaia gatherers (it probably won't happen but it's safer that way).
...
Change UnitAI to call "leave" handlers on a conversion, like on a
destruction, so a unit will safely go to idle state on
resignation/conversions. Might fix some very weird bugs that probably
haven't been reported yet.
Reported by AlThePhoenix.
Fixes #2383 .
This was SVN commit r14585.
2014-01-15 00:04:25 +00:00
0f56dceef2
Give the minimap 20px more on eack side and remove the ugly overlay. Also cleanup some nearby code.
...
This was SVN commit r14580.
2014-01-14 03:25:12 +00:00
0521d936a1
reduce a GuiInterface call for displaying formation tooltip
...
This was SVN commit r14577.
2014-01-12 18:39:47 +00:00
4ef80d26aa
Proper fix for the gatherer count. Fix an AI bug. Thanks to Gameboy and Gildas for reporting.
...
This was SVN commit r14571.
2014-01-11 18:14:13 +00:00
20692a26b0
Fix some undefined errors with unknown presences in the lobby and recougnize the 'gone' presence as away.
...
This was SVN commit r14568.
2014-01-11 03:53:41 +00:00
eee6ed65dc
still another fix to the gatherer count
...
This was SVN commit r14567.
2014-01-10 22:50:13 +00:00
df9fb05689
Fix the gatherer count per player further and some style niceness.
...
This was SVN commit r14565.
2014-01-10 20:27:34 +00:00
87250a79c9
delete groups with a right click. Fixes #2341 . Patch by boeseRaupe
...
This was SVN commit r14558.
2014-01-10 16:51:13 +00:00
ee39f21b52
Fixes a problem when messageboxes were called without callback function.
...
Fixes #2367
Refs #2241
This was SVN commit r14556.
2014-01-10 16:25:09 +00:00
3d23f81696
Show the number of attacks per second to show users some attack speed, without showing the actual timers, or calcualtion of the number of arrows. Fixes #2352
...
This was SVN commit r14555.
2014-01-10 09:17:40 +00:00
bec7cfd520
Another attempt to fix the lobby disconnects.
...
This was SVN commit r14541.
2014-01-08 04:22:34 +00:00
b1e0f1b62a
Clean up the mess of different ways to note the formations (capitalised, with spaces, with underscores, concatenated ...) by always referring to the template name.
...
This was SVN commit r14534.
2014-01-07 13:33:08 +00:00
8226d75715
Make PickEntitiesAtPoint faster yielding 1-3% overall performance improvement. Fixes #2358 . Also removes some trailing whitespace.
...
This was SVN commit r14532.
2014-01-07 04:05:10 +00:00
baf6925b66
Tactical varfare.
...
This was SVN commit r14528.
2014-01-06 20:55:22 +00:00
8cc1ddf6de
Small code style fix
...
This was SVN commit r14527.
2014-01-06 20:13:55 +00:00
3406f2f3e8
Fix code style of files committed too soon in f19a8d6b41
...
Adds blinking overlay to ther hero icon when he's attacked
Adds a health bar to the hero icon
Fixes #1902
Patch by boeseRaupe
This was SVN commit r14525.
2014-01-06 13:48:17 +00:00
f19a8d6b41
Take the box formation out of the special case formations
...
This was SVN commit r14524.
2014-01-06 13:32:48 +00:00
3d5f661447
Fixes assertion failure when opening the ingame manual.
...
This problem happens because callback functions need to be passed to GUI
pages differently since 4b1297b328#2241
This was SVN commit r14499.
2014-01-04 11:48:28 +00:00
4a11b30b39
Fixes assertion failure when clicking the settings button (aiconfig) on the match setup screen.
...
This problem happens because callback functions need to be passed to GUI
pages differently since 4b1297b328#2241
This was SVN commit r14498.
2014-01-04 11:29:35 +00:00
4b1297b328
Removes g_ScriptingHost and implements global to compartment 1 to 1 relation.
...
Each GUI Page gets its own compartment and all ScriptInterfaces in the
same thread should now use the same JS Runtime.
This is required for the SpiderMonkey upgrade.
Check the ticket for details.
Closes #2241
Refs #1886
Refs #1966
This was SVN commit r14496.
2014-01-04 10:14:53 +00:00
9a41c588fe
prevent traders to cycle between two adjacent markets
...
This was SVN commit r14490.
2014-01-03 14:03:12 +00:00
e73738d794
Do not pause multiplayer games if one player opens a dialog. Patch by boeseRaupe. Fixes #2275 .
...
This was SVN commit r14481.
2014-01-02 16:30:24 +00:00
dd86995f77
Fix some newlines.
...
This was SVN commit r14480.
2014-01-02 16:22:03 +00:00
b3d799d950
Replace inconsistent separators in quotes. Fixes #2247 . Patch by boeseRaupe.
...
This was SVN commit r14479.
2014-01-02 14:46:47 +00:00
b1422137e5
Cleanup GUI Checkbox C++ code by removing broken, non-obvious internal text rendering.
...
This was SVN commit r14476.
2014-01-02 03:28:15 +00:00
3d171b54c9
New ModernTickBox style for the GUI. Replace the use of StoneCrossBox in the lobby GUI with the new style.
...
This was SVN commit r14469.
2014-01-01 06:15:06 +00:00
1e522f9b2c
Fix bug with rating in lobby bot, remove superfluous GUI typedef, and change the lobby chat autocompletion to use tab.
...
This was SVN commit r14467.
2014-01-01 00:23:18 +00:00
d7f18c10de
Add visual indicator when unsetting rally-points, closes #2117
...
This was SVN commit r14462.
2013-12-31 13:21:06 +00:00
75b8952d04
Delete help.txt.
...
I wanted to update it first for some function names I changed.
Then I noticed that nearly all the functions described there don't exist
anymore or have changed. There are much better descriptions at the
places where the functions are declared/implemented.
We should either do it right (and force everyone to update that file for
every change) or don't to it at all. At this stage of development it
doesn't make sense and when we start documenting all the functions at a
central place, there are better locations than this file.
This was SVN commit r14461.
2013-12-31 12:21:56 +00:00
c7ff0bb486
Tweak some lobby login UI bits, rework scrollbar mousewheel handling, add ability to scroll through closed dropdowns with scrollwheel, general C++ GUI cleanup, and fix broken random map script 'Unknown Nomad'.
...
This was SVN commit r14458.
2013-12-31 04:54:16 +00:00
b3a74e8f72
Add message to help new users register for the lobby.
...
This was SVN commit r14457.
2013-12-31 01:14:09 +00:00
b2a535d838
Change the lobby registration to the new UI style and try to make it more ergonomic.
...
This was SVN commit r14455.
2013-12-31 00:01:27 +00:00
ddee36e0a8
Hide map size for skirmish and scenarios. Refs #2301 .
...
Also fix my previous commit because obviously I had committed the wrong
default value.
This was SVN commit r14448.
2013-12-30 15:59:00 +00:00
5e23445339
Make ConfigDB properly thread-safe.
...
Replace CreateValue with SetValueString so we don't pass pointers to
internal
ConfigDB structures around. Refs #1810 .
Remove some splash screen related functions since we can achieve the
same
with the ConfigDB functions exposed to scripts.
This was SVN commit r14437.
2013-12-29 23:56:18 +00:00
cd125a94e2
fix tests + code style cleanup
...
This was SVN commit r14426.
2013-12-29 10:01:39 +00:00
bf58f04511
add wonder victory condition. Refs #1649
...
This was SVN commit r14418.
2013-12-28 13:40:39 +00:00
749c4d5270
change the way to manage trade, closes #2311
...
This was SVN commit r14417.
2013-12-28 10:44:59 +00:00
659736301a
define the limit changing elements together with the limits, so they can be queried by the GUI and the AI. Fixes #2187
...
This was SVN commit r14408.
2013-12-27 10:58:48 +00:00
ad0d81cb8a
Various lobby changes and some optimizations in the lobby bot by scythetwirler.
...
This was SVN commit r14396.
2013-12-26 19:45:20 +00:00
41b3dfc89c
Implement town bell
...
* the icons are temporary, and can be replaced later
* The sounds are created by LAVS, but may also need some polishing, so
the current ones are placeholders too
* The patch code is created by Itms
fixes #2154
This was SVN commit r14392.
2013-12-26 10:43:51 +00:00
bdeae5d474
Don't send superfluous chat / commands in the lobby, also fix issues with the lobby system messages. Merge from my github branch.
...
This was SVN commit r14389.
2013-12-25 19:28:53 +00:00
3d9fe04ab5
Added Egyptian names for Ptolemaic buildings.
...
Deleted a bunch of maps. Added Lorraine Plain skirmish map.
This was SVN commit r14380.
2013-12-18 13:54:30 +00:00
0b80cbe3ec
Hide the password field by default on the lobby login box if there is a remembered password. Since we only store hashed passwords, this avoids potential confusing from seeing a password much longer than the user’s in the field.
...
This was SVN commit r14376.
2013-12-18 00:56:59 +00:00
3c248e7501
Change the "Away" color in the lobby to be much easier to read on the dark background.
...
This was SVN commit r14375.
2013-12-17 23:58:53 +00:00
fd47e6caee
Name.
...
This was SVN commit r14341.
2013-12-13 13:30:59 +00:00
619c59fd3f
Read the default MUC room from the config file and set it to arena15. Fixes #2306 .
...
Change the jid of xpartamupp to WFGbot to make it work on the new
server. Refs #2307 .
This was SVN commit r14339.
2013-12-13 12:14:17 +00:00
71d378b7a5
A bunch of stuff.
...
This was SVN commit r14308.
2013-12-08 13:01:14 +00:00
e173493621
separate gui entityState in two parts to improve gui timing, adresses #2179
...
This was SVN commit r14306.
2013-12-08 10:02:19 +00:00
3182d6c8ee
Reverts 4c9cd2921d fundraiser splash screen now that the fundraiser has ended
...
This was SVN commit r14304.
2013-12-08 01:35:06 +00:00
9678cf547a
cache quantities depending only on the selection, adresses #2179
...
This was SVN commit r14296.
2013-12-05 18:50:29 +00:00
bddcd57dea
- Fixed a prop typo in the Athenian temple.xml
...
- Added the first Egyptian music track to the Ptolemies.
- Adjusted the Sacred Band tip text. New pic coming soon.
- Still trying to figure out what to do with "Wasteland" map.
This was SVN commit r14276.
2013-12-04 00:18:52 +00:00
a96a333b47
Small cleanup.
...
This was SVN commit r14274.
2013-12-03 01:01:12 +00:00
3fea8d7c1e
Some tips tweaks and new tips.
...
This was SVN commit r14269.
2013-12-01 18:22:28 +00:00
e88d05e0e4
allow units to guard/escort buildings or units, fixes #2034
...
This was SVN commit r14263.
2013-11-30 17:30:08 +00:00
351468dbe5
fix initialisation of developper overlay for saved games
...
This was SVN commit r14240.
2013-11-28 18:08:41 +00:00
09d5507ecb
clean some useless code
...
This was SVN commit r14214.
2013-11-19 21:27:23 +00:00
e397993dae
Deleting a bunch of scenarios.
...
Made peacock easier to hunt.
Fixed elite Ptolemaic slinger promotion.
Reduced the health of basic ranged citizen soldiers slightly.
Updated Deccan Plateau with moar forestry.
Fixed Athenian Marine specific name.
This was SVN commit r14207.
2013-11-17 20:16:57 +00:00
3ab983f8a1
Some "varfare" again plus a call to initMusic because that will be needed for the Spidermonkey upgrade.
...
This was SVN commit r14188.
2013-11-15 18:35:19 +00:00
2102648f7c
Allows autogarrison of newly trained units, fixes #1044
...
This was SVN commit r14144.
2013-11-11 15:37:16 +00:00
4406be3a69
Fix crash when trying to join the lobby again if the host disconnected in the game setup screen.
...
This was SVN commit r14137.
2013-11-10 22:42:48 +00:00
f070bf9d1e
Prohibit the user from picking the 'system' lobby name, as that's reserved for special messages.
...
This was SVN commit r14136.
2013-11-10 21:52:38 +00:00
59da5fad2a
Fix some spidermonkey lobby complaints when run in strict mode.
...
This was SVN commit r14127.
2013-11-10 04:09:03 +00:00
37cedb8133
Make filters work and add a skirmish map filter.
...
This was SVN commit r14125.
2013-11-10 00:45:19 +00:00
4fb6896fd8
Fix warning when the hosted game is a random rms.
...
This was SVN commit r14124.
2013-11-09 23:57:31 +00:00
81cf02cc13
Fix building with --without-lobby. Fixes #2249 .
...
This was SVN commit r14113.
2013-11-08 15:28:44 +00:00
0f8d3e23db
;
...
This was SVN commit r14112.
2013-11-08 15:28:38 +00:00
da6abe630a
Fix error message on starting game due to missing global variable.
...
This was SVN commit r14110.
2013-11-08 09:52:48 +00:00
bb28e0eb70
Fix some system message/spam filter bugs in the lobby.
...
This was SVN commit r14107.
2013-11-08 00:57:58 +00:00
62b92af925
Fix lobby registration errors.
...
This was SVN commit r14105.
2013-11-07 22:07:26 +00:00
bffe917914
Multiplayer lobby based on the XmPP protocol. Special thanks to Philip, alpha123, scythetwirler, and anyone else who has helped build, debug or test the lobby.
...
This was SVN commit r14098.
2013-11-07 20:07:24 +00:00
3743e58f9a
allow enabling the game clock as a persistent setting
...
This was SVN commit r14092.
2013-11-07 18:06:52 +00:00
6fae05b5f6
fix
...
This was SVN commit r14083.
2013-11-03 17:41:59 +00:00
53a270347a
Map preview for Zagros Mtns.
...
Changed preview for Greek acrpolis.
Fixed quote attribution. Thanks anfialro.
This was SVN commit r14081.
2013-11-03 16:39:28 +00:00
6dca6910c3
Recursively count garrisoned units to avoid overcapacity
...
This was SVN commit r14074.
2013-11-03 13:13:30 +00:00
ce7c97b79f
Improve back to work behaviour (queues taken into account), fix #2206 , patch from Itms
...
This was SVN commit r14063.
2013-11-01 22:00:06 +00:00
543ec3a8c7
Fix launching skirmish maps without selecting a civ
...
This was SVN commit r14059.
2013-10-30 17:01:11 +00:00
fcde137b30
Viriato.
...
This was SVN commit r14051.
2013-10-28 14:35:25 +00:00
31e79e6709
Reorders the game setup drop list for maps.
...
This was SVN commit r14048.
2013-10-26 15:20:13 +00:00
4e86b00a05
Remove inconsistencies in the manual. Refs #2185 .
...
Fix player name.
Make log messages when saving games use quotes around paths.
This was SVN commit r14037.
2013-10-23 22:18:40 +00:00
71a41ba401
Line endings. Refs #2185 .
...
This was SVN commit r14028.
2013-10-19 20:07:20 +00:00
45d4e92782
Fixed building requirements for Town Phase.
...
Changed Brit Wonder to the new Stonehenge model. :)
Trying out some new hunting changes from sanderd. Might just be
temporary. Refs #2092
This was SVN commit r14027.
2013-10-19 18:20:25 +00:00
c0b628bcac
Fix some typos. Patches by Swyter (Spanish translator). Fixes #2210 , #2211 .
...
This was SVN commit r14022.
2013-10-18 20:33:08 +00:00
396bd844dd
Remove duplication between getActionInfo and determineAction. Allow setting rally points if not all selected buildings can do so. Patch by mimo. Fixes #2189 .
...
This was SVN commit r13989.
2013-10-11 22:43:22 +00:00
801cac87dd
Properly queue rally points when setting them via the minimap. Patch by mimo. Fixes #2203 .
...
This was SVN commit r13988.
2013-10-11 21:50:45 +00:00
c5669e2c4e
Add a back to work button. Patch by Itms. Fixes #799
...
This was SVN commit r13987.
2013-10-11 19:11:07 +00:00
644135b9f3
Fixes variable name conflict in session UI, patch by Itms, fixes #2199
...
This was SVN commit r13982.
2013-10-11 00:22:27 +00:00
f5eeed9cf7
Clears selections when loading saved game, patch by RefinedCode (fixes buggy selection behavior when using quicksave/quickload), fixes #2178
...
This was SVN commit r13981.
2013-10-10 23:58:29 +00:00
f6c9db33d6
Focus on the building a hero is garrisoned in when the hero button is double-clicked. Patch by mimo. Fixes #2131
...
This was SVN commit r13978.
2013-10-10 21:23:19 +00:00
6d67957db2
Prevents buildings from getting attack-move orders and implements attack-move rally points, patch by mimo. Fixes #2171
...
This was SVN commit r13963.
2013-10-06 22:50:30 +00:00
35fa527814
Adds attacking player's name to attack notification messages.
...
Cleans up some duplicate username/color code in messages.js
This was SVN commit r13962.
2013-10-06 22:07:55 +00:00
754e794f9b
Implements attack notifications based on patch by madmax and zoot, fixes #1719
...
This was SVN commit r13951.
2013-10-06 04:49:38 +00:00
7901ed51d4
Implements skirmish maps, based on patch by sanderd17, fixes #1198 . Skirmish maps are like scenarios, except the player can choose their civ during match setup. To create a skirmish map: place some skirmish entities for each player in Atlas (see templates/skirmish/* for examples), uncheck the player's civ in Atlas' player panel if desired, and save in the maps/skirmishes directory. The map will appear in match setup under the "Skirmish" match type.
...
Implements custom, VFS-based map load/save dialogs for Atlas (replaces
broken native file dialogs), fixes #631 , #889 .
Fixes map loading/saving to handle arbitrary subdirectories for better
organization.
Adds default settings to Atlas player panel, fixes #1872 . Each setting
now has a checkbox to choose whether it should be saved with the map
(avoids writing lots of useless default data for each map).
Adds map preview setting to Atlas, refs #1745 .
Cleans up and simplifies some duplicate code.
Fixes optional serialization performance test.
This was SVN commit r13938.
2013-10-04 02:29:16 +00:00
e382967e34
Updated a bunch of things.
...
New waypoint and garrison flags for Ptolemies. New texture for Ptolemies
woman. Fixed footprint for statues ruin. etc.
This was SVN commit r13931.
2013-10-02 18:51:49 +00:00
8cf5f61885
Avoids ugly layering of GUI pages when entering match setup
...
This was SVN commit r13922.
2013-09-30 20:51:19 +00:00
238b7f84d8
Changes the ConfigDB to expose global functions to scripts instead of properties and custom objects.
...
Fixes #2172
Refs #1886
This was SVN commit r13914.
2013-09-29 18:56:50 +00:00
9781b67cf4
Changes the Console to expose global functions to scripts instead of properties.
...
Fixes #2140
Refs #1886
This was SVN commit r13884.
2013-09-21 14:48:19 +00:00
12e2428495
Changes the Renderer to expose global functions to scripts instead of using CJSObject.
...
Fixes #2137
Refs #1886
This was SVN commit r13877.
2013-09-21 08:24:45 +00:00
553875ea83
Allow the use of Enter in addition to the OK button in the Join Game dialog.
...
This was SVN commit r13867.
2013-09-17 00:30:11 +00:00
97912dd545
This was SVN commit r13864.
2013-09-16 16:56:26 +00:00
a770ad9467
small code style fixes
...
This was SVN commit r13862.
2013-09-16 09:14:16 +00:00
f213761912
let entities change entity limits. Fixes #2076
...
This was SVN commit r13850.
2013-09-15 08:19:50 +00:00
ea75cda095
Special case getEntityNamesFormatted to avoid messing with getEntityNames
...
This was SVN commit r13838.
2013-09-14 00:32:50 +00:00
e7fa9a58de
Remove the Costs: prefix from tooltips entirely.
...
This was SVN commit r13837.
2013-09-14 00:07:08 +00:00
e646cf19bf
Fix bug due to some technologies not having separate generic/specific names.
...
This was SVN commit r13836.
2013-09-14 00:00:47 +00:00
c28151c1c1
Put tooltips on a diet.
...
This was SVN commit r13835.
2013-09-13 23:49:46 +00:00
82fb0ce6be
Improve game setup GUI performance by switching from main menu instead of pushing the page on top of the stsck
...
This was SVN commit r13828.
2013-09-12 15:12:08 +00:00
5304bc9d6a
Changes GameView to expose global functions to scripts instead of using CJSObject.
...
Fixes #2126
Refs #1886
This was SVN commit r13826.
2013-09-12 12:40:05 +00:00
4c9cd2921d
Replaces splash screen with fundraiser message
...
This was SVN commit r13796.
2013-09-01 23:56:50 +00:00
c3dcde7e34
Alpha version number.
...
This was SVN commit r13792.
2013-09-01 20:47:02 +00:00
cc08c81faf
Tweaks to barracks and blacksmith tips.
...
This was SVN commit r13787.
2013-08-31 19:23:16 +00:00
0bd22649f0
Tweaked Army Camp tip text.
...
Adjusted max gatherers for pyramid ruins.
New 'Blacksmith' loading tip.
This was SVN commit r13786.
2013-08-31 12:26:17 +00:00
66ab19086a
Updated Stoa tip image.
...
Updated Persian Architecture tip text.
Adjusted upward the number of max gatherers for small mines and the
unfinished Greek temple ruin.
Tweaked Cycladic Archipelago 6 (fixed fish and treasure positions).
Tweaked Gold Oasis 1 (made it possible to build a civic center in the
middle of the "Gold Patches."
Adjusted the Spartan House history entry, based on text by contributor
Thorfinn the Shallow Minded.
This was SVN commit r13785.
2013-08-30 22:35:15 +00:00
df190cbbd1
fix issues with menu mode and playlist, harden code and clear out ambient noises at game end, fixes #2066
...
This was SVN commit r13784.
2013-08-29 13:20:55 +00:00
89430de468
Okay, do what f5ab6255d0 was supposed to do.
...
This was SVN commit r13773.
2013-08-26 04:17:26 +00:00
b10a01645f
Revert f5ab6255d0. I accidentally somehow committed my whole working tree on this computer....
...
This was SVN commit r13772.
2013-08-26 04:15:36 +00:00
f5ab6255d0
General scrollbar improvements. Patch by Josh. Fixes #2080 .
...
- Don't show the scrollbar when the contents aren't overflowing the
visible area.
- Fix bugs in minimum bar sizing.
- Add capability to set a maximum bar size.
- Correct outdated/incorrect comments.
This was SVN commit r13771.
2013-08-26 03:06:08 +00:00
e75765faae
Fixed some Greek corral prop problems.
...
Fixed Storehouses tip.
Fixed the names for ALL Iberian units and buildings.
Added a build restriction for the Iberian Monument.
This was SVN commit r13769.
2013-08-25 22:20:09 +00:00
7c0dfc0d82
Fixed a couple tips.
...
This was SVN commit r13765.
2013-08-25 17:36:55 +00:00
e3b9f17c19
Removes useless "old maps" filter from match setup, refs #2071
...
This was SVN commit r13719.
2013-08-20 02:28:49 +00:00
0b4fe2ef94
Tweaks game speed dropdown more, refs #2046
...
This was SVN commit r13715.
2013-08-19 20:00:26 +00:00
bcf7115b5c
Fix Aegis to work properly for A14, also rename the folder from "qbot-wc" to "aegis" (thus apparent huge number of changes). Adds a "sandbox" difficulty setting that will never attack, collect resources 50% slower, and is pop-capped at 70 for beginners.
...
This was SVN commit r13683.
2013-08-17 13:59:53 +00:00
81b29bf18d
fix line wrapping when big number of gatherers on one resource
...
This was SVN commit r13667.
2013-08-15 20:00:55 +00:00
c709105355
Clarifies control group HotKeys
...
This was SVN commit r13652.
2013-08-12 23:50:18 +00:00
1ffb74b336
Adjusts session game speed dropdown, fixes #2046
...
This was SVN commit r13645.
2013-08-11 20:49:41 +00:00
8c74df2acd
Give an elevation advantage to ranged units. Patch by sanderd17. Fix #1960 .
...
This was SVN commit r13626.
2013-08-03 19:20:20 +00:00
70d072577b
;
...
This was SVN commit r13621.
2013-07-31 22:25:24 +00:00
f6e0c4c5a4
Split up cheats into multiple files. Patch by lsdh/ldsh. Fixes #2019 .
...
Replace buggy hasAllies with the inlined check if we have a team at all.
Fix setting of starting resources (broken in 58fa0c7c58
2013-07-31 22:22:12 +00:00
344a149a66
Infinite farms with diminishing returns (but no farmland). Refs #1318 .
...
This was SVN commit r13616.
2013-07-30 06:04:53 +00:00
857ae2dd3e
- Fix a bug from 20e7d2224a where the player ID would always be set to 1.
...
- Make the developer overlay a tad taller.
This was SVN commit r13614.
2013-07-29 20:01:09 +00:00
f3b0417aac
Don't try to interpret Enter as a mouse click in message boxes (makes it really annoying to chat at the end of a game).
...
This was SVN commit r13608.
2013-07-29 05:04:28 +00:00
20e7d2224a
Implement a developer overlay command to change the current player ID (very useful for AI development).
...
This was SVN commit r13606.
2013-07-29 00:53:44 +00:00
a684f7646b
Fixes crash when hotloading main menu while splash screen shown (don't alter GUI page stack in init functions), refs #2042
...
This was SVN commit r13597.
2013-07-26 01:35:01 +00:00
86a8dd7e6f
Small cleanup.
...
This was SVN commit r13583.
2013-07-21 23:25:15 +00:00
e0ea53a8ee
Adds saved game descriptions and in-game save dialog, based on patch by Crynux, fixes #2030
...
This was SVN commit r13579.
2013-07-21 00:23:57 +00:00
da4d1916dc
Implements shared trade gain with allies, patch by mimo, fixes #1691
...
This was SVN commit r13567.
2013-07-16 05:59:48 +00:00
d479f373aa
Display current/max gatherers or builders when a resource or foundation is selected. Based on a patch by mimo. Fix #1871 .
...
This was SVN commit r13541.
2013-07-07 22:13:58 +00:00
ed3afce81e
- Round attack numbers in the GUI. Patch by scythetwirler. Fix #1997 .
...
- Adjust the siege attack tech to add an integer instead of multiply by
a percentage.
- Fix the siege armor tech so the tooltip and the added value match up.
This was SVN commit r13540.
2013-07-07 21:04:36 +00:00
24b6fb7c3e
Clean up cheat handling a bit. Use setter and getter for cheatTimeMultiplier.
...
This was SVN commit r13526.
2013-07-01 23:46:03 +00:00
9565c60a14
Adds UI sounds for buttons, dropdowns, lists, and checkboxes, fixes #948
...
This was SVN commit r13521.
2013-07-01 04:15:09 +00:00
c6348538ea
Show combined costs in the gate conversion tooltip. Based on patch by Jgwman. Fixes #1591 .
...
This was SVN commit r13511.
2013-06-29 20:55:53 +00:00
37c8e77d8e
Use floats for health. Fix #1633
...
This was SVN commit r13507.
2013-06-29 00:43:08 +00:00
4fc15a9b08
Renames mill to storehouse
...
This was SVN commit r13496.
2013-06-22 02:28:54 +00:00
ada7702bec
add UI sound channel, clean up external interface and javascript calls
...
This was SVN commit r13467.
2013-06-10 13:58:43 +00:00
5246e9a576
Update description of ESC key in the manual. Refs #1928 .
...
This was SVN commit r13464.
2013-06-09 20:38:57 +00:00
6f3a0e1378
Implement location hotkeys. Fix #1882 .
...
This was SVN commit r13463.
2013-06-09 20:21:19 +00:00
71b25d5bd4
big SoundManager checkin,futureproof javascript interface, isolate external calls to remove OpenAL references
...
This was SVN commit r13455.
2013-06-06 11:13:57 +00:00
5b1f5dd2c1
Display expected trading gain (GainMultiplier = 1) for market foundations when setting rally points. Fixes #1963 .
...
This was SVN commit r13452.
2013-06-05 21:35:31 +00:00
8026685a06
Don't display the rally point tooltip for trading for enemy markets.
...
This was SVN commit r13448.
2013-06-02 20:17:44 +00:00
bc8d461b81
Display rally point lines when setting rally points using the minimap. Patch by TrinityDeath. Fixes #1848 .
...
This was SVN commit r13422.
2013-05-23 20:34:15 +00:00
de5d4491ab
var-fare
...
This was SVN commit r13404.
2013-05-12 22:28:02 +00:00
3bec6ced85
Fix hero button for heroes without attack
...
This was SVN commit r13401.
2013-05-12 16:02:53 +00:00
56fa123718
Fix error when constructing with the first selected entity being a building.
...
This was SVN commit r13392.
2013-05-04 21:44:32 +00:00
fc5e2d27c7
Cancel building placement or reset selection on Esc. Patch by Josh. Fixes #1928 .
...
This was SVN commit r13391.
2013-05-04 21:02:11 +00:00
683f22cdb1
Display entity limits for buildings. Patch by Josh. Fixes #1924 .
...
This was SVN commit r13388.
2013-05-01 19:25:55 +00:00
f42b77919d
Future-proof the code for civ specific non-peace tracks.
...
This was SVN commit r13387.
2013-05-01 16:48:55 +00:00
ac3e9d8bc7
clear peace tracks before reloading music from civ files
...
This was SVN commit r13385.
2013-05-01 01:51:30 +00:00
e0a2e5790d
Exponential Armor patch by Alpha123, with new updated armor values.
...
Needs a ton of testing.
This was SVN commit r13381.
2013-04-29 07:51:51 +00:00
0686c6a553
Resetting 'default' maps.
...
This was SVN commit r13379.
2013-04-29 02:36:57 +00:00
71486bd57d
SoundManager supports playlists
...
This was SVN commit r13368.
2013-04-24 12:03:42 +00:00
75f332ce20
Stop hotkey. Patch by alpha123. Fixes #1870 .
...
This was SVN commit r13364.
2013-04-18 19:20:29 +00:00
dc9889c190
Display number of garrisoned units when trying to garrison. Patch by mimo. Fixes #1915 .
...
This was SVN commit r13361.
2013-04-18 18:18:29 +00:00
a362b41029
Fix grouping of garrisoned units. Patch by mimo. Fixes #1918 .
...
This was SVN commit r13360.
2013-04-18 18:18:24 +00:00
d0a695f7fb
Allow mutual allies to garrison in each others buildings. Patch by mimo. Fixes #1807 .
...
This was SVN commit r13357.
2013-04-14 00:34:14 +00:00
95a10e7f42
Reduce duplicate GuiInterfaceCalls some more. Patch by sbte. Fixes #1878 .
...
This was SVN commit r13354.
2013-04-10 21:05:46 +00:00
555f06acbe
Fix errors when the hero is garrisoned. Patch by alpha123. Refs #1802 .
...
This was SVN commit r13346.
2013-04-06 19:32:07 +00:00
7f9b486a48
This was SVN commit r13341.
2013-04-03 23:28:29 +00:00
16de5c75ac
Adds game speed option to match setup, adds in-game control for single player games, fixes #785 .
...
Refactors some GUI utility functions.
This was SVN commit r13340.
2013-04-03 23:24:22 +00:00
62dc594a71
Hero button. Based on patch by Malcom and edits to that by alpha123. Fixes 1802.
...
This was SVN commit r13339.
2013-04-03 17:27:55 +00:00
f82adf3ef3
Don't call GetSimulationState too often. Patch by sbte. Fixes #1878 .
...
This was SVN commit r13336.
2013-04-02 21:06:20 +00:00
c2ca0209fa
Fixes multiplayer crash when host disconnects while clients are still loading.
...
Improves client disconnect handling slightly.
This was SVN commit r13327.
2013-03-25 05:01:36 +00:00
d709fe50ed
Clean-up of Aegis scripts. Most deprecated functions have been removed, some comments updated. Also makes resource maps 8-bit to save a little memory.
...
Fix the placement of the "civ info" button to avoid overlapping on
1024*768.
This was SVN commit r13298.
2013-03-16 09:59:43 +00:00
3958c03dbc
Changes default scenarios to Punjab 1
...
This was SVN commit r13294.
2013-03-15 23:06:16 +00:00
5af7544918
Bug fixes and small improvements to Aegis. Change the "C" button into a "Settings" button. Fix to -autostart-aidiff.
...
This was SVN commit r13289.
2013-03-15 12:35:16 +00:00
26cc813cf5
Update for release trailer recording
...
This was SVN commit r13286.
2013-03-14 23:24:53 +00:00
25293ce0cc
Many small bugfixes for AIs. Adds support for difficulty (and along with that, some behind-the-door architecture for a handicap system).
...
Adds -autostart-aidiff to set the difficulty from the command line from
testing.
This was SVN commit r13278.
2013-03-13 20:44:48 +00:00
2bcb03f049
Fix messages.js for "/team" messages when no teams were set.
...
Change to AI logic, makes Aegis more efficient with a better attack,
eco, and defense. Bugfixes.
This was SVN commit r13271.
2013-03-12 21:58:25 +00:00
9b1b8cc8fd
A few bugfixes, slight change in logic for smoother play. Makes Aegis gather with cavalry. Allows it to send chat messages to warn about attacks.
...
This was SVN commit r13266.
2013-03-11 19:58:29 +00:00
9b03e0d572
Darkens icons that are unavailable to train/build/research to make it more obvious than only the grayscaling in some cases.
...
Improves the red overlay showing a lack of resource for technologies.
Makes tech pair show a red cross instead of a red overlay when hovering
over a pair to make it less confusing.
This was SVN commit r13212.
2013-03-03 10:27:37 +00:00
c16b93794a
Support decrementing training batches, show batch size on icons.
...
This was SVN commit r13208.
2013-02-28 00:20:16 +00:00
3c50352134
Use attack move icon as a cursor. Refs #1847 .
...
This was SVN commit r13207.
2013-02-27 18:18:59 +00:00
cb890ad876
Add shift-clicking to tribute multiples of 500. Patch by alpha123. Refs #1839 .
...
This was SVN commit r13201.
2013-02-25 22:59:04 +00:00
18ee932a01
Adds attack move bound to the Ctrl hotkey. Patch from mimo. Refs #1001 .
...
This was SVN commit r13200.
2013-02-25 21:56:24 +00:00
94f2c2d912
Add insufficient population count to production queue tooltip. Patch by zoot. Fixes #1659 .
...
This was SVN commit r13198.
2013-02-25 20:30:02 +00:00
9e163500c5
Don't use Number, parseInt, etc. per coding conventions (use the +operator instead)
...
This was SVN commit r13192.
2013-02-24 00:25:13 +00:00
ca92e50048
Adds notification tooltips for building placement, fixes #921 .
...
Tweaks info tooltip borders and padding to improve readability.
This was SVN commit r13191.
2013-02-24 00:12:41 +00:00
c09d390656
Notify the player on receiving a tribute. Patch by alpha123. Refs #1839 .
...
This was SVN commit r13176.
2013-02-20 15:56:55 +00:00
67202eabc8
Only focus on idle units instead of following them. Patch by zoot. Fixes #1835 .
...
This was SVN commit r13175.
2013-02-20 15:56:42 +00:00
f9bbd97dde
Adds startup warning(s) about removing fixed renderpath, fixes #1795
...
This was SVN commit r13156.
2013-02-09 22:55:42 +00:00
5cbd9f0314
Add tribute stats to the summary screen. Patch by alpha123. Fixes #1831 .
...
This was SVN commit r13149.
2013-02-03 23:49:49 +00:00
1f7e6cb2ba
Adds actor seed support to scenario XML data, optionally used in place of entity ID.
...
Fixes Atlas previews not matching placed entity.
Fixes in-game building previews not matching final entity (except
walls).
This was SVN commit r13144.
2013-02-03 02:16:52 +00:00
26f616aba7
Save player name when hosting.
...
This was SVN commit r13115.
2013-01-24 20:12:12 +00:00
e543da5565
Activate battle music tracks
...
This was SVN commit r13107.
2013-01-21 23:18:53 +00:00
