Commit Graph

417 Commits

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