Commit Graph

807 Commits

Author SHA1 Message Date
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
7fafeec767 Fixes splash screen to display only once at startup. Fixes #1701.
Adds some spacing between splash screen icons and text.

This was SVN commit r12762.
2012-10-17 20:33:50 +00:00
9177683653 Match setup GUI revamp. Adds pop-cap and starting resource options. Refs #802
This was SVN commit r12756.
2012-10-15 15:19:24 +00:00
5ce5ef9286 Adds a splashscreen that appears on startup and informs the player about the status of the game (bugs, missing features). The splashscreen can be disabled for future startups by unckecking a checkbox on the splashscreen.
This was SVN commit r12735.
2012-10-07 12:43:08 +00:00
59f3f1830c This was SVN commit r12713. 2012-09-27 06:23:53 +00:00
e464332c74 Fixing a bug in "random" map selection.
This was SVN commit r12704.
2012-09-24 11:13:37 +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
bdab01b381 Making the "random" option in the map selection dropdown orange. Refs #1668
This was SVN commit r12685.
2012-09-17 08:24:04 +00:00
91f3463bd3 Adding the "Random" option in map selection. Fixes #1668
This was SVN commit r12684.
2012-09-17 02:58:47 +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
4365cc639d Default ai player names patch: Codes. Fixes #1582.
This was SVN commit r12666.
2012-09-13 06:18:01 +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
0784d75dfe Removed out-of-date, often-forgotten civilization count.
This was SVN commit r12657.
2012-09-09 18:52:47 +00:00
323d7b207e Completely hide deprecated AIs for now.
This was SVN commit r12633.
2012-09-04 17:41:46 +00:00
6adccf3660 Hide unusable AIs from the default match setup drop-down list.
This was SVN commit r12626.
2012-09-04 07:09:36 +00:00
25f7012f0c Squished the match setup player display a bit, to better show longer names at low resolutions.
This was SVN commit r12625.
2012-09-04 07:01:11 +00:00
1a3a6a73ac Made the "default" maps Acropolis 1 (first map alphabetically in the list).
This was SVN commit r12596.
2012-09-02 03:03:53 +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
08a4b12f01 Added resource used counters that track all non-barter spending. Fixes #1605.
This was SVN commit r12543.
2012-08-29 05:13:45 +00:00
205792ddd3 Fix path to user.cfg on unix
This was SVN commit r12540.
2012-08-27 20:36:05 +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
dd2d1eb6ec Added name tooltips to the summary screen civ emblems.
This was SVN commit r12528.
2012-08-25 22:05:15 +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
8facd45803 s/IRC/Chat/, clarified tooltip.
This was SVN commit r12516.
2012-08-23 06:59:16 +00:00
e50bf9e539 Sky toggling through config and with Alt+Z
This was SVN commit r12513.
2012-08-22 07:32:26 +00:00
6cf4efbd01 Handle exit and return hotkeys in message boxes. Fixes #1319.
This was SVN commit r12503.
2012-08-21 06:30:30 +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
bbed3ca69a Made player slot reassignment in the game setup screen swap slot contents instead of leaving the old slot empty.
This was SVN commit r12457.
2012-08-17 21:22:07 +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
3b704b12a9 Summary screen: separate barter info for each resource
This was SVN commit r12393.
2012-08-12 09:12:06 +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
49b734336a Some "tips" text fixes.
Spec maps for more helmets.

This was SVN commit r12375.
2012-08-12 01:54:23 +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
7a7d7e5d0a Add trade/barter stats to the summary screen.
This was SVN commit r12365.
2012-08-11 16:38:01 +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
9dc838bed5 Add support for cropped images in the GUI code and update game setup to use cropped map previews. Refs #1343.
This was SVN commit r12348.
2012-08-10 19:59:20 +00:00
2b503e68f7 Fixed broken chat; improved cheat message handling.
This was SVN commit r12342.
2012-08-10 03:35:20 +00:00
f210008b07 Put a warning about the AI into the description of naval maps.
This was SVN commit r12326.
2012-08-08 23:10:21 +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
8fc1fd2478 Fixes default map names, closes #1578
This was SVN commit r12299.
2012-08-06 18:09:22 +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
08505d9353 Include a note about the UDP port in the 'host game' tooltip.
This was SVN commit r12242.
2012-07-30 21:08:29 +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
42b12f6567 Missing actors, textures, meshes fixes
This was SVN commit r12217.
2012-07-28 18:08:48 +00:00
5fef0394cc Fixed music. :)
This was SVN commit r12216.
2012-07-28 17:44:39 +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
b186fc4e7e A small tweak.
This was SVN commit r12137.
2012-07-17 03:55:00 +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
b444e3c435 Cleanup...
This was SVN commit r12129.
2012-07-16 05:52:43 +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
3a85fb7c48 Displays save game timestamps in local time rather than UTC, patch by Deiz/F00. Fixes #1530
This was SVN commit r12122.
2012-07-16 03:55:40 +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
5e92aabe72 Increases maximum dropdown list size slightly, allowing up to 10 lines at a time (must be careful that it fits on 1024x768!). Refs #1532
This was SVN commit r12107.
2012-07-14 04:29:16 +00:00
8c9ef1139a This was SVN commit r12106. 2012-07-14 04:15:20 +00:00
1b7519be91 Fixing the random player selection
This was SVN commit r12104.
2012-07-14 03:10:35 +00:00
c908970c02 This was SVN commit r12101. 2012-07-13 04:37:04 +00:00
8cd2751131 This was SVN commit r12100. 2012-07-13 04:15:23 +00:00
1233323e79 A minor change.
This was SVN commit r12099.
2012-07-13 04:05:13 +00:00
d0a1a3bd50 Fixed a bug.
This was SVN commit r12098.
2012-07-13 03:41:07 +00:00
c63074cabb New GUI changes.
This was SVN commit r12096.
2012-07-13 03:00:18 +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
98dea7eb03 Fix issues with civ specific victory/defeat music. Fixes #1370.
This was SVN commit r12024.
2012-06-26 18:44:52 +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
8c848c2f45 Replaces info icon with higher quality version. Fixes #1469.
Uses add_color effect, so it's easier to change the theme.
Fixes some inconsistent whitespace.

This was SVN commit r11930.
2012-06-02 00:09:57 +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