MarkT
db168702df
Jason's animation events. Also reworked entity-types system.
...
This was SVN commit r2209.
2005-05-01 19:09:13 +00:00
Fire Giant
4b234213cf
Continued to work on the MP session creation GUI. Made some progress, but it doesn't work yet. Commiting to keep the repository in sync.
...
This was SVN commit r2167.
2005-04-24 01:47:39 +00:00
6e97651c04
Unit training now costs ya (currently a consistent amount of Food/Wood/Stone for every entity, since I'm feeling lazy).
...
Also check out Mark's funky cursor support for gathering tasks (guess
we'll need cursors for the food gathering methods
(fruit/meat/milk/fish/grain), at some point, though).
This was SVN commit r2161.
2005-04-29 13:30:08 +00:00
MarkT
bcabe3aa53
Script integration work - valueOf() is no longer required most of the time; also property-change watches and enumeration over entities (but not yet other native objects), rudimentary beginnings of a global events system, and adjusted the status orb to update only on changes.
...
This was SVN commit r2157.
2005-04-22 07:12:55 +00:00
3d59ecab85
Train lists now support a basic progress bar and unit counters. Still to come ... Removing entries from the queue by right-clicking buttons, prerequisites and resource costs.
...
This was SVN commit r2147.
2005-04-19 02:06:18 +00:00
a3cb8a322c
Little more experimenting with unit training.
...
This was SVN commit r2140.
2005-04-16 05:45:28 +00:00
d78afc9628
Update to create pine tree and rock entities to match Jason's revised actors.
...
This was SVN commit r2139.
2005-04-29 13:27:16 +00:00
MarkT
2120576bc7
Gathering and unit training (engine-side); also other minor improvements
...
This was SVN commit r2132.
2005-04-15 04:23:33 +00:00
86cb09ed27
detabify, add rationale for setting loading_screen_progress_bar
...
This was SVN commit r2125.
2005-04-11 20:47:58 +00:00
a91f2d2079
Fixed command button alignment (functionality still pending). Minor improvement to tip text in loading screen.
...
This was SVN commit r2120.
2005-04-09 16:07:46 +00:00
d983be8fdc
Updated command buttons. Still need to adjust alignment of buttons past a certain width so they occupy a column to the right of the Status Pane, and create functionality for clicking other than toggling tabs.
...
This was SVN commit r2119.
2005-04-09 07:46:22 +00:00
528b2bc9e7
Setup all the sample players in SP games [bug #52 ]
...
This was SVN commit r2100.
2005-03-31 05:15:32 +00:00
0eb78450c0
Maybe fixed GUI event-handler function things. Other minor changes and fixes.
...
This was SVN commit r2096.
2005-03-30 22:33:10 +00:00
8d6ebe1b1f
Made a start on making the team tray and group pane buttons functional. Removed the silly text from the loading screen now that we do indeed have a functioning progress bar. Refined structure for resource pool functions. Fixed up little things here and there.
...
This was SVN commit r2082.
2005-03-30 02:01:22 +00:00
d60fc60a69
Replacement entities for the remaining houses other than Romans (to allow variations), and switching of resource pool to localPlayer, which should hopefully now mean player resources are maintained across a hosted game (haven't tested it yet).
...
This was SVN commit r2074.
2005-03-29 03:59:01 +00:00
6d792365aa
rough but functional loading progress bar support.
...
numerous TODOs remaining - initial update instead of only after
completing first job; fix GUI overdraw issue; decrease granularity
(currently only 3 updates)
This was SVN commit r2033.
2005-03-22 02:17:55 +00:00
Fire Giant
b987de64a7
Fixed bug that made it impossible to start a game (music problem stopped the session load working).
...
This was SVN commit r2005.
2005-03-18 10:39:52 +00:00
Fire Giant
246e319b1c
First drafts of new MP GUI, commiting to stay in sync with the repository
...
This was SVN commit r2003.
2005-03-17 19:30:37 +00:00
Fire Giant
5a32947586
Added code for testing concept images on the loading screen.
...
This was SVN commit r1998.
2005-03-16 14:55:16 +00:00
0d6035ea68
Committing revised "game session" GUI coordinates (sorry, doesn't make much cosmetic difference, but it's an improvement on the code side). The command buttons and build lists still need to be revised (hence they're upside down -- the coordinate system has flipped), so please note that's a known problem.
...
This was SVN commit r1966.
2005-03-07 18:25:13 +00:00
ed3c740fa8
Doesn't look like I'll be able to finish off the session coordinate adjustment this weekend, so committing one more shared file so it doesn't conflict with someone else's work.
...
This was SVN commit r1933.
2005-02-25 17:25:42 +00:00
71701ba244
Not finished with session yet, so committing just the shared bits I've modified (ie anything without *session*.* in the title) so that Malte can do his network GUI now that Simon's committed his changes. *nudge* *nudge*
...
This was SVN commit r1932.
2005-02-23 21:13:36 +00:00
ce27068bac
Fixed some Atlas coordinates to fit in with improved input box, and some optimisations.
...
This was SVN commit r1914.
2005-02-08 19:11:02 +00:00
Gee
c710b84b88
Alright, I've taken all the input controls in the atlas, and removed their sprite parameter and their hidden parameter, and changed their style to "atlas_input". This is the beauty of styles and it should be utilized. A standard control should only need size/name/style (let's call it, Gee's trinity :P). Anyway, I've also adjusted the size of the input control's sprite, I have explained why in the file. Finally, hidden="false" was removed (on all input controls, but it can be removed for the others too) because it's implicit, it'll always be the standard value, so it can be omitted whenever not 'true', trust me, it'll be much neater code.
...
This was SVN commit r1910.
2005-02-05 18:38:54 +00:00
Gee
6af0d7cfd3
This was SVN commit r1903.
2005-02-05 07:24:09 +00:00
Fire Giant
4ddc8b1c1d
Changed the startGame() command on the server side and added some chatting stuff.
...
This was SVN commit r1898.
2005-02-03 18:20:14 +00:00
9695f7245b
Quick change of Roman fortress name.
...
This was SVN commit r1887.
2005-01-31 18:58:15 +00:00
Fire Giant
3760b15b51
Updated the MP screen, connecting and chatting now work. Starting a game doesn't work, due to startGame() somehow being non-functional in MP mode.
...
This was SVN commit r1876.
2005-01-30 14:40:25 +00:00
d92996027a
Fixed Atlas tooltips that weren't working before.
...
This was SVN commit r1871.
2005-01-29 23:52:22 +00:00
2722cc6640
Fixed the Atlas coords so it all works. It's not finding the tooltip object (which must be a script bug, since other pages have working tooltips), but here's what I've got so far.
...
This was SVN commit r1859.
2005-01-29 16:11:55 +00:00
Fire Giant
bafdbe7f98
Finally fixed the nasty misplaced main menu buttons.
...
This was SVN commit r1856.
2005-01-28 23:01:25 +00:00
c056d9a545
This was SVN commit r1835.
2005-01-27 11:41:05 +00:00
59227899dc
Initial work on GUI coordinate revision (implemented for Manual and Editor, anyway), though Editor currently has a strange infinite loop on startup I'm too tired to squash right now. Broke Editor script so game'll work in the meantime; will fix ASAP.
...
This was SVN commit r1834.
2005-01-27 11:33:27 +00:00
NoMonkey
d7b3d6b0c7
Added a new material, "player_trans.xml" which will give a model player color. So now if you want a player to be colored, just add this material!
...
This was SVN commit r1830.
2005-01-27 02:52:26 +00:00
dd7f2c53cf
Revised online manual. Added placeholder rollovers to all units. Improved coordinate system.
...
This was SVN commit r1819.
2005-01-25 22:43:07 +00:00
2c4b86e9ab
Set default number of players for SP games to the max (9 including Gaia).
...
This was SVN commit r1764.
2005-01-23 12:37:46 +00:00
ebfa5f8d24
Changed resources over to a player object and did some reorganisation of the session start/end code.
...
This was SVN commit r1763.
2005-01-23 11:50:51 +00:00
c1ff5de88b
Updated with new network JS Interfaces
...
This was SVN commit r1747.
2005-01-19 22:34:29 +00:00
e62258e47e
Reorganised GUI scripts a bit.
...
This was SVN commit r1743.
2005-01-18 19:29:03 +00:00
1eb9a7872b
Integrated Player attributes with the status pane and manual, and created a really rough test map with different player civs.
...
This was SVN commit r1742.
2005-01-18 18:09:37 +00:00
986d62a2f5
Did first half of Object Editor. Added the Beautify buttons I missed yesterday.
...
This was SVN commit r1725.
2005-01-16 13:12:28 +00:00
c84ea97601
Implemented first draft of Terrain Editor controls. Increased size of toolbar arrows on Philip's behalf. :)
...
This was SVN commit r1723.
2005-01-15 22:49:34 +00:00
551bef482a
Prevented crash when loading non-existent maps
...
This was SVN commit r1721.
2005-01-15 17:20:51 +00:00
4c3dea8a14
Just to prove I'm not dead (yet), made a little more progress on the cliff and water controls.
...
This was SVN commit r1720.
2005-01-14 23:24:36 +00:00
cb63a8c901
A little of water and cliff painting controls.
...
This was SVN commit r1713.
2005-01-11 23:18:15 +00:00
963c56e796
Finished first draft of Edit Elevation controls.
...
This was SVN commit r1703.
2005-01-10 22:39:53 +00:00
fd80bc2864
Made it so you could click the 0 A.D. logo in the corner in the Editor to return to the Main Menu, as requested by Jason.
...
This was SVN commit r1692.
2005-01-09 21:53:01 +00:00
949801ad85
A little more Editor; stopping for lunch.
...
This was SVN commit r1691.
2005-01-09 15:39:51 +00:00
33051d0421
A little more progress on Editor, and some fixes to yesterday's commit (hopefully this won't affect Malte's work).
...
This was SVN commit r1688.
2005-01-09 13:24:02 +00:00
c7d2f13802
Removed some files that weren't required.
...
This was SVN commit r1678.
2005-01-09 00:46:53 +00:00
Aeros
a596d87dab
This was SVN commit r1675.
2005-01-09 00:04:14 +00:00
fc4a8c3206
A little more work on the Map Creator GUI of the Editor, which is slightly broken and I'll continue with it after Malte's done his update.
...
This was SVN commit r1673.
2005-01-08 18:25:09 +00:00
eb94902fe5
Achieved absolutely nothing 16:30-22:00 trying to fix GUI bugs. Committing nothing, just for the hell of it.
...
This was SVN commit r1638.
2005-01-04 22:12:56 +00:00
1890bae0d2
Created placeholder entities for all civ's units and buildings (other than the last two ranks). There's also a problem with the text on their portraits not appearing (just a plain coloured background), but apparently the existing revision has the same bug, so I guess there's no harm in committing this first before continuing to try to fix it.
...
This was SVN commit r1626.
2005-01-03 23:27:36 +00:00
bb8022e8c7
Fixed some bits related to Jason's new units, and added a placeholder map for entity development.
...
This was SVN commit r1622.
2005-01-03 13:11:53 +00:00
bdc0073b16
Added product/company watermark to aid in taking official screenshots. Press W to toggle it.
...
This was SVN commit r1613.
2005-01-02 19:25:22 +00:00
a8b7c8c0cf
A little more GUI stuff.
...
This was SVN commit r1610.
2005-01-01 19:20:42 +00:00
daebe3fec1
Editor menu bar (though no actual menu yet :p)
...
This was SVN commit r1607.
2005-01-01 16:53:14 +00:00
8e071ef602
Revised coordinate system for Editor, after advice from Philip. Much more flexible, less lines of code.
...
This was SVN commit r1606.
2005-01-01 15:30:56 +00:00
f9c51d8ec7
Replaced - with _ in GUI
...
This was SVN commit r1604.
2005-01-01 12:06:17 +00:00
1c2acfed8c
CInput textcolor
...
This was SVN commit r1602.
2004-12-31 12:20:22 +00:00
e72addb945
Editor: Finished collapsible toolbar at the top. Next task: menu bar.
...
This was SVN commit r1597.
2004-12-29 21:20:42 +00:00
8ebc09b336
More Editor stuff, mainly more work on the toolbar.
...
This was SVN commit r1591.
2004-12-28 22:16:32 +00:00
c97077f971
Itsy bitsy Editor adjustments.
...
This was SVN commit r1586.
2004-12-28 12:55:49 +00:00
7c390625c9
This was SVN commit r1582.
2004-12-28 03:53:52 +00:00
7ce95fdaa4
Modest additions to the in-game editor GUI layout.
...
This was SVN commit r1581.
2004-12-28 01:58:28 +00:00
6ed9263ee1
Added 'var' to JS variable declarations. Fixes a fatal crash when code that alters the variable 'GUIObject' dies rather than returning successfully, since 'GUIObject' is a class name.
...
This was SVN commit r1564.
2004-12-23 22:13:59 +00:00
c21bfde045
Clipped empty space from the new textures after hearing from Philip that they don't have to be of equal height and width. :)
...
This was SVN commit r1563.
2004-12-23 21:39:40 +00:00
1c89ab78f0
Packing it in for tonight.
...
This was SVN commit r1562.
2004-12-23 21:21:02 +00:00
3801b4b52f
Established Editor framework (theoretically).
...
This was SVN commit r1560.
2004-12-23 18:43:43 +00:00
5ac6555b9b
Added sprites that will potentially be used for the Editor when I get around to it.
...
This was SVN commit r1557.
2004-12-23 18:01:55 +00:00
47842863c4
Initial IP Hosting and map selection screens from Malte. Committed on his behalf as he's having problems with his authorisation.
...
This was SVN commit r1555.
2004-12-23 17:22:22 +00:00
0382cdd9b1
More tooltip updates. Made the main menu buttons and the in-game resource counters use them.
...
Fixed space/tab inconsistencies in (though not between) GUI XML files.
This was SVN commit r1554.
2004-12-23 13:56:34 +00:00
16e5b8f94b
Quickly added an Editor button.
...
This was SVN commit r1541.
2004-12-21 17:54:33 +00:00
6486de894d
Eliminated grayscale images.
...
This was SVN commit r1539.
2004-12-20 19:33:09 +00:00
76c67f029d
Made loading screen appear, now that Simon's fix has enabled the scheduler before the session. This one is just static ... We'd need to break loadSession() up into fragments and call each in turn in order to have a loading bar, as far as I can tell. (Also, any way to disable the cursor&input from JS?)
...
This was SVN commit r1535.
2004-12-19 10:53:40 +00:00
92e7394c7b
Eradicated lit sprites thanks to sprite effects from Philip. :D
...
This was SVN commit r1530.
2004-12-18 18:48:37 +00:00
99a022f847
Even more GUI cleanup.
...
This was SVN commit r1529.
2004-12-18 17:05:22 +00:00
7cfa5f6e4d
More GUI texture cleanup. :)
...
This was SVN commit r1528.
2004-12-18 16:27:32 +00:00
ba0ebd6644
Renamed icon-size/icon-id to cell-size/cell-id, and allowed cell-id to be used in <icon>s.
...
Added <effect>s to sprites/images - currently multiply-color and
add-color, though they're far from perfect.
This was SVN commit r1525.
2004-12-18 13:32:00 +00:00
323ca1746f
Big GUI update to kinda-sorta-maybe put lots of previously individual GUI art into cellular sheets. Still needs some work.
...
This was SVN commit r1523.
2004-12-18 02:42:22 +00:00
cd35701f70
Updated GUI/entities to use Philip's spiffy new icon sheets. :)
...
This was SVN commit r1520.
2004-12-17 17:22:27 +00:00
4815f76c5f
Various GUI fixes to get the scripts in line with Mark's revised data types (much appreciated!).
...
This was SVN commit r1516.
2004-12-16 19:21:05 +00:00
07ebaf86c5
Quick fix for icons that weren't being refreshed (a couple remain, but I think those are due to a temporary datatype mismatch).
...
This was SVN commit r1509.
2004-12-15 22:32:59 +00:00
7346e39cc4
Revised Status Pane icons so they're split into separate components, which seems to make them display properly (nested commands like [icon=] apparently don't interpret correctly if appending to one of their strings).
...
This was SVN commit r1508.
2004-12-15 21:59:17 +00:00
cb5759c737
Fixed minor icon glitch. Recompiled. (Quick commit before I try something more drastic.)
...
This was SVN commit r1506.
2004-12-15 19:20:29 +00:00
7d76ef980a
Fixed GUI error from yesterday. Still can't figure out why it's fixed, but hey, it works. All yours now, Malte. (y)
...
This was SVN commit r1499.
2004-12-14 17:23:10 +00:00
b04b3447c8
For reasons I cannot fathom at this late hour, a section of objects in 2_mainmenu.xml causes the coordinates of the session GUI to be screwed up. After a couple of hours of lack of success, commented it out so it'll work until tomorrow. Gotta get some sleep before work.
...
This was SVN commit r1498.
2004-12-13 23:15:11 +00:00
01443e4785
Fixed 0 A.D.-style windows from yesterday to use sprite collages. Made another one as background to future hosting screen.
...
This was SVN commit r1496.
2004-12-13 21:37:30 +00:00
6194fdb400
Added MP button (though it needs artistic intervention (ie Malte) to do the white highlights and get it positioned just right).
...
This was SVN commit r1495.
2004-12-13 19:14:37 +00:00
114f3f1513
Finished off first draft of in-game menu (ie made it actually do something useful). Hit F10 or click corner Map Orb buttons at random until you find it, as I'm too tired to mock up a replacement button image. ;)
...
This was SVN commit r1493.
2004-12-13 01:14:31 +00:00
24abb51b59
First crack at loading screen (though need to figure out a way to move session loading to next frame to get it to actually stay on the screen). Some preliminary work on sub-windows.
...
This was SVN commit r1489.
2004-12-12 19:34:38 +00:00
7e7743a90d
Implemented population of command buttons.
...
This was SVN commit r1461.
2004-12-06 00:54:06 +00:00
0d270c968c
More GUI stuff, primarily to start implementing entity lists.
...
This was SVN commit r1451.
2004-12-05 03:37:01 +00:00
944397c4cf
(Trying again, as it timed out last time I tried this.) Added various entity attributes, and struggled to get them to appear in GUI (seem to be issues with numeric interpretation and icons sometimes don't appear), but it's a start. Also made start on training
...
This was SVN commit r1450.
2004-12-04 21:38:52 +00:00
0c0d20d3eb
Marginally improved game performance by reducing session GUI updates (now waits over a second before updating the controls, but at least the frame rate is better). Also turned off GUI refresh when in full-screen mode (Alt+G).
...
This was SVN commit r1448.
2004-12-02 23:38:51 +00:00
a2bcfd8a47
Minor GUI fixes.
...
This was SVN commit r1422.
2004-11-28 21:11:37 +00:00
ec62c14ca4
Created entities for all Hellenic buildings created so far.
...
This was SVN commit r1421.
2004-11-28 20:11:02 +00:00
ee669ca572
More of the same.
...
This was SVN commit r1420.
2004-11-28 19:10:26 +00:00
068f6e8d47
Revised GUI scripts to turn Status Orb into lengthened pane, populated it with stats, retabulated Group Pane and gave it an opaque background (as requested by Malte).
...
This was SVN commit r1411.
2004-11-27 22:17:35 +00:00
