1
0
forked from 0ad/0ad
Commit Graph

235 Commits

Author SHA1 Message Date
0517d41275 Removed extraneous cancel button from multiplayer setup dialogs
Adjusted the right side of the bottom panel in the session GUI
Renamed "dev console" to "dev overlay" in the chat message to be more
consistent

This was SVN commit r8557.
2010-11-08 14:49:40 +00:00
e43eb0c18b # Various hotkey fixes and cleanups.
Support ctrl for removing entities from selection.
Move big screenshot hotkey to shift+F2.
Increase mouse wheel rotation speed.
Fix HotkeyIsPressed when a more specific hotkey was matched instead.
Support multiple hotkeys with the same binding.
Use hotkeys instead of raw key events in GUI.
Delete some obsolete hotkey definitions.
Remove unused broken EntitySelection toggle method.

This was SVN commit r8546.
2010-11-07 20:42:52 +00:00
644b9aedea # Add double-click and triple-click selection modes, based on patch by Christoph and evans.
Fixes #515.

This was SVN commit r8544.
2010-11-07 00:12:55 +00:00
741477926c Make the minimap fit completely inside the border when in circular mode (to prevent units from sneaking around behind the rim)
This was SVN commit r8539.
2010-11-06 02:13:40 +00:00
e7b5f9eeb9 Allow up to 24 construction or training buttons
Add tooltip of generic name back to the unit name
Move civ name to player name tooltip
Make player name colored with the player color again

This was SVN commit r8538.
2010-11-06 01:55:29 +00:00
dbcd004844 Fix player assignments on map change (number of players may decrease, knocking assigned players out of a slot). Fixes #655
This was SVN commit r8534.
2010-11-04 20:34:29 +00:00
81f5e0ac5f Allow continuing playing when a client leaves a multiplayer game (fixes #620).
Fix multiplayer autostart.
Make NETTURN_LOG syntax differently ugly.

This was SVN commit r8525.
2010-11-03 00:21:52 +00:00
5d764f1435 Run network server in a separate thread, to minimise latency.
Make some parts of logger and console thread-safe.
Simplify console: remove special commands; remove prefix for script
commands.
Remove LOG_ONCE, to simplify logger.
Change some code to use the new logger interface.
Fix OOS when revealing map.
Clean up some formatting.

This was SVN commit r8511.
2010-10-31 22:00:28 +00:00
a952767f48 Changed the disabled state messages for some menu buttons, they were a bit rough for a public release imho
This was SVN commit r8503.
2010-10-31 00:16:33 +00:00
1840bb3507 Stop units walking outside the edges of circular maps.
Switch the GUI between square/circular minimap automatically.

This was SVN commit r8500.
2010-10-30 18:25:34 +00:00
10c5dbcba4 Fix Atlas and autostart.
Fix non-POD in varargs.
Remove misleading max_players config variable (the engine doesn't care
about it, all the limits are hard-coded).
Remove civ-center-based player civ initialisation hack.
Add dummy player_defaults.json.
Clean up formatting a bit.

This was SVN commit r8498.
2010-10-30 13:27:23 +00:00
d6bf303740 Clean up line endings
This was SVN commit r8497.
2010-10-30 12:22:18 +00:00
5567727bd1 New maps get player data per #590, and some minor bugfixes
This was SVN commit r8496.
2010-10-30 05:19:55 +00:00
9ee44bd9b8 Game setup changes, including showing name, civ, team, and some options loaded from the scenarios. Civ data added. Civ info window to preview civs. Icon tooltips. Support for random map implementation. Fixes #590.
This was SVN commit r8494.
2010-10-30 04:02:42 +00:00
02aa8499ed Partial experimental version of circular maps
This was SVN commit r8470.
2010-10-25 21:59:52 +00:00
6373c2cfcb Made GUI always visible
Adjusted size of icon buttons in the session GUI
Allowed support units to garrison in watch towers

This was SVN commit r8458.
2010-10-24 23:40:09 +00:00
b100ba5a08 Show a 1 when only a single unit remains garrisoned (re-fixes #610)
This was SVN commit r8457.
2010-10-24 18:01:11 +00:00
ec27e78e60 Clear out the displayed garrison quantity number if no units are garrisoned
This was SVN commit r8454.
2010-10-24 01:32:35 +00:00
3521c8f51e Made garrisoning based on the quantity of units, not the population cost of those units.
This was SVN commit r8453.
2010-10-24 01:14:34 +00:00
0aaddf62aa Garrisoning for buildings based on patch by Evans (fixes #610)
This was SVN commit r8451.
2010-10-23 22:43:15 +00:00
24fb9cd313 Split unit icon sheets into individual textures, for easier editing
This was SVN commit r8440.
2010-10-22 23:27:42 +00:00
add040f7e1 Hide city phase indicator
This was SVN commit r8409.
2010-10-17 20:13:02 +00:00
937769035a Only show formation icons for units
This was SVN commit r8407.
2010-10-17 20:01:18 +00:00
43f2be44ba label
This was SVN commit r8405.
2010-10-17 18:57:51 +00:00
eca237647e Play victory/defeat music at appropriate times.
Stop ambient sounds when returning to main menu.

This was SVN commit r8404.
2010-10-17 18:30:36 +00:00
7b7e98ea7b Delete obsolete version of GUI files
This was SVN commit r8403.
2010-10-17 18:28:53 +00:00
c2918cdf32 Fixes health bar not showing when multiple units that have health are selected
This was SVN commit r8395.
2010-10-17 02:34:07 +00:00
b5313de1c7 Fixed infinitely tall health bar when selecting multiple trees, rocks, or other things without health
This was SVN commit r8394.
2010-10-17 02:26:20 +00:00
f4df65d7f1 Change default maps to newer ones
This was SVN commit r8378.
2010-10-16 20:49:29 +00:00
468816aaea Show chat message when the developer console is opened or closed. (For SHIFT-D hotkey)
This was SVN commit r8377.
2010-10-16 19:57:26 +00:00
86cb0db407 Fix chat input not getting cleared when ESC is pressed
Allow chat messages to be sent internally (bypass chat input box)
Show chat message when the developer console is opened or closed.
(moved dev console back to the right side)

This was SVN commit r8376.
2010-10-16 19:49:48 +00:00
eec07b3f85 Fix missing main menu music when S3TC warning is displayed, by removing archive builder from GUI startup.
This was SVN commit r8368.
2010-10-15 14:10:36 +00:00
835609df20 Change S3TC warning yet again, to point to a web page with more information. Also stop hard-coding the message.
This was SVN commit r8367.
2010-10-15 12:29:20 +00:00
3fce7d86f3 Temporarily re-enable fake formations in GUI
This was SVN commit r8350.
2010-10-13 21:40:56 +00:00
0c61f34db1 Reference group count by name instead of templateName
This was SVN commit r8347.
2010-10-13 20:16:03 +00:00
bd3ffd2c6a Reworked EntityGroups
Moved selection size check into selection.js

This was SVN commit r8346.
2010-10-13 19:48:13 +00:00
9909675b68 Made EntityGroups more efficient
"Ability to add units to or remove from an already selected group of
units" based on patch by k776 (modified to avoid going over the max
selection size)
(Fixes #602)

This was SVN commit r8332.
2010-10-11 17:24:06 +00:00
1cdc8d1726 Warn about some obsolete documentation
This was SVN commit r8331.
2010-10-11 17:03:58 +00:00
184779e00e # Add "[", "]" keys to rotate buildings during placement, based on patch from k776.
Fixes #588.

This was SVN commit r8314.
2010-10-09 13:53:17 +00:00
5eedb07297 Fix selection of loading screen textures with pre-converted texture cache
This was SVN commit r8305.
2010-10-07 19:56:13 +00:00
69b2581ff0 Preparation for garrison code
This was SVN commit r8295.
2010-10-06 18:55:46 +00:00
1784c67c8b Changed background icon for total unit count
This was SVN commit r8294.
2010-10-06 05:25:30 +00:00
ca223eeb5b Made multiple unit selection health bar vertical again
Increased unit selection icons to 16
Added total unit count

This was SVN commit r8292.
2010-10-06 04:19:25 +00:00
ff8477c339 Made unit selection icons the same size as the formation icons
This was SVN commit r8291.
2010-10-05 22:44:32 +00:00
9872cb17b8 Deselect units that disappear into fog-of-war.
Fixes #596.

This was SVN commit r8278.
2010-10-05 00:08:05 +00:00
eff766d6b9 Made ESC close out open dialogs rather than offer to close the game
Fixed the multiple unit health bar failing to work correctly
Changed multiple selection area to fit layout better.
Organized code

This was SVN commit r8256.
2010-10-03 22:42:15 +00:00
59c8ecfa3d Use voices for infantry/cavalry units.
Make arrows quieter.
Handle order-related sounds via the GUI instead of simulation, to make
them player-specific and to reduce latency.

This was SVN commit r8254.
2010-10-03 17:58:49 +00:00
aa32677784 Restore highlighting of units on hover.
Optimise overlay code a bit.

This was SVN commit r8253.
2010-10-03 16:48:52 +00:00
9a0db9713e Add resource supply status bars.
Change bar size for buildings.
Only highlight one entity on mouse hover, and only if it's not a unit.
Display status bars on foundations.

This was SVN commit r8249.
2010-10-03 00:30:43 +00:00
21a07af553 Messed with the GUI backgrounds to make them fit better. Starting a new Arcadia III map.
This was SVN commit r8247.
2010-10-02 23:46:09 +00:00