1
0
forked from 0ad/0ad
Commit Graph

488 Commits

Author SHA1 Message Date
a948e4687b This was SVN commit r2108. 2005-04-02 02:27:24 +00:00
b5947a513e This was SVN commit r2107. 2005-04-02 02:26:39 +00:00
Aeros
a1b3e66e2b volcanic cliff terrains used for the "mordor" April 1st prank shot. Uploaded due to popular demand
This was SVN commit r2106.
2005-04-01 06:27:21 +00:00
Aeros
46124ab495 2 dead trees
This was SVN commit r2105.
2005-04-01 05:43:55 +00:00
69bf368d27 Uploading Michael's new map, and some hotkey redefinitions (F10 is used for the menu in Age games).
This was SVN commit r2104.
2005-03-31 22:04:44 +00:00
5fe6d8295f Iberian temple rock color change
This was SVN commit r2102.
2005-03-31 12:26:33 +00:00
bde5484e75 Updated the Celt upgrade entities... hope I did it right :p
Also fixed the _u to _e

This was SVN commit r2101.
2005-03-31 08:45:58 +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
1f902dde21 Fixed unit lists that were pointing to ho_1, which doesn't exist anymore.
This was SVN commit r2095.
2005-03-30 22:03:31 +00:00
ad2fe1b09d Removed crashlog files that presumably shouldn't be here (since they make updates confusing)
This was SVN commit r2094.
2005-03-30 18:46:55 +00:00
MarkT
bb7a22f32a First draft of a GPG3-style profiler (including tracing into scripts, after a fashion)
This was SVN commit r2090.
2005-03-30 16:14:19 +00:00
9ce31a5c5c This was SVN commit r2089. 2005-03-30 12:42:29 +00:00
c72438bcb8 Fixed Celtic Advanced Swordsman entity that was pointing to a non-existent next rank.
This was SVN commit r2088.
2005-03-30 12:08:55 +00:00
4ec73e0eea updated some paths to the actors
This was SVN commit r2087.
2005-03-30 10:30:35 +00:00
b153439061 Some updated actors
This was SVN commit r2086.
2005-03-30 10:22:17 +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
22dd4dd67b Entities: Removed Tag attribute; it is taken from the filename instead. Made entity XML files be loaded on demand. Probably stopped crash when maps contain non-existent entities. Fixed a few bugs in entity definitions.
Maps: Stored non-entity objects in XML instead of PMP, for easier manual
editing. Updated existing maps to newest format, so that they can still
work. Added undocumented _rewriteMaps() JS function. Also renamed _mem
to vmem, and reclassified its undocumentedness as unintentional, since
it's reasonably useful.
Loader: added NonprogressiveLoad function, for ScEd/_rewriteMaps/etc
which don't care about progressiveness.
main.cpp: re-enabled vfs_display, since it doesn't crash now
Vector3D: stopped warning

This was SVN commit r2078.
2005-03-29 20:50:04 +00:00
e6c56d0537 Update of the ps.exe icon
This was SVN commit r2076.
2005-03-29 13:34:00 +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
7a31f202c0 Commited the house files for the random houses
This was SVN commit r2072.
2005-03-28 05:54:59 +00:00
644a9388ee Fix to make first "official" randomised entity ... Iberian house now points to an actor that contains its three variants. Replaced the houses in the ph2 map.
This was SVN commit r2064.
2005-03-27 10:29:48 +00:00
2b23bf1de9 Previously had impropper positions for the center origin of the house A and its prop, so fixing that...
This was SVN commit r2063.
2005-03-27 07:09:58 +00:00
ae21bf9329 changed the temple's footprint to the proper size of 3x3
This was SVN commit r2062.
2005-03-27 07:08:42 +00:00
018f57d8fb Changed the footprint size to a 2x2 (propper size) tile vs. the 3x3
This was SVN commit r2061.
2005-03-27 07:02:43 +00:00
6b10c4f52d Random house test for Stuart to experiment with
This was SVN commit r2060.
2005-03-27 07:01:39 +00:00
a321f1cc9f Added simple icon (on Windows)
This was SVN commit r2052.
2005-03-26 19:23:52 +00:00
ae71a6ba16 Iberian Structures!
This was SVN commit r2051.
2005-03-26 06:37:43 +00:00
2073733761 Fixed support for extra-new actor format. Updated binaries.
This was SVN commit r2050.
2005-03-26 00:22:42 +00:00
c11465cfbf Updated actor references to use filenames instead of names, to allow more efficient loading. Added backward-compatible file support to the Actor Editor.
This was SVN commit r2049.
2005-03-25 23:04:36 +00:00
6dbe768dd9 Actor Editor: Combo-box lists, loaded from XML. Allowed right click to edit cells.
This was SVN commit r2044.
2005-03-24 12:53:48 +00:00
Aeros
0e77c4eaba This was SVN commit r2041. 2005-03-23 04:20:21 +00:00
Aeros
488232c0ea This was SVN commit r2040. 2005-03-23 04:15:58 +00:00
9feaba2f36 Random actor test example thing
This was SVN commit r2037.
2005-03-22 18:41:19 +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
0b93abaa7c config: console alternate key=f9 (not f12, because that triggers a breakpoint in VC)
moved write-screenshot key to f10 and disable wsdl hook => printscreen
key copies to clipboard

This was SVN commit r2029.
2005-03-20 15:45:52 +00:00
2091822e16 Added map "randomactor", featuring an example of a random actor. Also added a random actor, featured in the aforementioned map.
This was SVN commit r2024.
2005-03-19 21:29:38 +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
460ee1a22f Malte's female sketchs
This was SVN commit r2004.
2005-03-18 10:24:00 +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
Fire Giant
51aa0e2077 Adding temporary concept images for testing.
This was SVN commit r1997.
2005-03-16 14:54:17 +00:00
cdecd9b242 Fixed floating prop on the persian CC and bad UV on the persian TC
This was SVN commit r1980.
2005-03-10 00:41:42 +00:00
89d9248116 Persian CC and HC
This was SVN commit r1970.
2005-03-08 16:30:04 +00:00
11d546d70a persian fancy props
This was SVN commit r1969.
2005-03-08 16:29:47 +00:00
4231bb25d0 persian fancy update
This was SVN commit r1968.
2005-03-08 16:28:54 +00:00
0aa41ad0e4 Committing some persian stuff.
This was SVN commit r1967.
2005-03-08 16:27:10 +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
4034a58437 *persian building fixes - posts, player color, bad actor file
*'fixed' bobbo's prop errors for his roman buildings, eliminating all
the loading errors

This was SVN commit r1961.
2005-03-01 04:14:11 +00:00
f8f2245846 Persian building stuff, and a few temporary palm trees
This was SVN commit r1952.
2005-02-28 04:50:17 +00:00
16ad78abae add sound master gain and additionally bind console to F10 for non-us keyboard layouts (where backquote is a dead key)
This was SVN commit r1941.
2005-02-26 21:43:52 +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
a52d392f4f Changed the global test texture... toned down the shadows and increased the rez
This was SVN commit r1925.
2005-02-18 19:25:36 +00:00
14c5dcb1f0 The global goods from my little demo!
This was SVN commit r1924.
2005-02-18 06:33:40 +00:00
96aeec3547 Taking out 2 old horse actors that are pointing to animations that have one less tail bone and causing an error
This was SVN commit r1923.
2005-02-13 23:44:04 +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
ebf76cf517 Carthaginian update for their structures. Unwrapped, skinned, and textured (complete with player color). No props yet, so they look a little bit plain, but they look better than yellow textures with carthaginian plastered all over them ;)
This was SVN commit r1913.
2005-02-06 07:15:24 +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
Gee
a1ff815784 Settings added.
This was SVN commit r1902.
2005-02-05 07:23:22 +00:00
Gee
878630d0b0 Moved to the edge.
This was SVN commit r1901.
2005-02-05 07:22:58 +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
a6668c1b22 Some animations
This was SVN commit r1893.
2005-02-02 08:36:59 +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
462369a244 Sixty helmets
This was SVN commit r1875.
2005-01-30 06:46:08 +00:00
9ff6768af9 Did some more player color on shields, just did the mask on the oval ones, cause I'm not sure how they will look. Waiting to do more till I have the player color tester in my grubby little hands.
This was SVN commit r1874.
2005-01-30 06:44:27 +00:00
d92996027a Fixed Atlas tooltips that weren't working before.
This was SVN commit r1871.
2005-01-29 23:52:22 +00:00
7c3993d284 just a little bit more color added
This was SVN commit r1870.
2005-01-29 22:22:02 +00:00
1ca0941853 reducing the super bright player color effect
This was SVN commit r1869.
2005-01-29 22:07:42 +00:00
fd5597f974 greyed out textures player color shield textures
This was SVN commit r1868.
2005-01-29 20:20:41 +00:00
ccbe6e44a1 test map for shields and player color
This was SVN commit r1867.
2005-01-29 18:35:55 +00:00
6731faa246 sheild player color test actors
This was SVN commit r1866.
2005-01-29 18:33:09 +00:00
985c4dbaf9 recommitting player color test shields
This was SVN commit r1864.
2005-01-29 18:11:08 +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
9b7007e546 Reverted map change (since it was broken)
This was SVN commit r1843.
2005-01-27 18:51:37 +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
ef6358b187 updated xml files to use the test player color shields
This was SVN commit r1833.
2005-01-27 04:40:04 +00:00
1085250de6 sheilds that have been 'player colorized'
This was SVN commit r1831.
2005-01-27 03:55:12 +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
NoMonkey
c71c360993 This was SVN commit r1806. 2005-01-24 14:06:15 +00:00
0e39146eb4 Fixing a actor mixup I made with the Hellenes
This was SVN commit r1802.
2005-01-24 02:03:40 +00:00
1de3d80f98 Update because png flipping problem was resolved, fixed the persian and roman profiles from some DD changes.
This was SVN commit r1801.
2005-01-24 01:27:16 +00:00
032346a3a9 Changing from dds to png for the civ sheets
This was SVN commit r1800.
2005-01-24 00:46:39 +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
fb69ed56b2 sheild stuff:
* Some new sheild meshes
* Reuploading the shield textures because the old ones were S3 instead
of Nvidia
* Some shield actors

This was SVN commit r1762.
2005-01-23 07:58:25 +00:00
9581fbc1e5 Shield textures for the Greeks, Persians, and Romans
This was SVN commit r1750.
2005-01-21 05:20:03 +00:00
d810bb88b1 Uploading 3 civ's sheild textures. (will be modified for player color later)
This was SVN commit r1749.
2005-01-20 07:47:57 +00:00
d5b1e84e0d Place holder animations for all infantry put in place.
This was SVN commit r1748.
2005-01-20 00:07:27 +00:00
c1ff5de88b Updated with new network JS Interfaces
This was SVN commit r1747.
2005-01-19 22:34:29 +00:00
b391fb89ef * Javlin, Slinger, Archer attack animations
* Modified sling mesh
* Fixed Celt Infantry Javelinist actor

This was SVN commit r1745.
2005-01-19 08:31:37 +00:00
1e2cd629f3 Replaced unit histories with Paul's new descriptions.
This was SVN commit r1744.
2005-01-18 20:05:38 +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
1c044ac229 Primitive entity player-selection in ScEd
This was SVN commit r1727.
2005-01-16 23:09:41 +00:00