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
aa2d305b6e
Added working delete button
...
This was SVN commit r7832.
2010-08-01 05:09:30 +00:00
9674c3c0fe
Remove ScriptingHost initialisation code (share with ScriptInterface instead).
...
Fix GUI scripts to avoid strict warnings.
Rejig GUI/SpiderMonkey interface to use less custom code, and to work
with JSOPTION_VAROBJFIX.
Add event name to GUI event handler function names (visible in the
profiler).
This was SVN commit r7769.
2010-07-19 23:01:58 +00:00
544afca570
Delete some old unused GUI scripts
...
This was SVN commit r7767.
2010-07-19 22:55:30 +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
7a58980ad6
Remove unneeded genericity
...
This was SVN commit r7712.
2010-07-07 10:47:20 +00:00
6bd38c1e5d
Report errors when hosting/joining fails
...
This was SVN commit r7709.
2010-07-06 20:51:45 +00:00
31699e830d
Handle disconnections better.
...
Remove local sessions (just use ENet for everything instead) because
they add far too much complexity.
Fix memory leaks.
This was SVN commit r7706.
2010-07-06 19:54:17 +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
26bdae945b
New style: thinWheatWindow
...
(same as wheatWindow, but thinner borders)
This was SVN commit r7645.
2010-06-29 15:51:11 +00:00
a947ab5582
Fixed alignment issue with the left and right sides of the right marble border in the wheatWindowSand sprite
...
This was SVN commit r7639.
2010-06-27 18:40:44 +00:00
2c160e5bd8
Delete script scheduler, since it causes GC crashes and isn't used for anything important and could be implemented in pure JS instead.
...
This was SVN commit r7622.
2010-06-07 18:41:03 +00:00
7dca91f26b
# Various changes to the text rendering system.
...
Rewrite font builder tool to be much simpler and to support more text
effects.
Change GUI to use new set of fonts.
Switch font textures from TGA to PNG so they're easier for the font
builder to create.
Support RGBA font textures (for e.g. stroked text).
Greatly improve text rendering performance by using vertex arrays.
Fix rendering code leaving vertex buffers bound.
Add 'clip' property to GUI text objects, to disable clipping when
rendering.
Delete part of unused console function registration system.
This was SVN commit r7595.
2010-05-30 13:42:56 +00:00
6e6ae573e4
Delete old session GUI files.
...
This was SVN commit r7558.
2010-05-20 20:17:46 +00:00
08db7ebe13
# Support training units in buildings.
...
Includes basic batch training (see #298 ).
This was SVN commit r7469.
2010-04-19 19:47:23 +00:00
abaea508ac
# Fix startup warning in scenario editor
...
This was SVN commit r7461.
2010-04-17 11:29:34 +00:00
90d5ba7552
Remove the useless profile option on the menu. Disable the currently-non-working multiplayer and history buttons.
...
This was SVN commit r7415.
2010-03-30 21:15:15 +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
06b0ea0a26
Fix breakage from accidental removal of global variable
...
This was SVN commit r7314.
2010-02-07 20:16:17 +00:00
b25076ed4d
Min/max range support in pathfinder
...
This was SVN commit r7311.
2010-02-06 20:58:48 +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