1
0
forked from 0ad/0ad
Commit Graph

71 Commits

Author SHA1 Message Date
6399ec0cd2 # Partial support for saved games with AI.
Support cancelling loads while inside a loader callback.
Fix use of ArchiveReader/Writer since their API changed.
Improve error-detection in deserializer to avoid crashes.
Report deserializer errors to users.
Expand load-error message box to fit message about invalid saved games.

This was SVN commit r10787.
2011-12-22 14:04:32 +00:00
d9820fb0cb Add optional time elapsed counter to session screen.
This was SVN commit r10402.
2011-10-13 23:20:34 +00:00
b1d98cff04 Fixes in-game music playing (assume filename always contains ogg extension). Fixes #956.
This was SVN commit r10285.
2011-09-15 05:19:36 +00:00
aba6a7f118 Reorder dialog buttons for consistency
This was SVN commit r10279.
2011-09-14 00:43:19 +00:00
d4ffe7c887 Adds Alpha number and name to main menu. Fixes #955.
Inverts (i)nfo button sprites.
Shrinks tooltip box so it doesn't obstruct the background.

This was SVN commit r10278.
2011-09-13 23:58:16 +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
db137737ba Because we don't randomly change to new tracks and some of the existing ambient ones are too annoying if played constantly, we'll just set a default for now.
This was SVN commit r10239.
2011-09-10 01:49:30 +00:00
10b94a6741 Until we deal with networked mode, return to main menu after match. Removed some console.write statements.
This was SVN commit r10220.
2011-09-08 04:18:12 +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
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
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
dfcabe4db3 Adjust main menu background scrolling speed and make submenu use random sounds when opening.
This was SVN commit r10179.
2011-09-03 03:18:40 +00:00
ec6b9dfc28 Fixes broken color to string conversion in UI. Fixes #939.
This was SVN commit r10164.
2011-09-02 00:24:30 +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
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
6146d948ad hide yellow border between main menu and submenu
This was SVN commit r10119.
2011-08-28 01:28:50 +00:00
abda9576b1 Updated panel style and made main menu "x" exit game without confirmation
This was SVN commit r10111.
2011-08-27 19:23:32 +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
bf5e94c6e4 Adjusted main menu panel background
This was SVN commit r10086.
2011-08-24 04:35:53 +00:00
8a4443e4c7 Update styles to match mockup better
This was SVN commit r10085.
2011-08-24 04:16:37 +00:00
976529d280 Fix size issue with main menu panel shading
This was SVN commit r10076.
2011-08-23 04:01:05 +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
605e9f97bf Update chat dialog and some labels in game setup to new style
This was SVN commit r10068.
2011-08-22 23:56:42 +00:00
0cd825e552 Converted parts of the game setup dialog and some general GUI elements over to new styles. There are duplicate sprites / textures that will need to be removed later when all references to them are changed.
This was SVN commit r10067.
2011-08-22 23:42:16 +00:00
d9c65c82cf More work on main menu, and added new button style
This was SVN commit r10061.
2011-08-22 17:36:53 +00:00
4a3230a870 This was SVN commit r9610. 2011-06-09 23:52:29 +00:00
942a45372c Random maps generated in their own thread, loading GUI is updated with progress.
Fixes some bugs in game loader error handling.

This was SVN commit r9220.
2011-04-10 05:31:18 +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
e47e916853 This was SVN commit r9067. 2011-03-17 01:31:56 +00:00
0378500bdc Fix #712 (remove S3TC warning).
Add timer to S3TC decoder so it's still easy to determine if it was
used.

This was SVN commit r8981.
2011-02-25 01:28:46 +00:00
6a20743dc3 Add new Keywords tag to maps. Add map list filtering API to game setup. Add some default filters that use map keywords. Cleaned up client game setup a bit. Removed deprecated GUI utility functions.
This was SVN commit r8800.
2010-12-06 02:51:21 +00:00
89b0f3a9d7 New session tooltip styles
This was SVN commit r8747.
2010-11-30 04:27:04 +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
24fb9cd313 Split unit icon sheets into individual textures, for easier editing
This was SVN commit r8440.
2010-10-22 23:27:42 +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
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
c8eaee35cc Add initial texture conversion settings.
Replace button texture with higher-quality PNG.

This was SVN commit r8102.
2010-09-10 21:05:13 +00:00
086d522050 Made structures reference new buildings icon sheet
This was SVN commit r8068.
2010-09-04 01:41:10 +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