1
0
forked from 0ad/0ad
Commit Graph

70 Commits

Author SHA1 Message Date
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
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
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
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
fcedcae052 # Add victory/defeat conditions, based on patch from fcxSanya.
Fixes #565.

This was SVN commit r8234.
2010-10-01 20:51:21 +00:00
b2278e56a6 Fixed menu graphics
Misc consistency improvements
Added pause hotkey

This was SVN commit r8204.
2010-09-28 17:40:41 +00:00
93e81319e8 Added civ icon
Fixed Settings Dialog graphics

This was SVN commit r8202.
2010-09-28 14:58:14 +00:00
ea7c2e569c Michael's new GUI layout
(I made some changes to some parts which can always be changed back.
It's still a work in progress.)

This was SVN commit r8200.
2010-09-28 14:19:13 +00:00
fae4a3da24 Fix #548 (GUI should give feedback when training queue entry is blocked), based on patch from fcxSanya
This was SVN commit r8071.
2010-09-04 13:24:52 +00:00
90e4672c8d Removed unnecessary null assignment
This was SVN commit r8051.
2010-08-30 14:43:26 +00:00
0a98fbaba2 Cache the Entity States and Templates to increase performance
This was SVN commit r8037.
2010-08-28 21:12:52 +00:00
5ee7f7b178 Reworked selection details and rank code
Added rank tag to templates to avoid string parsing

This was SVN commit r7995.
2010-08-17 13:37:46 +00:00
8967395da6 Made chat messages send a GUID rather than a user name
This was SVN commit r7943.
2010-08-14 15:34:36 +00:00
50bccd8720 Made notifications visible only to the relevant player
This was SVN commit r7942.
2010-08-14 04:34:49 +00:00
5a42689d5e Fix typo
This was SVN commit r7940.
2010-08-13 22:06:19 +00:00
9a1e450031 Added a basic notification system
Currently, it only reports insufficient resource notifications

This was SVN commit r7939.
2010-08-13 22:02:27 +00:00
c8f90ce5a2 Refined chat and added chat messages to the console
Cleaned up session menu code (cached menu objects)

This was SVN commit r7935.
2010-08-13 16:05:06 +00:00
859c696afe Show when a player leaves multiplayer
This was SVN commit r7924.
2010-08-12 19:31:17 +00:00
d41d554678 Reworked session code splitting some things out to different files
This was SVN commit r7921.
2010-08-12 15:44:03 +00:00
d5bd374586 This should finish up multiplayer chat (#216)
Made chat window look a little better
Fixed issue with autostart

This was SVN commit r7914.
2010-08-12 03:01:33 +00:00
4cfca1625d Added Multi-player chat in menu and hotkey (return key)
Made player names match custom names in multi-player

The chat window will still need some more aesthetic work

This was SVN commit r7909.
2010-08-11 22:16:16 +00:00
54d9224918 Add focus() script method to GUI objects.
Add basic GUI script timer.

This was SVN commit r7908.
2010-08-11 21:04:09 +00:00
4f2d9ee128 Fixed bandboxed entity preference code from relying on parsing template names
New rules for preferences:
 units
 defensive
 others

This was SVN commit r7857.
2010-08-06 00:29:58 +00:00
07615310f2 # Add rally points for newly-trained units, based on patch from evans.
Fixes #521.

This was SVN commit r7849.
2010-08-05 10:20:47 +00:00
a5171d9145 Just display the delete button until the other commands are implemented
This was SVN commit r7843.
2010-08-03 01:54:16 +00:00
76e6b6dbe3 Made bandboxed selections more intelligent by preferring entities in this order:
1) units and animals
2) towers
3) buildings that are the same type as the first building
4) non-building entities

This was SVN commit r7840.
2010-08-01 21:50:03 +00:00
67e3a95d74 Added Delete Hotkey
Misc minor changes

This was SVN commit r7835.
2010-08-01 16:25:24 +00:00
dd2fcad2a2 Fixed fractional resources showing up in the GUI
This was SVN commit r7831.
2010-08-01 00:33:20 +00:00
be59106400 Cleaned up code (slight redesign)
Added more wood to trees
 Standard trees 100 -> 300
 Special trees 300 -> 500

This was SVN commit r7829.
2010-07-31 21:46:25 +00:00
ba591b6d9f Redesigned the selection GUI
No more groups of any kind
Max selection size increased to 32

Single click - deselects all others
Single click with shift key - deselects all that are not the same type
(only for one rank)

This was SVN commit r7826.
2010-07-30 22:19:43 +00:00
0be1713b2b Made several changes to session GUI (cosmetic).
Up/down arrow sprites are usable as regular buttons now.

Selections now group ranked units together as a single group. This
feature can be toggled in the settings window. Depending on feedback, I
will probably choose one method over the other and remove the toggle.

New map - Mountain Pass (8 player)
It will need further polishing.

This was SVN commit r7766.
2010-07-19 21:23:12 +00:00
ae823038bd Added <IconSheet></IconSheet> attribute to entities
Added icon_sheet attribute to GUI interface
Made session GUI reference template.icon_sheet

This was SVN commit r7761.
2010-07-16 02:45:22 +00:00
db8dda7bda Used Hele portrait sheet for units that begin with "camp"
Made button layout ever so slightly more efficient
Fixed some more Hellene animation speeds

This was SVN commit r7713.
2010-07-07 13:28:37 +00:00
5d5cb02b21 Disable visible logging of network messages
This was SVN commit r7708.
2010-07-06 20:31:05 +00:00
5be1052ad0 Fixed a GUI selection display bug where the final element of a large selection was wrapping around and replacing the first selection group.
Added and removed some utility functions in session.js

This was SVN commit r7701.
2010-07-05 23:04:38 +00:00
5d224bbeb6 Added tooltip to rank icon
Some code cleanup / rework
Minor fixes

This was SVN commit r7696.
2010-07-05 16:50:06 +00:00
3af3cbe99a Fixed the GUI selection issue where killed units were not being removed from the selection or the selection display
This was SVN commit r7683.
2010-07-04 01:03:14 +00:00
e23d4d232a Added rank icon
Removed displayed rank name (functions still available)
Fixed error with color name

This was SVN commit r7675.
2010-07-03 15:06:31 +00:00
be2e1b158a Made player colors work for player names
Used civ name for the player name's tooltip
Created some additional utility functions

(finishing previous commit that was interrupted due to
some files being out of date)

This was SVN commit r7665.
2010-07-02 21:42:17 +00:00
051aa70940 Basic disconnection handling.
Pre-game chat.
Fix dynamic updates of focused input controls.
Allow scrollable texts to automatically scroll to the bottom.
Force usernames to be unique.

This was SVN commit r7664.
2010-07-02 21:28:48 +00:00
98a7d67b43 Player name now references actual player name (almost)
Added civ name to tooltip of player name
Player colors hacked in (to at least look consistent)
Made icons reference proper portrait sheets

This was SVN commit r7662.
2010-07-02 02:50:45 +00:00
8f48d0f007 Moved menu code out into:
menu.js

Moved selection details and unit commands code out into:
selection_details.js
unit_commands.js

Deleted some unused sprites

This was SVN commit r7659.
2010-07-01 20:31:47 +00:00
6d625fdc55 Added resource quantities to GUI for resource entities
Some code cleanup

This was SVN commit r7657.
2010-07-01 20:06:23 +00:00
1c0536bf08 # Refactored the networking code, and redesigned the game setup screen.
Major updates to most network classes.
Simplify CNetServer so it doesn't duplicate any client behaviour; all
players now run CNetClient.
Remove most player/slot management from networking code.
Wait for all players to finish loading before starting the simulation.
Remove CGameAttributes; attributes are now just a JS object.
Remove CPlayer; they are now just simulation entities.
Handle player colours via simulation system.
Add a default map for Atlas, so it always has something to load.
Move network documentation to Doxygen.
Remove lots of now-unused code.

This was SVN commit r7653.
2010-06-30 21:41:04 +00:00
303a3ff437 Fix line endings
This was SVN commit r7652.
2010-06-30 21:34:44 +00:00
1f7bb6c1fc Applied new theme (thinWheatWindow)
Added bronze rectangles behind resources
Made queue panel resize if needed

This was SVN commit r7646.
2010-06-29 15:54:53 +00:00
f21f8485e8 Added MAX_SELECTION_SIZE (24) to bandboxed selections
Cleaned up button layout code

This was SVN commit r7644.
2010-06-28 12:30:59 +00:00
21b1f1c965 Cut off panel on right side at 1024 for wide resolutions
Larger selection icons (Max of 16 now instead of 18)

This was SVN commit r7643.
2010-06-28 00:31:24 +00:00
e15f6120b1 Fixed minimap (z-value was making it unclickable)
Made stamina bar visible for player owned units only

This was SVN commit r7642.
2010-06-27 21:45:07 +00:00