Commit Graph

652 Commits

Author SHA1 Message Date
Fire Giant
ad182999eb Reinitialised the pregame multiplayer GUI, made it work and break. Commiting to keep the file in sync.
This was SVN commit r2477.
2005-07-10 02:26:08 +00:00
f3bd639fcd hoplite texture update
This was SVN commit r2473.
2005-07-09 10:57:43 +00:00
4a3a3db0aa Carthaginian building upgrade
This was SVN commit r2450.
2005-06-28 10:05:20 +00:00
a50b118c6c Added SmoothElevationPainter.
This was SVN commit r2441.
2005-06-26 10:28:39 +00:00
e5d648ff5f ScEd binary
This was SVN commit r2440.
2005-06-26 00:32:43 +00:00
470681a287 Moved initFromScenario LOAD_* constants to rmlibrary.js
This was SVN commit r2434.
2005-06-24 06:44:21 +00:00
dan
816293ff36 Added iniFromScenario code through a new constructor in Map::
Initial test, doesn't load the .xml yet,

This was SVN commit r2433.
2005-06-24 04:46:13 +00:00
52c44f7225 Few terrain tweaks
This was SVN commit r2429.
2005-06-22 07:33:00 +00:00
1975a047c5 removed hard-coded constants to use the ones registered by the engine... pending a complete revamp that doesnt use SDL constants (yech!) all
This was SVN commit r2413.
2005-06-20 15:17:48 +00:00
047e1e8c7f Initial Terrain XML data (just using the texture filenames, for compatability with all the old maps)
This was SVN commit r2411.
2005-06-20 15:01:00 +00:00
444e8c31c7 Renamed createMulti to createAreas since there will also be a similar createObjects.
This was SVN commit r2408.
2005-06-20 03:55:11 +00:00
470d87c489 Added simple elevation painter as well as array syntax for AndConstraint, RandomTerrain and the new MultiPainter.
This was SVN commit r2407.
2005-06-20 03:18:51 +00:00
2bfad45723 Added initFromScenario function for Dan to work on.
This was SVN commit r2405.
2005-06-20 02:45:11 +00:00
06b3e512d7 Modified the way objects are converted from JS to C++ to make it easier to use.
This was SVN commit r2404.
2005-06-19 22:43:07 +00:00
83849d027a Terrain tweaks, additions, and moves
This was SVN commit r2382.
2005-06-13 06:49:26 +00:00
1aae709ab4 This was SVN commit r2380. 2005-06-08 00:49:54 +00:00
08ef5c2b68 Redesigned part of RMS (removed "CenteredPlacer" concept, made createMulti a JavaScript library function).
This was SVN commit r2379.
2005-06-07 07:21:55 +00:00
bd53b14f58 More work on RMS:
- Created binaries/data/mods/official/maps/random folder to store maps
and also moved rmlibrary.js to maps (though perhaps it should be
somewhere in system?).
- RM generator now uses "logical terrains" that can have units attached
to them in addition to textures, for things like forests.
- Added basic clump placer, avoid constraints, layered painter, and
random terrains (each tile is chosen between several options).
- Misc. infrastructure changes.

This was SVN commit r2378.
2005-06-06 07:46:28 +00:00
fca4bab2dd Re-enabled VBOs by default, since they're significantly faster.
This was SVN commit r2371.
2005-06-02 22:47:08 +00:00
cfb4ac8d27 This was SVN commit r2365. 2005-06-01 20:00:54 +00:00
b0ceae0393 don't need this anymore
This was SVN commit r2355.
2005-05-28 00:04:08 +00:00
7c8acca15e Some speed tweaks for the unit animations performed by Jason (I'm just lending him a fast, stable connection :p).
This was SVN commit r2354.
2005-05-27 21:33:22 +00:00
2eafe4ef92 some entity tweaks - change unit footprint size and attack rates
This was SVN commit r2353.
2005-05-27 05:01:01 +00:00
MarkT
d6c4bf3302 Changes to actor speed specifications.
This was SVN commit r2350.
2005-05-27 00:38:30 +00:00
db592f08f6 animation fixes
This was SVN commit r2349.
2005-05-26 21:44:31 +00:00
3522d0c6bc Temporary water textures
This was SVN commit r2348.
2005-05-24 12:47:26 +00:00
43d04d0f31 Some little scripting fixes Jason noticed.
This was SVN commit r2343.
2005-05-23 22:03:55 +00:00
5e76795afe attack events added
This was SVN commit r2341.
2005-05-23 04:35:58 +00:00
e0045b2d53 Attack1 and Attack2 => Attack
This was SVN commit r2332.
2005-05-22 11:24:33 +00:00
0331883a86 Temporary fix for mouse input. Improved performance in player-colour model renderer. Also improved performance in lighting, at least in unoptimised builds.
This was SVN commit r2328.
2005-05-20 17:09:47 +00:00
ccd79ecd85 This was SVN commit r2322. 2005-05-19 02:36:13 +00:00
3a255148dc overwrote the ugly out of scale roman road with a new one I made from a neat program I found
This was SVN commit r2318.
2005-05-18 12:59:57 +00:00
c8b851eda9 - JS functions to make use of new ordering and interaction APIs
- selectLocation and selectEntity using the new interaction API
- Implemented attack and patrol buttons using select{Location,Entity}

This was SVN commit r2317.
2005-05-18 05:35:25 +00:00
9de76bea4c oops still not fixed, but this works (should have tested)
This was SVN commit r2312.
2005-05-14 23:29:59 +00:00
8060249f1d colo(u)r fixes for the mastiff
This was SVN commit r2311.
2005-05-14 23:02:49 +00:00
b73d445510 fixed archer attack animations
This was SVN commit r2310.
2005-05-14 06:41:50 +00:00
85497b4ebc dudes die faster when attacking
This was SVN commit r2309.
2005-05-14 06:30:09 +00:00
07d9a32e54 Greek Stuff
This was SVN commit r2304.
2005-05-13 11:46:45 +00:00
b772559fbe Added get/setTerrain and get/setHeight functions to the RMS API which allow control of each individual tile, and base height argument to init().
This was SVN commit r2300.
2005-05-13 00:39:13 +00:00
Aeros
07835e70e5 complete bush set for the Temperate and Mediterreanean biomes.
This was SVN commit r2294.
2005-05-12 09:10:53 +00:00
122b3aeb86 update of some art stuff for projectile testing
This was SVN commit r2284.
2005-05-11 05:58:34 +00:00
5cd7997d16 ah ha, found out why the elite shield was flickering - fixed
This was SVN commit r2278.
2005-05-11 04:25:55 +00:00
ee1ff55046 Hmm... Am I right in thinking DTDs make backwards compatibility impossible? (hence the entirely new file)
This was SVN commit r2275.
2005-05-11 03:02:24 +00:00
d43de62b4a getting rid of the nasty textures and adding a default texture so that sced doesn't use the cliff texture anymore on default
This was SVN commit r2269.
2005-05-10 11:45:33 +00:00
2d8f298e00 updating the map again to get rid of that ugly grass, and also to put the buildings on flat terrain... it was buggin me!
This was SVN commit r2268.
2005-05-10 11:39:05 +00:00
MarkT
86dc351205 Projectile code and updates to some actors that can use it (celt_ijv and hele_iar)
This was SVN commit r2266.
2005-05-10 07:13:25 +00:00
8683e6a3ec fix music title (avoids one particular warning at exit)
This was SVN commit r2258.
2005-05-09 04:32:06 +00:00
69a96c6b1e Vague attempt at error-checking in some JS code
This was SVN commit r2256.
2005-05-09 04:03:26 +00:00
f6e864c9f6 Greek stuff
This was SVN commit r2253.
2005-05-12 17:20:17 +00:00
d8c4e51ddb Greek Helmets
This was SVN commit r2248.
2005-05-06 12:55:06 +00:00
b75c3607b4 Quick demonstration of Jan's nifty VFS functions in action.
This was SVN commit r2245.
2005-05-05 02:51:39 +00:00
d22d837060 fix trees
Pine1 -> flora/wrld_flora_pine.xml

This was SVN commit r2238.
2005-05-04 20:58:01 +00:00
48221dc70e Greek textures
This was SVN commit r2237.
2005-05-04 16:09:28 +00:00
d2410624e4 This was SVN commit r2217. 2005-05-03 01:57:03 +00:00
158f967926 Quickly unbreak the broken bits before anyone notices.
This was SVN commit r2216.
2005-05-03 00:02:37 +00:00
cab424ce81 Creating playlist sub-window to soon try out file access functions. (Committing in-development stuff to get an auto-build incorporating change to GUI .xml names.)
This was SVN commit r2214.
2005-05-02 22:04:29 +00:00
7d6c2f08a4 Made the Hellenic CS units use their new shields. Which I probably should have done earlier.
This was SVN commit r2211.
2005-05-02 16:05:57 +00:00
MarkT
db168702df Jason's animation events. Also reworked entity-types system.
This was SVN commit r2209.
2005-05-01 19:09:13 +00:00
32e3ff0921 Round ones too.
This was SVN commit r2208.
2005-05-01 16:26:30 +00:00
c540b11748 Hellenes pelta shield actors requested by Jason.
This was SVN commit r2207.
2005-05-01 16:22:22 +00:00
dc210f9f0e playercolor adjustments
This was SVN commit r2205.
2005-05-01 11:51:07 +00:00
c51619264c The entity that has all the new tweaks we discussed during the meeting - it will break untill the code is updated
This was SVN commit r2204.
2005-05-01 10:51:45 +00:00
8698663367 arrow test stuff
This was SVN commit r2203.
2005-05-01 00:42:16 +00:00
53f9347029 Slight update to make the gather cursors work by subtype, and added a bunch of placeholder cursors shamelessly ripped from AoM. Any artist that feels like making non-copyrighted replacements would be most welcome. (Ironically, I could find few usable cursors for the different food types.)
This was SVN commit r2201.
2005-04-30 23:42:01 +00:00
657ef07006 Accounting for removed swordsman in Celtic CC.
This was SVN commit r2200.
2005-05-12 17:17:28 +00:00
c024155e88 Customisable colour settings.
This was SVN commit r2197.
2005-04-29 20:36:00 +00:00
7b9ba0c16d Stuff for milestone 7 on my todo list
This was SVN commit r2194.
2005-04-29 12:47:10 +00:00
57b634999e Advanced and Elite rank entities for all the civs.
This was SVN commit r2191.
2005-04-29 01:37:25 +00:00
780b6e266b Changed actor colour syntax. Made the Actor Editor edit colours.
This was SVN commit r2189.
2005-04-28 20:44:22 +00:00
9cf5ed151d Replaced all Celtic swordsmen with spearmen, since celt_isw_* no longer exists
This was SVN commit r2188.
2005-04-28 20:36:31 +00:00
2022cf3cc3 The mastiff
This was SVN commit r2187.
2005-04-28 09:18:41 +00:00
b3c83ac2f1 hmm, must this was pointing to the csw instead of the csp, so fixed
This was SVN commit r2186.
2005-04-28 09:21:16 +00:00
faf5a942dc removed celt CS swordsman
This was SVN commit r2181.
2005-04-27 12:58:25 +00:00
a238d018b1 celt shield updates (split into ranks for CS units)
This was SVN commit r2180.
2005-04-27 12:41:53 +00:00
f31e9d1781 Few celt tweaks
This was SVN commit r2179.
2005-04-27 12:40:58 +00:00
d1aa159215 Ok, updated units to accept the new weapons. Commented out broken roman props on the houses and barracks that were causing errors.
This was SVN commit r2169.
2005-04-26 12:19:55 +00:00
5d04d2f9cc Cleaned up the weapons
This was SVN commit r2168.
2005-04-29 13:30:19 +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
Gee
9a01db1e31 Added some settings for List and Dropdown
This was SVN commit r2166.
2005-04-23 23:25:07 +00:00
4be2ac7839 An assortment of celtic unit updates - biggest is probably the lime head update and completion of the celt jav unit line
This was SVN commit r2162.
2005-04-23 12:12:46 +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
eb6f978ba1 Some celt colorful pants textures
This was SVN commit r2158.
2005-04-22 12:26:07 +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
498d58ee61 This was SVN commit r2156. 2005-04-21 01:40:13 +00:00
08921f56b4 Moved icon, so that compilation doesn't depend on anything in 'binaries'
This was SVN commit r2155.
2005-04-20 20:18:20 +00:00
7f40968760 Updated some stuff. Basic texture for the swordsman, elite javalinist. Got some ideas for making the spearman a bit different than the swordsman. Fixed some entities that I think I broke a few weeks ago by pointing to the wrong actors.
This was SVN commit r2153.
2005-04-20 11:37:37 +00:00
59d58c5e75 Helmmet goods
This was SVN commit r2148.
2005-04-29 13:28:36 +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
3a36e9fa43 Removed Carthaginian Archer at Ken's request.
This was SVN commit r2146.
2005-04-17 15:08:44 +00:00
6231cc1ac5 This was SVN commit r2145. 2005-04-17 10:57:48 +00:00
87e7f61fff Fix for subtype resources (food), so hopefully all resources should be gatherable now.
This was SVN commit r2144.
2005-04-17 06:00:00 +00:00
6ae111d0d7 Fix for NaN of resource types. Food resources still outstanding ... I think it's an issue where need to get the value of a supply object's subtype, but the evt .speed is only for the type. Will need to check with Mark.
This was SVN commit r2143.
2005-04-16 17:33:29 +00:00
MarkT
26d3f69ebf Fix to gathering script
This was SVN commit r2142.
2005-04-16 16:05:49 +00:00
a10ac6b379 Created entities for oak trees and berry bushes.
This was SVN commit r2141.
2005-04-16 15:13:57 +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
3b120b0791 pre-emptive fix for missing props for these 2 roman buildings
This was SVN commit r2138.
2005-04-16 03:00:18 +00:00
7e98c8e961 clean out the foriage folder - utilizing the randomization - remove broken items (ivy)
Will probably break some props - especially for the propped roman
buidings

This was SVN commit r2137.
2005-04-29 13:27:12 +00:00
f99a36fa43 optimizing gaia objects for resources
This was SVN commit r2135.
2005-04-29 13:26:44 +00:00
346f033b58 celt_isp_e.xml added
This was SVN commit r2134.
2005-04-15 12:36:06 +00:00
e12eca6f5d updated sheild textures, colored horses, celt_csw_e.xml update
This was SVN commit r2133.
2005-04-15 12:26:25 +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
79e1c273e6 Removed older version of ScEd, which as far as I know is too outdated to be useful now. (If I'm wrong, I've kept a backup.)
This was SVN commit r2131.
2005-04-29 13:26:13 +00:00
f62b590487 remapped weapon textures and interal colors for the celt head.
This was SVN commit r2130.
2005-04-29 13:26:06 +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
4fe29b1092 Another elite celt texture, player color fix, uploaded forgetten lime texture. blah blah blah
This was SVN commit r2124.
2005-04-10 12:45:05 +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
1bcb4f0b3b oh... just some celtic stuff
This was SVN commit r2118.
2005-04-08 11:10:03 +00:00
61429c62df This was SVN commit r2117. 2005-04-07 13:09:43 +00:00
Gee
61fbbae8d9 This was SVN commit r2114. 2005-04-07 09:11:33 +00:00
13da7d0aab celtic advanced textures
This was SVN commit r2112.
2005-04-06 12:35:20 +00:00
39acd670d6 oops, forgot the player color material
This was SVN commit r2111.
2005-04-05 12:09:32 +00:00
6049be83b1 First Official Unit - Celtic Infantry Elite Swordsman
Includes files for Philip to test with for player and internal color

This was SVN commit r2110.
2005-04-05 11:54:13 +00:00
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