Commit Graph

616 Commits

Author SHA1 Message Date
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
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.

Refs #2241

This was SVN commit r14499.
2014-01-04 11:48:28 +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
d7f18c10de Add visual indicator when unsetting rally-points, closes #2117
This was SVN commit r14462.
2013-12-31 13:21:06 +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
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
fd47e6caee Name.
This was SVN commit r14341.
2013-12-13 13:30:59 +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
9678cf547a cache quantities depending only on the selection, adresses #2179
This was SVN commit r14296.
2013-12-05 18:50:29 +00:00
a96a333b47 Small cleanup.
This was SVN commit r14274.
2013-12-03 01:01:12 +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
2102648f7c Allows autogarrison of newly trained units, fixes #1044
This was SVN commit r14144.
2013-11-11 15:37:16 +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
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
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
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
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
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
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
c3dcde7e34 Alpha version number.
This was SVN commit r13792.
2013-09-01 20:47:02 +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
0b4fe2ef94 Tweaks game speed dropdown more, refs #2046
This was SVN commit r13715.
2013-08-19 20:00:26 +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
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).

This was SVN commit r13620.
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
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
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
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
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
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
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
26cc813cf5 Update for release trailer recording
This was SVN commit r13286.
2013-03-14 23:24:53 +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
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
3715985f1a Add battle detection support to the simulation. Refs #1425 (Patch by Zoot)
The audio code does not yet support actually playing battle music.

This was SVN commit r13091.
2013-01-20 22:47:59 +00:00
02ac06e293 Allow ungarrisoning units even if they cannot be built due to tech requirements. Patch by mimo. Fixes #1808, #1672.
Fix batch training tooltip if we have more units than the entity limit
allows for.

This was SVN commit r13072.
2013-01-13 19:39:11 +00:00
1f8d0cacdc Adds manual to in-game menu, based on patches by _vincent and grillaz. Fixes #1338
This was SVN commit r13067.
2013-01-12 00:09:42 +00:00
d29f6c5c49 Fix dicrepancy in the settings dialog when using hotkeys. Patch by kingadami. Fixes #1817.
This was SVN commit r13054.
2013-01-07 15:19:10 +00:00
8e382d98a2 Fixes cost spacing in wall construction tooltips, refs #1675
This was SVN commit r13042.
2013-01-04 00:52:21 +00:00
0d204037b6 Added right click selection removal. Fixes #1028. Thanks to kingadami and GerbilOfDoom for the patch.
This was SVN commit r13040.
2013-01-03 22:53:46 +00:00
573d47d9a9 Disable diplomacy settings when player is defeated. Fixes #1764.
This was SVN commit r13000.
2012-12-19 20:19:54 +00:00
188a60315b Update release name.
This was SVN commit r12995.
2012-12-14 19:56:58 +00:00
0da37326d6 Fixes bug that caused training icons for unavailable units to not be greyed out
This was SVN commit r12993.
2012-12-14 19:22:08 +00:00
29ac57409e Adds warning about incorrect use of time warp mode, refs #1409
This was SVN commit r12990.
2012-12-14 13:41:25 +00:00
d616a86c7a Fixes unit promotions triggering a selection sound, based on patch by zoot. Fixes #1713
This was SVN commit r12973.
2012-12-10 21:35:52 +00:00
555e54f088 Workaround for game settings window being hidden behind session UI
This was SVN commit r12943.
2012-12-04 21:41:30 +00:00
610623f010 Fixes small bug introduced by aa68198747.
Clarifies new serialization test options in readme.txt.

This was SVN commit r12938.
2012-12-04 01:48:05 +00:00
aa68198747 Factors out common properties from siege templates, refs #1718. Simplifies pack-related tooltips.
This was SVN commit r12937.
2012-12-04 00:28:28 +00:00
232dee5a9c Don't show slaughter attack in tooltips and hide the tutorial AI. Patch from zoot. Fixes #1732
This was SVN commit r12913.
2012-12-02 15:22:15 +00:00
6fd99e34ce Implements siege packing. Closes #1718.
Adds templates for packed and unpacked siege units - needs stat
tweaking.

This was SVN commit r12904.
2012-12-01 00:34:03 +00:00
fdd2b92723 Simplify formatBatchTrainingString function a bit: remove always true condition/unreachable code. Refs #1432
This was SVN commit r12897.
2012-11-27 15:57:45 +00:00
1f2047f04e Consider the unit's build time in the calculation.
This was SVN commit r12889.
2012-11-25 21:01:03 +00:00
2ab8c8b874 Fix technology pair affordable mask.
This was SVN commit r12879.
2012-11-25 13:18:01 +00:00
5f2d30c7f7 Make batch time factor tech modifiable and a template property.
Fix unit test map.

This was SVN commit r12877.
2012-11-25 02:52:13 +00:00
27ae648d9c Show cost in tooltips for batches. Closes #1717, patch by zoot.
This was SVN commit r12876.
2012-11-24 22:04:29 +00:00
a326aa63a9 Add check to the hotkeys. Fix #1726.
This was SVN commit r12875.
2012-11-24 20:19:13 +00:00
f0493e7060 Spelling fixes. Fixes #1727, patch by zoot.
This was SVN commit r12874.
2012-11-24 19:47:36 +00:00
89217603a1 Unit training hotkeys from mammadori. Fixes #1226.
This was SVN commit r12861.
2012-11-17 18:27:31 +00:00
7125e72e52 Add build/research/train time to tooltips.
This was SVN commit r12848.
2012-11-11 23:08:44 +00:00
93b0048576 Replace resource names with icons in tooltips. Based on patch by zoot. Fixes #1675.
This was SVN commit r12845.
2012-11-11 15:35:01 +00:00
4cf5703125 Return back the focus on rally point button mistakenly replaced with an additional delete button in a21e01150a
This was SVN commit r12836.
2012-11-09 09:16:20 +00:00
3a02bc296c Fix setupUnitPanel usage broken in 7e21db08d5. Refs #1432
This was SVN commit r12835.
2012-11-08 03:54:00 +00:00
7e21db08d5 Training limits. Limit heroes to one living per player. Allow heroes to be trained again. Closes #1432
This was SVN commit r12832.
2012-11-07 17:56:14 +00:00
d57926fa5b Adjust diplomacy according to irc discussion. Refs #7.
This was SVN commit r12828.
2012-11-05 20:16:35 +00:00
76676b1e38 Fix a non-fatal GL error, fix me forgetting to commit a file, remove the "3D" waviness setting as it was mostly redundant with HQ.
This was SVN commit r12822.
2012-11-05 12:14:04 +00:00
ed7c66eb82 Updates the water settings: features can now be enabled individually for more modularity. Fixes a few bugs. Allows it to be run at an acceptable speed in Atlas.
This was SVN commit r12817.
2012-11-04 15:54:36 +00:00
a0e13d9625 Fix tests. BuildingAI now handles DiplomacyChanged messages.
This was SVN commit r12812.
2012-11-02 17:20:32 +00:00
9930500661 Diplomacy is now mutual. Refs #7.
This was SVN commit r12810.
2012-11-02 13:44:35 +00:00
114593b9ad Fix the "Advanced water" box from being ticked when then it shouldn't be on loading.
This was SVN commit r12808.
2012-11-02 09:59:15 +00:00
fb035d08e3 fixes #1572 and fixes #932
Changes the water rendering in game to support higher quality effects
and to look nicer.

This was SVN commit r12802.
2012-10-31 18:42:17 +00:00
22b2343192 Fix name/color in diplomacy messages.
This was SVN commit r12790.
2012-10-27 23:31:16 +00:00
ca4dedbc3e Improve neutral and ally combat handling. Refs #7.
This was SVN commit r12780.
2012-10-23 23:13:39 +00:00
c98a97924d Fix some inconsistent newline characters from 902fc4a541 in unit_commands.js via unix2dos. Refs #1432
This was SVN commit r12779.
2012-10-23 20:42:03 +00:00
a21e01150a Basic diplomacy. Refs #7.
This was SVN commit r12778.
2012-10-23 16:31:07 +00:00
347b5e18cf Aviv's adjustment to the tooltips for trading.
This was SVN commit r12773.
2012-10-20 21:36:36 +00:00
4c37e8de95 Adds hotkey for forcing unit attack (useful for destroying enemy farms), based on patch by quonter. Fixes #1489
This was SVN commit r12703.
2012-09-24 01:14:21 +00:00
de6653e255 Adds max attack range to training tooltip and unit details panel for ranged units.
Adds attack type to unit details panel. Refs #1657

This was SVN commit r12700.
2012-09-23 20:50:23 +00:00
bdde574ade Wall build orders shouldn't always be queued. Fixes #1673.
This was SVN commit r12676.
2012-09-15 05:45:49 +00:00
41e5f88aae Support appending and global selection via the 'find idle' keys.
This was SVN commit r12664.
2012-09-12 21:37:04 +00:00
74364a3130 Changing the release name to "Alpha XI Kronos" before someone makes a package.
This was SVN commit r12575.
2012-09-01 05:45:14 +00:00
0340cc2baa Shade and show an insufficient resources tooltip for unaffordable walls. Fixes #1641.
This was SVN commit r12569.
2012-08-31 19:20:16 +00:00
d98c62f00a Show the resource tooltips over the resource counter icons. Fixes #1636.
This was SVN commit r12562.
2012-08-30 20:36:40 +00:00
a563786b86 Only play selection sounds for Gaia entities or entities that the player can control.
This was SVN commit r12553.
2012-08-30 02:02:59 +00:00
b4ba09c8b3 Reduce maximum garrison icons to 12 so stances can be shown for siege rams, etc.
This was SVN commit r12537.
2012-08-27 16:56:58 +00:00
6a7e6ca343 Clean up entity name formatting; always show generic names in tooltips.
This was SVN commit r12535.
2012-08-27 07:07:33 +00:00
126db0097a Generic names should have parens only if a specific name is also present.
This was SVN commit r12534.
2012-08-27 06:17:52 +00:00
b462f2acfe Show generic names in unit garrison tooltips.
This was SVN commit r12532.
2012-08-26 19:58:25 +00:00
576761c05e Never allow entities to set a rally point on themselves.
This was SVN commit r12530.
2012-08-26 06:38:29 +00:00
a4ff4b92b7 Include the generic name in the tooltips when selecting multiple units.
This was SVN commit r12521.
2012-08-24 07:14:50 +00:00
e50bf9e539 Sky toggling through config and with Alt+Z
This was SVN commit r12513.
2012-08-22 07:32:26 +00:00
9216dc3924 Have toggleChat (enter by default) send a chat message if the input isn't empty.
This was SVN commit r12468.
2012-08-19 00:28:46 +00:00
c32d3ece44 Remove focus when closing the chat window via the escape key.
This was SVN commit r12467.
2012-08-18 21:35:52 +00:00
de38f9ef9a Prevent domestic animals from being manually deleted (killed). Patch by yakca. Fixes #1525.
This was SVN commit r12445.
2012-08-16 02:08:56 +00:00
78e9fecf92 Added support for ungarrisoning units by template name and for ungarrisoning from multiple entities at once. Fixes #910.
This was SVN commit r12443.
2012-08-16 01:15:04 +00:00
011ba8255e New sound system implementation by stwf, refs #1223, #961.
Enables audio on OS X, refs #685, #931.
Fixes music not playing after a game, refs #946.

This was SVN commit r12428.
2012-08-15 00:10:44 +00:00
e83bebe02e Remove entities from selection groups when they become hidden. Fixes #1373.
This was SVN commit r12422.
2012-08-14 14:02:52 +00:00
d90e53d0a5 Show cost ranges in the wall construction tooltip, if possible.
This was SVN commit r12421.
2012-08-14 07:51:50 +00:00
902fc4a541 Show a red overlay over training/construction... icons that cannot be afforded.
This was SVN commit r12404.
2012-08-13 16:47:10 +00:00
8c97458de7 Prevent healers from healing themselves.
This was SVN commit r12398.
2012-08-13 02:56:51 +00:00
3acc855a2d Renamed /restrictteam to /team, added /enemy, /msg, /all. Fixes #1583.
This was SVN commit r12392.
2012-08-12 06:48:49 +00:00
2eed26df09 Implemented two chat commands, /restrictteam and /me. Refs #1583.
This was SVN commit r12371.
2012-08-11 23:59:28 +00:00
4890789d58 Added support for team chat in multiplayer. Team chat is default if you are on a team of size >1. Using the prefix g will make the message global. Fixes #1583.
This was SVN commit r12360.
2012-08-11 15:12:48 +00:00
2b503e68f7 Fixed broken chat; improved cheat message handling.
This was SVN commit r12342.
2012-08-10 03:35:20 +00:00
eadd24b64b Added a 'Stop' button to the GUI for immediately halting units.
This was SVN commit r12318.
2012-08-08 05:36:42 +00:00
84305155de Seamlessly change a player's entities to be Gaia-owned when resigning.
This was SVN commit r12316.
2012-08-08 05:27:59 +00:00
780970d16a Avoid a rare error when a group has both renamed and deleted entities.
This was SVN commit r12305.
2012-08-07 00:41:57 +00:00
78cc29b591 Added a resign option (deletes all of a player's entities).
This was SVN commit r12293.
2012-08-05 18:07:56 +00:00
0037bb8230 Slightly ugly fix for 'You has been defeated.' message in singleplayer.
This was SVN commit r12292.
2012-08-05 18:05:25 +00:00
202a02568b Cheats ... fixes #1555.
This was SVN commit r12284.
2012-08-05 14:01:05 +00:00
4a1b085df0 Send chat notifications upon player defeat.
This was SVN commit r12282.
2012-08-05 05:41:19 +00:00
86db7b8a59 Show multiplayer names in the summary screen, rather than the map's defaults.
This was SVN commit r12280.
2012-08-05 02:18:44 +00:00
83ca7142b6 Fixed a minor bug in the research display; removed an unnecessary comma.
This was SVN commit r12246.
2012-07-31 03:39:35 +00:00
be3ca61d43 Updated the production queue buttons, putting the progress sliders inside the button border.
This was SVN commit r12245.
2012-07-31 03:37:04 +00:00
c708de489e Display in-progress technologies in the upper right of the screen. Fixes #1431.
This was SVN commit r12243.
2012-07-31 02:03:25 +00:00
48d871d870 Allow gate lock/unlock buttons and wall conversion icons to show simultaneously.
This was SVN commit r12230.
2012-07-29 23:08:15 +00:00
16ef74d9fe Clicking on empty space only clears the selection if modifiers aren't held. Fixes #1561.
This was SVN commit r12221.
2012-07-29 17:42:35 +00:00
bfcbcc7ba8 Preserve selection order when entities are 'renamed'. Patch by Deiz/F00. Fixes #1544.
e.g. If you have a long wall as primary selection and CC as secondary,
after the gate upgrade the wall (now gate) remains the primary
selection.

This was SVN commit r12192.
2012-07-25 22:20:57 +00:00
0dc1d2139e Make rally points work for trade. Patch from Deiz/F00. Fixes #1173.
This was SVN commit r12191.
2012-07-25 21:38:56 +00:00
3d973b3554 Adds hotkey (Tab) for showing all player's entities' status bars at once, based on patch by Deiz/F00. Fixes #1187
This was SVN commit r12187.
2012-07-24 04:14:09 +00:00
574e079d64 Wall and gate selection usability improvements by Deiz/F00. Refs #619.
Fixes bug where selecting multiple wall types could convert to
mismatching gates.

This was SVN commit r12163.
2012-07-19 21:46:35 +00:00
89399e08e6 Implements always visible hero selection rings, based on patch by Deiz/F00. Fixes #1365
This was SVN commit r12148.
2012-07-19 04:45:01 +00:00
9b6839ace4 Adds gate conversion to palisades and siege walls. Fixes bug that all player entities in a selection could be converted to gates. Cleans up templates slightly. Refs #619
This was SVN commit r12139.
2012-07-18 03:56:18 +00:00
c495b0bca1 Adds gate cost to tooltip and shows both gate lock actions, based on patch by Deiz/F00. Changes and renames lock icons. Fixes #1539
This was SVN commit r12134.
2012-07-16 23:49:19 +00:00
9f5c7a5607 Fixes possible conflicts in unit command panel when selecting multiple entities, patch by Deiz/F00. Fixes #1524
This was SVN commit r12123.
2012-07-16 04:12:48 +00:00
743f60b920 Handles gate upgrade case left out of previous commit.
This was SVN commit r12121.
2012-07-16 01:52:18 +00:00
b59c2d9e36 Adds lock/unlock gate icons, based on patch by F00.
This was SVN commit r12120.
2012-07-16 01:40:09 +00:00
6eb71380aa Get the gate template name from the wall name and fixes two templates which caused errors.
This was SVN commit r12095.
2012-07-12 22:49:40 +00:00
e416b38811 Fix phases.
This was SVN commit r12083.
2012-07-08 20:12:36 +00:00
2c5933912c Gates. Adds UI buttons, replaces wall section with a gate, defines and create obstruction shapes, detects friendly units and eventually disable door's "block movement" flag, allows us to lock / unlock the door by disabling "block pathfinding" flag. Needs icons, play sound, animations. Fixes #1385, refs #619.
This was SVN commit r12081.
2012-07-08 16:25:33 +00:00
ad3f543d2c Revert useless part of previous commit.
This was SVN commit r12021.
2012-06-25 22:27:00 +00:00
a60d01ee2e Display map name and size on summary screen. Based on patch by hapsky. Fixes #1333.
Play victory and defeat music.
Replace celts with gauls.

This was SVN commit r12020.
2012-06-25 22:11:47 +00:00
ace4793086 Make menu disappear when interacting with the game world. Based on patch by Deiz. Fixes #1291.
This was SVN commit r12018.
2012-06-25 17:27:22 +00:00
272efcc364 K776's minor GUI changes
This was SVN commit r12017.
2012-06-25 03:43:34 +00:00
975fec3af3 Fix incorrect font reference
This was SVN commit r12015.
2012-06-24 21:44:20 +00:00
f814e532ae Remove player color from queue panel and center civ shield behind name
This was SVN commit r12012.
2012-06-24 19:38:58 +00:00
63bdbcc67a Unbold generic name
This was SVN commit r12003.
2012-06-24 03:21:47 +00:00
b19d7268b8 Update settings text to use bold stroke 16
This was SVN commit r12002.
2012-06-24 03:17:54 +00:00
94bae18389 Use bolded text for unit names
This was SVN commit r11999.
2012-06-23 21:58:58 +00:00
859b568e9f Add new stroked 12 and 13 fonts and update session panels to use them
(non-bold used stroked 2 and bold used stroked 3)

This was SVN commit r11998.
2012-06-23 21:37:26 +00:00
0b57709d17 Make unit command buttons clickable again.
This was SVN commit r11996.
2012-06-23 13:28:19 +00:00
de8dc92e49 widen experience bar
This was SVN commit r11990.
2012-06-19 02:53:43 +00:00
2268fd3f0e Fix unit commands alignment
This was SVN commit r11989.
2012-06-18 23:59:02 +00:00
3337949721 Fix player name
This was SVN commit r11988.
2012-06-18 23:53:16 +00:00
9fb45928a1 Fix unit civ tooltip
This was SVN commit r11987.
2012-06-18 23:51:07 +00:00
03d56edb1b Add more detailed shading to selections details
This was SVN commit r11986.
2012-06-18 23:47:36 +00:00
80213bba5f Fix rank icon hiding
This was SVN commit r11985.
2012-06-18 22:45:10 +00:00
033120e8d8 Shrink experience bar, add tooltip to rank icon, rework middle panel shading
This was SVN commit r11984.
2012-06-18 22:33:40 +00:00
a34232d71e Add black border around stats bars
This was SVN commit r11983.
2012-06-18 13:40:53 +00:00
0c083f9a45 Fix stats bars on multi-select and shrink all stats bars from 8 to 7 px
This was SVN commit r11982.
2012-06-18 13:33:11 +00:00
3ec1b88d2c Adds missing break statements, thanks to picobyte. Fixes #1503
This was SVN commit r11981.
2012-06-18 01:38:30 +00:00
972f28c6a7 Update unit experience display
This was SVN commit r11978.
2012-06-17 00:28:05 +00:00
b269dabe3b Fix stamina and generic name issues
This was SVN commit r11977.
2012-06-16 22:41:48 +00:00
b66d1716e7 Recenter GUI and update unit details section.
This was SVN commit r11976.
2012-06-16 20:55:33 +00:00
d905e4c63a Split GUI out to bottom corners based on suggestions, and move barter icons down
This was SVN commit r11963.
2012-06-11 01:07:41 +00:00
85f4702531 Hide stamina for now
This was SVN commit r11961.
2012-06-10 03:38:25 +00:00
bf81922c62 Fix resource label when type is a treasure and fix civ tooltip
This was SVN commit r11960.
2012-06-10 02:56:21 +00:00
aa58b6ccfa always show generic name for now
This was SVN commit r11959.
2012-06-10 02:39:16 +00:00
87d415aca9 Update GUI selection details panel (single selections)
This was SVN commit r11958.
2012-06-10 02:05:40 +00:00
659049eb1c Auto-gather all types of treasures. Fixes #1422. Patch by Deiz.
This was SVN commit r11948.
2012-06-07 21:56:29 +00:00
d271ca89cf Update GUI style for single object selections (based on quantumstate's mockup)
This was SVN commit r11937.
2012-06-05 00:36:35 +00:00
636896dd7f Pass template to gather-near-position. Fixes #1454.
Add order_trade sound.

This was SVN commit r11921.
2012-05-27 20:23:08 +00:00
137b6dd338 Queued orders for rally points. Fixes #1053 and #1211.
This was SVN commit r11909.
2012-05-24 18:25:31 +00:00
c4d6019599 Add garrison order sound and remove the old garrison sound.
Fix some map errors, tabs in templates and update docs.

This was SVN commit r11891.
2012-05-20 15:44:57 +00:00
6cc98a6763 Add heal order sound.
This was SVN commit r11885.
2012-05-19 18:27:00 +00:00
04fe6d2363 Add reminders to keep alpha names in sync
This was SVN commit r11864.
2012-05-15 21:34:28 +00:00
a8e548ff5e This was SVN commit r11818. 2012-05-10 17:45:50 +00:00
9fa1145fe8 Update to GUI
This was SVN commit r11805.
2012-05-09 19:52:23 +00:00
c036a7d7e3 Adds control groups to saved game data, based on patch by mk12. Fixes #1261.
This was SVN commit r11783.
2012-05-07 04:18:54 +00:00
e6afc62545 Adds silhouettes option to in-game settings menu. Refs #1186
This was SVN commit r11782.
2012-05-07 02:14:01 +00:00
79c6a2cecc Adds config and hotkey options for toggling unit silhouettes, based on patches by Ello and mk12. Fixes #1186.
This was SVN commit r11779.
2012-05-07 01:09:53 +00:00
vts
d615ac64da Fix wall preview not disappearing when starting building placement immediately afterwards.
Adds some extra buildings to WallTest map to make Town Phase available
faster.

This was SVN commit r11769.
2012-05-06 00:07:34 +00:00
vts
490182ddd0 Wall placement. Closes #786.
This was SVN commit r11760.
2012-05-05 19:22:22 +00:00
58836c624a Read formations from civ JSON files. Fixes #1234, #601.
This was SVN commit r11735.
2012-05-03 23:32:10 +00:00
d4347a8466 Add Preferred and RestrictedClasses, based on patch by Zsol. Fixes #1144.
This was SVN commit r11710.
2012-05-01 22:20:08 +00:00
d92ef0d13e Fix a small issue with tech overlays.
This was SVN commit r11706.
2012-05-01 18:56:47 +00:00