Commit Graph

577 Commits

Author SHA1 Message Date
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
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
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
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
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
894dc30c69 Trade. Closes #30.
This was SVN commit r11279.
2012-03-08 20:42:28 +00:00
0f0eef7ed4 Consistent whitespace
This was SVN commit r11221.
2012-03-02 18:03:19 +00:00
acf63afeaa Fix some whitespace, and spelling, and capitalisation, and unnecessary array wrapping.
This was SVN commit r11218.
2012-03-01 23:16:01 +00:00
edbbe38ee1 Fixes idle champion units not being found. Fixes #1188.
Adds trade class to merchant ship (for use in "find idle workers").
Explicitly adds females, traders/merchant ships, fishing boats, and
healers to "find idle workers".
Fixes typos in fire ship template.

This was SVN commit r11211.
2012-03-01 05:41:18 +00:00
7a75e068e7 Swaps the game's double- and triple-click selections, by popular demand (double-click now selects similar units, triple-click selects exact matches by rank)
This was SVN commit r11178.
2012-02-27 05:46:02 +00:00
1730dd6d8d Add military only drag select (Alt modifier) by gerbilOFdoom. Closes #277
This was SVN commit r10873.
2012-01-05 13:31:54 +00:00
6e974e3a78 Haxamanis
This was SVN commit r10777.
2011-12-20 21:40:03 +00:00
42f0aec84a Allows setting rally points on resources and buildings. closes #745
This was SVN commit r10744.
2011-12-16 16:08:26 +00:00
vts
db864f10c3 Rendering marker lines between buildings and rally points
Added command button to focus on rally point
(implements #524)

This was SVN commit r10704.
2011-12-10 07:07:04 +00:00
dfdeb4ec4c Make Victory / Defeat message more dramatic
This was SVN commit r10601.
2011-11-25 21:04:06 +00:00
69d5b07bb4 Rearrange buttons in ingame menu
This was SVN commit r10597.
2011-11-25 16:04:30 +00:00
vts
85186c98b2 Better selection boxes. Closes #914, #295, #810.
This was SVN commit r10593.
2011-11-25 06:36:13 +00:00
8cbab40137 Barter. Closes #23.
This was SVN commit r10588.
2011-11-24 15:43:32 +00:00
3a678a0c7c Fix time elapsed counter briefly showing old value when toggled on
This was SVN commit r10527.
2011-11-13 13:23:54 +00:00
ff064aca95 Adds useful stats to training and construction tooltips, based on patch from pejuko. Fixes #872.
This was SVN commit r10518.
2011-11-12 22:23:08 +00:00
7064565ff6 # Allow saving and loading single-player games.
Support writing zip files based on in-memory data.
Fix menu sliding animations to be framerate independent.

This was SVN commit r10454.
2011-10-30 00:07:28 +00:00
b454ccca79 Fix GUI issues when reconnecting to multiplayer games
This was SVN commit r10452.
2011-10-29 14:53:13 +00:00
a3c03815c0 Experimental quicksave/quickload feature
This was SVN commit r10427.
2011-10-24 14:55:45 +00:00
3efb3949d3 Clean up unused argument
This was SVN commit r10422.
2011-10-23 21:00:59 +00:00
d9820fb0cb Add optional time elapsed counter to session screen.
This was SVN commit r10402.
2011-10-13 23:20:34 +00:00
4200e33e5e Update button text color on game disconnected screen
This was SVN commit r10316.
2011-09-24 23:00:27 +00:00
45aedb2874 Should fix the music errors in Atlas (related to #956) thanks to Ben's suggestion. I think this should be handled at a lower level, but this should do for now.
This was SVN commit r10281.
2011-09-14 12:46:34 +00:00
aba6a7f118 Reorder dialog buttons for consistency
This was SVN commit r10279.
2011-09-14 00:43:19 +00:00
97e4f0fd5d Update alpha version label, change default single player map, update scripts music system
This was SVN commit r10263.
2011-09-13 00:45:33 +00:00
b1247e77cd fix start/stop music in settings, double ingame menu speed
This was SVN commit r10256.
2011-09-12 02:21:20 +00:00
b50fa144f3 The underlying sound system needs some work, so just get scripts sound working better.
This was SVN commit r10255.
2011-09-11 22:42:40 +00:00
be69735582 Trying to clean up music in the scripts. It is still broken.
This was SVN commit r10249.
2011-09-11 03:30:41 +00:00
238792a524 Reworked game setup and loading screens, and adjusted title decoration for some windows.
This was SVN commit r10217.
2011-09-08 03:49:57 +00:00
bc59102801 Make menu start out higher so that it is not visible when it is not opened (it appeared as a gold band around menu button)
This was SVN commit r10211.
2011-09-08 00:19:38 +00:00
550cac253d Resize stances panel to fit better and move delete command to end of list.
This was SVN commit r10199.
2011-09-07 01:54:08 +00:00
85f60c4d28 New session tooltip colors and some code cleanup.
This was SVN commit r10197.
2011-09-07 01:43:56 +00:00
7a7ebaa983 Allow ingame menu to reverse, add sounds to all menu buttons, and some organizing and cleanup
This was SVN commit r10194.
2011-09-06 18:15:27 +00:00
8b33f5cfd2 Fixes UI becoming unresponsive when ordering units to garrison.
This was SVN commit r10190.
2011-09-06 02:06:24 +00:00
cf667d335a Reorganize sound functions, play new defeat music, clean up some tab versus space issues.
This was SVN commit r10182.
2011-09-04 01:54:54 +00:00
8f26bff788 Fix menu and dev commands overlay issue. Add music to Carthage civ file.
This was SVN commit r10177.
2011-09-03 02:12:14 +00:00
5c7b1d8241 Make pause text larger
This was SVN commit r10157.
2011-09-01 02:54:05 +00:00
142bd05380 Menu: removed autohiding, doubled speed, added sound effects. GUI art: changed gold titlebar back to bronze, made progressbar consistent with titlebar. Repositioned start game button.
This was SVN commit r10155.
2011-09-01 02:36:38 +00:00
c23497f326 Placing "g_GameEnded = true;" first. (Doesn't really matter, but is more clear.)
This was SVN commit r10149.
2011-08-31 03:13:33 +00:00
7d2411e6cb Convert win / loss dialogs to new style.
This was SVN commit r10148.
2011-08-31 03:09:18 +00:00
2469fdf8c6 Convert delete dialog to new style. Fixes #937
This was SVN commit r10147.
2011-08-31 02:58:57 +00:00
9a00398e24 Converted menu hotkey and ai config to new style. Added basic sliding menus. (Need to evaluate potential performance issues here.)
This was SVN commit r10146.
2011-08-31 02:41:21 +00:00
1ff6d44f9e Fixes promoted entities dropping from control groups, based on patch from gruby. Fixes #859.
This was SVN commit r10140.
2011-08-30 22:29:03 +00:00
ded514644e Commented out most of old styles.xml and changed references to new styles, outlined tabs in summary, fixed chat color in multiplayer setup
This was SVN commit r10130.
2011-08-28 21:32:35 +00:00
4185aa348a change button height from 32 to 28
This was SVN commit r10122.
2011-08-28 03:04:32 +00:00
ad6c4b6abe removed close button from ingame menu, updated button texture
This was SVN commit r10121.
2011-08-28 02:02:38 +00:00
52b73d4445 Make ingame exit button leave the current game rather than exit the entire program
This was SVN commit r10116.
2011-08-27 23:28:12 +00:00
0e81ee4f60 Made ingame resource counters use percent-based positioning. Lined up ingame bottom panel textures better. Remove old session dialog sprites.
This was SVN commit r10115.
2011-08-27 23:17:14 +00:00
e933986351 removed session dialog, updated ingame menu
This was SVN commit r10114.
2011-08-27 22:44:08 +00:00
e909567004 Convert most dialogs over to new style
This was SVN commit r10108.
2011-08-27 18:34:54 +00:00
fc958db168 moved some buttons to second tier, updated style of history section
This was SVN commit r10103.
2011-08-27 06:20:16 +00:00
8a4443e4c7 Update styles to match mockup better
This was SVN commit r10085.
2011-08-24 04:16:37 +00:00
762aad3be5 Clean up some styles
This was SVN commit r10075.
2011-08-23 03:51:04 +00:00
dc2b2aeff4 Converted some more screens over
This was SVN commit r10072.
2011-08-23 03:27:13 +00:00
1b8471da1f Changes shore definition to distance on land (all water included) for better dock placement.
Updates build passability classes.
Fixes tile expansion in CheckBuildingPlacement (don't use FromFloat).
Changes dock rotation snapping to search outward.

This was SVN commit r10007.
2011-08-14 23:36:13 +00:00
e51849b29f Fixes incorrect distance calculation.
Improves dock foundation snapping.

This was SVN commit r9991.
2011-08-10 23:57:54 +00:00
f378e2e651 Implements building restrictions (by terrain, territory, category, and distance). See #41. Fixes #804, #287.
Implements build limits. See #687.
Implements autorotation for dock placement.
Fixes unit spawning to consider terrain passability. See #893.
Adds new passability criteria based on distance from shore.
Updates build restrictions on some templates.
Changes unit spawning search to 4 tiles away from foundation.
Changes garrison/training spawn failure to nicer UI notification.

This was SVN commit r9970.
2011-08-06 08:11:05 +00:00
b08e142193 Graphics optimisations and features from eihrul.
Add shadow filtering (PCF) option.
Fix ugly shadow saturation in old lighting mode.
Fix fancy water shader.
Fix camera matrix computation.
Support scissoring of camera frustum.
Optimise vertex skinning.
Inline various matrix functions.
Support filtering of the list of submitted models before a rendering
pass, for more precise culling.
Optimise water renderer (fixes #721, based on patch by ortalo).
Use scissoring when generating reflection/refraction textures.
Skip reflection/refraction texture generation when no water is visible.
Render alpha-blended objects differently (fixes #434).
Reduce shadow swimming effects.

This was SVN commit r9814.
2011-07-12 23:48:05 +00:00
bfef903c94 Adds hotkey for finding idle warriors (comma). See #792.
Updates finding idle units to be more flexible.
Resets finding idle units when unit is deselected.
Adds Warship class to relevant templates.

This was SVN commit r9791.
2011-07-10 02:11:51 +00:00
db9e05d83e Bump version number
This was SVN commit r9780.
2011-07-07 22:21:34 +00:00
1bc2db56ea Stops unit following when other object selected. Fixes #775
This was SVN commit r9764.
2011-07-05 21:29:11 +00:00
972ca3cd22 Increases unit selection limit to 200 (equal to max population). See #789
This was SVN commit r9745.
2011-07-02 23:04:59 +00:00
4d188452f8 Adds ownership checks to UI selections.
Adds ownership and diplomacy checks to Commands.js (fixes #880).
Adds control all units setting to Player component (network synced).
Adds helpers for diplomacy checks - use these instead of directly
accessing diplomacy array.
Fixes tests according to these changes.

This was SVN commit r9726.
2011-07-02 00:06:39 +00:00
7baab8e221 Moved stances and idle worker button to more appropriate locations
This was SVN commit r9700.
2011-06-28 01:09:55 +00:00
8bdc1b0882 Enforces max population limit, cleans up population variables in Player component. See #862
Max population defaults to 200

This was SVN commit r9659.
2011-06-25 00:47:46 +00:00
92fcb737cd Attempt minor improvements to stances code (see #865).
Don't chase units that are no longer visible, beyond where they were
last seen (fixes #595).

This was SVN commit r9657.
2011-06-24 12:35:15 +00:00
889f4698f2 Moves population bonus to new line in construction tooltip (based on patch from pejuko). Fixes #873
This was SVN commit r9645.
2011-06-22 21:11:37 +00:00
71a6775b92 Stances draft, refs #865
This was SVN commit r9631.
2011-06-17 22:13:39 +00:00
28d952404e Improve selection details debug display.
This was SVN commit r9600.
2011-06-09 16:40:29 +00:00
9906a86a2e Support double-click on unit group buttons. patch by Merolum. fixes #805.
This was SVN commit r9592.
2011-06-06 19:31:34 +00:00
1bf2598429 Fixes square maps to behave like circular maps and fit within the circle. Fixes #822
This was SVN commit r9554.
2011-05-27 03:04:59 +00:00
fd65a492d9 Add button to promote selected units, for testing
This was SVN commit r9527.
2011-05-15 21:53:24 +00:00
9837e23808 Changed release name
This was SVN commit r9474.
2011-05-07 15:23:11 +00:00
1a17fde105 Change health bar tooltip from hitpoints to health
This was SVN commit r9473.
2011-05-07 02:57:23 +00:00
f6ffe7f121 Fix triple-click's accepted inter-click timing to match double-click's
This was SVN commit r9468.
2011-05-06 22:24:03 +00:00
e7e2e03bb9 Changed tooltip to read "Experience" instead of simply "XP." This is to help spell it out better for the players who may not be familiar with our internal nomenclature.
This was SVN commit r9461.
2011-05-06 18:29:01 +00:00
6f3761a73a shrink displayed rank icons to actual resolution of 16x16
This was SVN commit r9457.
2011-05-06 02:19:36 +00:00
508f56d2dd Fixes bug in triple-click unit selection for units without a SelectionGroupName defined. In this case, triple-click will behave the same as double-click.
This was SVN commit r9444.
2011-05-05 02:06:53 +00:00
26de01cdd1 Adjusts unit selection behavior to account for ranks. Triple-click now selects units regardless of their rank.
Adds modifier hotkey to select units offscreen.
Fixes #826.

This was SVN commit r9443.
2011-05-05 01:27:49 +00:00
f423e269e2 shrunk rank icons
This was SVN commit r9442.
2011-05-05 00:19:48 +00:00
141cc51573 reference new rank icons
This was SVN commit r9441.
2011-05-05 00:10:43 +00:00
3bffcff90d update experience bar tooltip text and style
This was SVN commit r9438.
2011-05-04 22:20:49 +00:00
1ba34b973f clean up
This was SVN commit r9430.
2011-05-04 19:36:29 +00:00
dd264f46cf make music civ specific
This was SVN commit r9429.
2011-05-04 19:31:01 +00:00
1a6e75de4e updated alpha version name - fixes #816
This was SVN commit r9415.
2011-05-03 20:22:42 +00:00
7499b23991 Units promotion. Closes #697.
This was SVN commit r9391.
2011-05-02 15:03:01 +00:00
bfd6614b55 # Add support for many formation shapes, based on patch from Badmadblacksad.
See #13.

This was SVN commit r9385.
2011-05-01 20:40:53 +00:00
7ed6a164ba Idle worker button now cycles through Worker, Trade, and CitizenSoldier classes in that order (then by increasing entity ID). Fixes #209.
This was SVN commit r9349.
2011-04-29 18:09:07 +00:00
cb380a9b1c Simplify profile report code. Bump version number to make it easily distinguishable.
This was SVN commit r9347.
2011-04-29 17:32:35 +00:00
fb411d3f39 Fixes slightly broken game attributes and setup.
Includes random map size and seed in reportPerformance. Fixes #793.
Fixes loading screen to use actual map names.

This was SVN commit r9336.
2011-04-28 01:21:02 +00:00
8e20c00dd3 # Add numbered unit selection groups, based on patch from Badmadblacksad.
Fixes #773.

This was SVN commit r9322.
2011-04-26 18:19:16 +00:00
04dc0c2d3c Moved "civs" json files to Public because we are releasing a few of the other civs' units as a teaser.
Lots of unit and map tweaks. Names, stats, civs, etc.

Made the civ icons at the top of the screen 96 pixels instead of 64
pixels just to see if people like them. They are easily changed back to
64 pixels if unsatisfactory.

This was SVN commit r9296.
2011-04-22 03:51:18 +00:00
1caf223410 Max selection size now 64 units (may need further adjusting)
This was SVN commit r9283.
2011-04-18 23:31:37 +00:00
2b138f47db Handle map loading errors in autostart and normal setup modes. Adds TODOs for Atlas and Replay modes. See #764.
Fixes loading screen 'title'.
Fixes broken autostart behavior for random maps and multiplayer games.

This was SVN commit r9193.
2011-04-07 02:32:16 +00:00
6d3d93c355 # Add idle worker button, based on patch from veprbl.
Fixes #744.

This was SVN commit r9140.
2011-04-01 18:00:04 +00:00
4261983c9d Fix reveal map checkbox after winning
This was SVN commit r9040.
2011-03-06 02:29:07 +00:00
ecbe92bdda automatically reveal map when a player wins
This was SVN commit r9039.
2011-03-06 01:54:38 +00:00
d62e9de7da Fix shift-click building placement
This was SVN commit r9027.
2011-03-05 14:41:44 +00:00
637412cb5a update name for alpha 4
update default single player map for alpha 4

This was SVN commit r9020.
2011-03-05 03:53:04 +00:00
1c1564daaf Make profiler JSON output much more concise.
Right-align values in in-game profile viewer.
Add alternating row shading in profile viewer, to make it easier to
read.

This was SVN commit r9004.
2011-03-03 01:09:19 +00:00
63f958878d Fix GUI errors and glitches when placing buildings and not moving the mouse.
This was SVN commit r8977.
2011-02-24 02:12:47 +00:00
f3372bf11d Add some rough performance reporting.
Make the profiler converge a bit faster.

This was SVN commit r8939.
2011-02-19 03:14:37 +00:00
65af9307ea Change tooltips in commands panel to be bottom-aligned, so they don't obscure the button you're pointing at
This was SVN commit r8917.
2011-02-13 12:17:32 +00:00
fb738766ea Recompute building placement preview every turn, so its colour responds to changes in the environment
This was SVN commit r8909.
2011-02-11 11:17:32 +00:00
78e174af7d Fix auto-gathering after constructing fields.
Fix building on top of animal corpses.
Fix builders getting in the way of their own building.

This was SVN commit r8900.
2011-02-10 19:50:08 +00:00
b8925fbbc9 # Support AI construction of buildings.
Pass terrain passability data to AI scripts.
Expand pathfinder passability data to 16 bits per tile, to allow more
classes.
Support 16-bit ints in serializer.
Partially support JS typed arrays.
Allow foundations to be placed on top of units (fixes #499).
Stop farms and fishes blocking movement (fixes #534).
Add obstruction flags to allow finer control over what they block.
Associate entity IDs with obstruction shapes, to allow finding colliding
entities.
Support moving to the edge of a target entity with inactive obstruction.
Support foundation entities in AI.
Support playing as non-hele civs.

This was SVN commit r8899.
2011-02-10 16:06:28 +00:00
ff785853ad Expand the selection-state box so the text can all fit in.
This was SVN commit r8890.
2011-02-05 20:34:11 +00:00
dd501b2a5a # Add initial basic player AI framework.
Support direct access to serializer streams, so serializers can be
nested.
Make component script "this.template" read-only.
Stop globally-subscribed component scripts receiving messages posted to
local components, to reduce out-of-sync risks.
Move pathfinder data out of entity template directory.
Fix GuiInterface deserialization.

This was SVN commit r8865.
2011-01-12 12:29:00 +00:00
1051d10f54 Add "chat" command.
Simplify deletion of multiple entities.
Simplify some setTimeouts.

This was SVN commit r8864.
2011-01-12 12:21:41 +00:00
11b767e235 Stop unit deletion prompt text overlapping the window border
This was SVN commit r8832.
2010-12-09 22:15:23 +00:00
7a9e12613d Update release number
This was SVN commit r8830.
2010-12-09 18:46:56 +00:00
549a4fc51a Garrisoning bug fixes
This was SVN commit r8821.
2010-12-08 20:12:24 +00:00
8ddef2fee0 Add fast-forward/rewind commands, to help with testing.
This was SVN commit r8803.
2010-12-06 19:58:06 +00:00
637b471769 Fixes bug in last change to input.js. Use target HP to determine attack possibility. Thus gaia buildings and animals are attackable, but not trees/mines/etc.
This was SVN commit r8798.
2010-12-05 22:00:07 +00:00
1b9d3fc289 Fix F10 key to open session menu.
This was SVN commit r8795.
2010-12-05 16:02:15 +00:00
67f08751f9 Fixes bug where military units that can't collect resources would show an "attack" icon on hovering a resource - instead they should have a default icon
This was SVN commit r8790.
2010-12-05 06:34:57 +00:00
238925f927 Minor garrisoning related tweaks
This was SVN commit r8778.
2010-12-03 20:25:21 +00:00
c09d6dcb83 Added garrison & repair button on the unit's command panel
This was SVN commit r8756.
2010-12-01 03:01:17 +00:00
89b0f3a9d7 New session tooltip styles
This was SVN commit r8747.
2010-11-30 04:27:04 +00:00
9837f6207f New session dialog style
This was SVN commit r8719.
2010-11-28 01:39:31 +00:00
2640f4c346 Changed victory/defeat dialogs to new session dialog style
Changed title of exit game dialog
Only show resources carried when the quantity is greater than 1

This was SVN commit r8718.
2010-11-27 21:58:19 +00:00
e486467430 Changed delete dialog text again (to make for easier translating later)
This was SVN commit r8717.
2010-11-27 20:11:42 +00:00
961a50b0a2 Changed delete dialog text
This was SVN commit r8716.
2010-11-27 20:03:16 +00:00
0b0cd938d5 Made settings and menu use new dialog
Made chat and ESC hotkey interact better with the dialog
Made command icons reference individual icons rather than sheets
Removed menu object cache

This was SVN commit r8715.
2010-11-27 19:46:12 +00:00
3c318af2e0 Started work on new dialogs for session GUI style
Resized quote area in loading screen

This was SVN commit r8713.
2010-11-27 17:06:32 +00:00
78ae72d87a Message to let players know formations don't work yet
This was SVN commit r8680.
2010-11-22 00:07:38 +00:00
e1fa9cd22b Show resource subtype in GUI if main type is treasure
This was SVN commit r8673.
2010-11-20 22:36:04 +00:00
68a63d62c8 Displaying civ icons on summary screen, moving "Civ centres built" and "Enemy civ centres destroyed" to new "Conquest" tab
This was SVN commit r8671.
2010-11-20 21:42:54 +00:00
2925ab4ce4 Ghosted version labels in session GUI
This was SVN commit r8662.
2010-11-20 17:40:54 +00:00
f236fb7bd1 Fixed bug where gaia was not treated as attackable (fences could not be destroyed)
This was SVN commit r8651.
2010-11-18 23:25:42 +00:00
d65e47dda0 Properly center loaded resource text
Add attack stats to "armour" icon

This was SVN commit r8618.
2010-11-15 03:38:01 +00:00
042972e298 Renamed "session_new" to "session"
This was SVN commit r8608.
2010-11-14 20:32:38 +00:00
6e6ae573e4 Delete old session GUI files.
This was SVN commit r7558.
2010-05-20 20:17:46 +00:00
8c1a3f7c8a Protect against missing globals when loading GUI in unusual ways
This was SVN commit r7550.
2010-05-20 00:57:03 +00:00
c8c10a4871 # Extensions and cleanups to session GUI files.
Add various GUI pieces (exit button, resource counts, unit details).
Clean up implementation of button panels.
Split some content out of 'common' and into page-specific files.
Delete some obsolete content.

This was SVN commit r7337.
2010-02-28 21:45:09 +00:00
7c2e9027c2 # Rewrite of the game's simulation system
Giant merge from
http://svn.wildfiregames.com/hg-source/file/5fb522019d5e
Infrastructure is largely complete, gameplay is largely missing
Disabled by default; use command-line flag "-sim2"
(Second attempt at commit...)

This was SVN commit r7259.
2010-01-09 19:20:14 +00:00
f0d9806b3f # Restructured GUI implementation
CGUI now represents a single 'page'. CGUIManager maintains multiple
pages and switches between them.
Split the XML files into pregame, loading, session and messagebox pages.
Added hotloading of GUI pages.
Minor GUI cleanups.
(Merge from hg 81862d33780c)

This was SVN commit r7214.
2009-12-03 20:17:22 +00:00