Commit Graph

755 Commits

Author SHA1 Message Date
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
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
f8c22634de oops
This was SVN commit r11863.
2012-05-15 00:26:24 +00:00
8d66340329 Really set Oasis 11 as the default multiplayer map.
This was SVN commit r11829.
2012-05-10 22:23:09 +00:00
75433f1d5d This was SVN commit r11821. 2012-05-10 19:43:47 +00:00
a8e548ff5e This was SVN commit r11818. 2012-05-10 17:45:50 +00:00
b36b9da9a0 Single player default map now Punjab 3.
This was SVN commit r11817.
2012-05-10 17:05:19 +00:00
7d00b830aa Changed default maps.
This was SVN commit r11815.
2012-05-10 05:04:10 +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
2fbca07f6d Adds random civ option to game setup, based on patch by deebee. Fixes #1082.
This was SVN commit r11778.
2012-05-06 23:20:57 +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
bb81a9d81b Move single techs to the bottom row.
This was SVN commit r11678.
2012-04-26 17:43:33 +00:00
fee0ec6648 Added some debug commands (quit and set-shading-color) which shoudl be useful for AI development
This was SVN commit r11671.
2012-04-25 20:56:35 +00:00
e765f6865f Add a red overlay to the paired tech on hover. Fixes #1356.
This was SVN commit r11670.
2012-04-25 17:58:16 +00:00
4f905584c9 Clarify tech pairs. Refs #1356.
This was SVN commit r11669.
2012-04-25 17:02:41 +00:00
e6cb5fade6 Shift-clicking the control group button adds to selection. Patch by mk12. Fixes #1345.
Add AI to Battle for the Tiber map.

This was SVN commit r11662.
2012-04-24 15:58:02 +00:00
vts
f72bfb1cf1 Add option to disable particles, based on patch by rogue-spectre. Fixes #1222.
This was SVN commit r11658.
2012-04-23 22:57:51 +00:00
5ceea39a59 Added technology pairs.
This was SVN commit r11609.
2012-04-21 21:40:07 +00:00
b9695db52c Don't add units to selection if the selected unit isn't owned by the player. Fixes #1256, based on patch by mk12.
Update AI API to Health changes.

This was SVN commit r11608.
2012-04-21 20:50:07 +00:00
b25d7a4bab Display all trainable/builable (by selected entities) entities.
This was SVN commit r11606.
2012-04-21 20:10:11 +00:00
6938ecf431 Allow switching to not yet buildable entities, if they are in the current selection. Use consts if we already define them.
This was SVN commit r11605.
2012-04-21 17:26:06 +00:00
774809b0a9 Allow training in all selected buildings. Fixes #1210.
This was SVN commit r11592.
2012-04-21 00:21:01 +00:00
755e407aeb Technologies. Refs #3. Full unlocking technology implementation. Only unit gathering rates can be modified currently because the patch was big enough already.
This was SVN commit r11584.
2012-04-20 17:21:04 +00:00
c8745ee41f Handle game ending in Atlas a bit more gracefully, it now continues until the user stops the simulation test. Fixes #641.
This was SVN commit r11575.
2012-04-20 01:41:54 +00:00
82263fd3d3 Shift-N adds that groups units to selection. Fixes #1262.
This was SVN commit r11569.
2012-04-19 09:00:51 +00:00
c56f96040e Implement healing. Fixes #999.
This was SVN commit r11536.
2012-04-17 20:22:13 +00:00
9c4a7b8086 Clean up gui code.
This was SVN commit r11514.
2012-04-15 16:27:44 +00:00
2c3801743a Hide the barter buy button when it is the same as selected sell button
This was SVN commit r11505.
2012-04-15 03:44:57 +00:00
71a57ed3a7 Allow gathering regardless of resource owner
This was SVN commit r11478.
2012-04-10 21:09:21 +00:00
b3e519c278 Remove sheets.
This was SVN commit r11466.
2012-04-09 23:13:45 +00:00
67bca5a6ed Use an overlay image to mark selected icons instead of using a separate image.
Remove some useless sheets.

This was SVN commit r11464.
2012-04-09 18:58:03 +00:00
a21fc77212 A minor improvement for enabling/disabling user feedback. It was set to enabled/disabled in every tick which triggered some code.
Now it's only enabled or disabled when the user clicks the button and
therefore much less events are triggered.

This was SVN commit r11463.
2012-04-09 12:30:56 +00:00
c93f17827f Make use of the grayscale opion.
Move some icon files to a more adequate location.
Closes #1214 as that was already commited and this commit fixes some
minor issues.

This was SVN commit r11459.
2012-04-08 22:56:11 +00:00
fda1d07794 Tweaking some pop costs.
This was SVN commit r11450.
2012-04-08 07:27:56 +00:00
07ea6673c3 Use grayscale option instead of grayscaled icons
This was SVN commit r11443.
2012-04-06 15:51:26 +00:00
32d6b09c3c Set goods for every selected trader. Based on patch by Spahbod, fixes #1209.
This was SVN commit r11442.
2012-04-06 15:07:04 +00:00
7ff99cc218 Prevent trade with foundations, based on patch by Spahbod, fixes #1215.
This was SVN commit r11440.
2012-04-05 22:00:15 +00:00
316584d71a Corrected in game manual about creating control groups to include 0, fixes #1279.
This was SVN commit r11414.
2012-04-01 14:00:15 +00:00
8d3434722d New loading screen tips for Roman Army Camp, Palisade walls, and Persian Architecture.
This was SVN commit r11392.
2012-03-22 07:57:53 +00:00
0d385f4112 Make selected stances and formations more obvious. Patch from leper, fixes #1190.
This was SVN commit r11386.
2012-03-21 16:45:02 +00:00
a957455647 Shift-click ungarrisons all units of a type. Patch from leper, fixes #1206.
This was SVN commit r11385.
2012-03-21 15:18:31 +00:00
5f06766ead Replace isUnit, isAnimal, ... with calls to hasClass using patch from leper. Fixes #1201.
This was SVN commit r11365.
2012-03-18 21:16:30 +00:00
4eec2bf5d2 Fixes some bugs related to deleting saved games (in particular, load/delete was broken if the file was deleted externally while the game was running).
Adds saved game directory to the hotload watch list.
Logs error instead of crashing when saved game is not found.
Changes Atlas double-click selection to only pick units from the same
player.

This was SVN commit r11332.
2012-03-14 00:23:28 +00:00
f1ba777a76 Ides of March
This was SVN commit r11328.
2012-03-13 22:54:15 +00:00
0c49ac92fe Ides of March
This was SVN commit r11326.
2012-03-13 20:52:42 +00:00