d2ee50031c
Fix shlight.vs for ATI cards.
...
The NVidia shader compiler is not as strict as the ATI compiler.
This was SVN commit r2856.
2005-10-05 19:29:52 +00:00
f1ee2cd66d
Add the notion of render paths and an appropriate configuration option.
...
Add Ogl_Shader and Ogl_Program handle types for shaders/programs loaded
from
files.
In the vertexshader render path, use a vertex program for lighting for
optimization.
This was SVN commit r2853.
2005-10-05 16:42:09 +00:00
539460abd8
This was SVN commit r2852.
2005-10-05 08:35:14 +00:00
7e8ab14139
This was SVN commit r2851.
2005-10-05 07:38:55 +00:00
639a1ee8cb
This was SVN commit r2850.
2005-10-05 07:38:04 +00:00
932cab0da1
This was SVN commit r2849.
2005-10-05 07:37:34 +00:00
6859ce1e52
ooops missing texture I shouldn't have renamed
...
This was SVN commit r2848.
2005-10-05 05:23:17 +00:00
72d71ae3a9
renamed some shoreline textures, painted the terrain on the 0ad map, and fixed a bad link in the roman barracks entity
...
This was SVN commit r2847.
2005-10-05 05:03:21 +00:00
a181ef1fef
This was SVN commit r2845.
2005-10-04 07:03:07 +00:00
57a9941176
This was SVN commit r2844.
2005-10-04 07:02:33 +00:00
7abf24b6c6
Possible speed optimisation for gaia entities (don't inherit the usual events and the entity script).
...
This was SVN commit r2842.
2005-10-03 20:57:10 +00:00
c8b3be282d
This was SVN commit r2836.
2005-10-03 05:00:36 +00:00
f0542c9b45
This was SVN commit r2835.
2005-10-03 04:59:48 +00:00
9a527643ff
This was SVN commit r2834.
2005-10-03 04:57:33 +00:00
fec54c7f0d
This was SVN commit r2833.
2005-10-03 04:56:20 +00:00
9369ea0978
This was SVN commit r2832.
2005-10-03 04:55:55 +00:00
8bb6a6b56f
This was SVN commit r2831.
2005-10-03 04:52:02 +00:00
17bc0a98df
This was SVN commit r2830.
2005-10-03 04:49:09 +00:00
4054c13c1f
This was SVN commit r2829.
2005-10-03 04:48:18 +00:00
e15bd16af4
This was SVN commit r2828.
2005-10-03 03:46:58 +00:00
c4c28360eb
Roman CC, Barracks, Market - Thracian Peltasts
...
Set ignore .xmb files on several actor folders
This was SVN commit r2825.
2005-10-01 09:47:06 +00:00
ffd8630c45
Updated autobuilder to get the .pdb files from 'system'.
...
Deleted ps_test, since it isn't updated by the autobuilder and will be
out of date.
Removed console history file, since it doesn't need to be
version-controlled.
This was SVN commit r2823.
2005-10-01 04:26:12 +00:00
951789c6a6
This was SVN commit r2808.
2005-09-29 08:36:17 +00:00
14d1b28660
This was SVN commit r2807.
2005-09-29 08:35:49 +00:00
c4c9a46953
This was SVN commit r2806.
2005-09-29 08:12:34 +00:00
358abedde0
This was SVN commit r2805.
2005-09-29 08:11:52 +00:00
4863e84ee1
This was SVN commit r2804.
2005-09-29 08:09:56 +00:00
Aeros
14df805761
This was SVN commit r2802.
2005-09-29 04:50:21 +00:00
Aeros
788becefc8
This was SVN commit r2795.
2005-09-28 06:58:02 +00:00
Aeros
73e2e8ce00
This was SVN commit r2794.
2005-09-28 06:52:54 +00:00
Aeros
25be56b5a2
This was SVN commit r2793.
2005-09-28 06:02:14 +00:00
028292fd89
water textures to use object color properties
...
This was SVN commit r2785.
2005-09-27 21:53:32 +00:00
9e8a6d926e
This was SVN commit r2782.
2005-09-27 18:15:19 +00:00
0bda64f8e4
renamed 'real world' to 0ad and while I'm at it, I figure I may as well, add more maps - so here are a few countries/regions to play with.
...
This was SVN commit r2778.
2005-09-27 09:59:16 +00:00
a4ab2be574
This is real world satelite data. Not to be confused with MTV real world ;)
...
This was SVN commit r2777.
2005-09-27 09:27:00 +00:00
Aeros
a4cdf8ee46
This was SVN commit r2776.
2005-09-27 09:24:59 +00:00
Aeros
1b805ebee7
This was SVN commit r2775.
2005-09-27 06:44:48 +00:00
5f81e5d336
World map draft 1
...
This was SVN commit r2774.
2005-09-27 05:20:02 +00:00
a88915825f
Various GUI fixes (and probably some breakages ;D).
...
This was SVN commit r2768.
2005-09-26 23:08:06 +00:00
75b291931d
Actor reorganisation
...
This was SVN commit r2763.
2005-09-23 03:54:51 +00:00
de6d43c290
Actor reorganisation
...
This was SVN commit r2762.
2005-09-23 03:31:41 +00:00
173b060668
Changed entity script to to allow Gaia units to be attacked (gather will still be higher priority though).
...
This was SVN commit r2753.
2005-09-19 01:20:23 +00:00
bc3949db1a
Added a fairly primitive water plane. This includes several things:
...
- Hotkeys Q, A, Z to toggle, raise and lower the water plane
respectively.
- A unit trait, named anchor, that says whether it attaches to the
terrain or the water.
- Small changes to rendering code.
This was SVN commit r2744.
2005-09-18 03:16:12 +00:00
a98ee94af9
A ship for testing purposes.
...
This was SVN commit r2740.
2005-09-17 11:18:45 +00:00
6f90dec78f
Added Neareastern Badlands map.
...
This was SVN commit r2733.
2005-09-15 02:57:09 +00:00
0d11643032
Fixed a bug that was causing the original resource values to be strings instead of numbers, resulting in string concatenation when you gathered a resource.
...
This was SVN commit r2731.
2005-09-15 02:03:01 +00:00
58fbafbbdd
Command buttons can finally invoke the building painter or train units. Still plenty of glitches (particularly click-fest issues ... still an issue when updating the buttons directly rather than via hack, so it's probably due to constant onPress refresh). I've also had to disable the progress bar until I can make it work properly, but if you can get a unit in the queue it should eventually spawn. :)
...
This was SVN commit r2727.
2005-09-14 22:47:51 +00:00
2aca87419f
This was SVN commit r2724.
2005-09-14 19:42:58 +00:00
4ab25c7274
* Fixed the "can't interact with the world" glitch. Turns out it was my fault. :)
...
* Restored the resource pool (and cleaned up the JS interface to it ...
array and counters are updated in one spot (wrapper functions to
add/deduct/define), without need for constant refresh).
* Added crude boxes in game setup to enter initial resource value.
* The command buttons still don't work when clicked (and clicking
continues to be erratic, only triggering if hammering the mouse button
... I think it's related to the return function() hack Philip set up),
but that's next on the list. :)
* Oh, and the command buttons don't currently realign to the different
corners with Alt+G, but all the rest should.
This was SVN commit r2715.
2005-09-14 00:50:25 +00:00
2766242181
This was SVN commit r2713.
2005-09-13 22:58:54 +00:00
d3f41e1b9f
Finally put the command buttons back in, but the GUI doesn't seem to be accessible when a unit is clicked, so I can't be sure it works. I think it may be due to no left-click options in Simon's world click event handler. Need to ask him about it.
...
Also it's much slower as the buttons are constantly updated ... Mark's
shouldUpdateStat() doesn't seem to be registering in this case. Need to
check with him about that too.
This was SVN commit r2697.
2005-09-10 17:30:57 +00:00
5c4069f5e1
This was SVN commit r2689.
2005-09-08 01:34:24 +00:00
c428f510f6
This was SVN commit r2687.
2005-09-08 01:18:55 +00:00
55107c69fe
This was SVN commit r2683.
2005-09-07 02:17:29 +00:00
8b467d6f2f
This was SVN commit r2681.
2005-09-06 22:54:41 +00:00
6b284a8b95
This was SVN commit r2680.
2005-09-06 22:47:26 +00:00
5f2857b6b8
Modified health bar height on buildings and added default of -1.0 (which means don't display health bar) on all entities.
...
This was SVN commit r2676.
2005-09-06 19:29:31 +00:00
d867f0c5fc
box_height parameter for Matei.
...
This was SVN commit r2673.
2005-09-06 00:51:18 +00:00
84a980a344
Reimplemented session GUI refresh loop, with unit portrait as test subject. Fixed some broken things.
...
This was SVN commit r2666.
2005-09-05 03:21:20 +00:00
c0c08bd851
This was SVN commit r2661.
2005-09-03 21:54:11 +00:00
436de9b0ff
Committing updated font with a bit of test text while experimenting with accented characters.
...
This was SVN commit r2658.
2005-09-03 21:00:43 +00:00
93313f61bf
no more changes!
...
This was SVN commit r2653.
2005-09-02 08:57:59 +00:00
6b0b64b0f9
roman roof again
...
This was SVN commit r2652.
2005-09-02 07:40:24 +00:00
3471df7788
Added vertical line thingy
...
This was SVN commit r2645.
2005-09-02 00:50:31 +00:00
156fa094e9
Added placeholder milk cursor. Hoo yeah.
...
This was SVN commit r2644.
2005-09-01 22:46:00 +00:00
4d4437ded0
resize to 32x32 to match other alpha maps. necessary because CRenderer::LoadAlphaMaps now actually checks the size correctly
...
This was SVN commit r2643.
2005-09-01 18:14:35 +00:00
f02ebca5e5
another update to the roman texture
...
This was SVN commit r2642.
2005-09-01 08:40:13 +00:00
a21c9e83fe
texture tweaks
...
This was SVN commit r2641.
2005-09-01 08:02:12 +00:00
113cf0b7e5
more houses
...
This was SVN commit r2640.
2005-09-01 07:17:41 +00:00
486524b165
window change as requested by Michael
...
This was SVN commit r2639.
2005-09-01 03:35:07 +00:00
f46853e009
fixed normal on the house
...
This was SVN commit r2638.
2005-08-31 22:17:05 +00:00
80443f4030
preliminary roman stuff
...
This was SVN commit r2637.
2005-08-31 21:39:31 +00:00
a2f4213641
small tweak
...
This was SVN commit r2636.
2005-08-27 05:35:58 +00:00
49498c80d2
Texture update for player color, window, and door. Updated CC and Temple with recessed door, flipped the griffons, new fortress, fixed house C oddities
...
This was SVN commit r2635.
2005-08-27 05:23:37 +00:00
3c58f50ff3
GUI-toggle feature for Michael (toggle with the G key), and fixed alignment of watermark.
...
This was SVN commit r2634.
2005-08-26 21:02:00 +00:00
a1f13c5976
Updated Greek buildings - and some tweaked maps
...
This was SVN commit r2633.
2005-08-26 04:55:34 +00:00
79e8f21c6f
Although there's still a lot of glitches and random crashes, it should now theoretically be possible for clients to join a host's game.
...
Also profiles are now determined by the folders in the profiles/
directory (not that they actually do anything yet, AFAIK, but at least
the profile list isn't hardcoded).
This was SVN commit r2632.
2005-08-25 15:07:16 +00:00
c4cb65af72
Disabled Atlas Editor from main menu for the time being (it'll be accessible from shortcut).
...
This was SVN commit r2621.
2005-08-14 18:44:37 +00:00
72806285f8
Editor button/enable/disable click to help in experimenting with Atlas interface.
...
This was SVN commit r2620.
2005-08-14 16:03:44 +00:00
7a9f59c192
Improved navigation of file list by backing up particularly old and deprecated maps, and alphabetically sorted the map list.
...
This was SVN commit r2616.
2005-08-14 01:08:09 +00:00
43baf6ada6
New terrain properties stuff, gcc compatability and updated unix debugging stuff
...
This was SVN commit r2582.
2005-08-07 22:00:16 +00:00
7763ea6132
A little more client connection work.
...
This was SVN commit r2580.
2005-08-07 17:02:22 +00:00
76f3524190
Fixed FPS, which had stopped working (since it no longer recognised the mouse.x and mouse.y component of the string).
...
This was SVN commit r2579.
2005-08-07 14:51:55 +00:00
f1eeadb2c6
Realised I only uploaded the gui/ folder in my last submission. My bad. Thanks for mentioning it in the meeting, Jason.
...
This was SVN commit r2578.
2005-08-07 14:06:30 +00:00
3eaad81b7a
MP adjustments ... Made Session Setup a generic screen that Host, Client and Skirmish all pipe through. Moved playername into a Profile dropdown so it's not hardwired into MP. Various issues, but at least it's set the foundation for Malte's work.
...
This was SVN commit r2574.
2005-08-03 02:47:09 +00:00
a9397e0888
Some experiments with audio controls in the options window. (Doesn't really work yet, though.)
...
This was SVN commit r2571.
2005-07-31 03:08:07 +00:00
bdd5fd8578
Pilot release of yet another revision of GUI coordinates. (In other words you can shift the minimap into any corner of the screen using Alt+G.)
...
This was SVN commit r2570.
2005-07-31 01:15:56 +00:00
e63d314f74
More miscellaneous and largely unnoticeable GUI stuff.
...
This was SVN commit r2566.
2005-07-30 20:25:38 +00:00
4c7838970d
Some UI changes
...
This was SVN commit r2561.
2005-07-28 19:57:38 +00:00
f4844681a1
Made the framework of options, history, and campaign screens, mostly just for the hell of it, and fixed various things. Can't do much with them, mind, but Rome wasn't burnt in a day (thank you, Mr Nero).
...
This was SVN commit r2559.
2005-07-28 02:36:48 +00:00
bb65fdc105
Added Stuart's UI changes
...
This was SVN commit r2557.
2005-07-27 16:45:44 +00:00
d0516bc4a2
Added Stuart's UI changes
...
This was SVN commit r2555.
2005-07-27 15:43:48 +00:00
c72ec01a8c
Added Stuart's UI changes
...
This was SVN commit r2554.
2005-07-27 15:38:03 +00:00
005f4621bd
Undeleted UI folder
...
This was SVN commit r2553.
2005-07-27 15:31:49 +00:00
1ed994c819
Undeleted GUI folder, added Stuart's changes.
...
This was SVN commit r2552.
2005-07-27 15:21:27 +00:00
Fire Giant
d789b86b37
Deleted the GUI folders for Stuart on his request in order to allow him to commit his new code to a clean base.
...
This was SVN commit r2551.
2005-07-27 00:47:08 +00:00
Fire Giant
973c853672
Deleted the GUI folders for Stuart on his request in order to allow him to commit his new code to a clean base.
...
This was SVN commit r2550.
2005-07-27 00:43:33 +00:00
Gee
c6c8bdc6cd
Added the <color> tag used in <setup> to setup pre-defined colors. Check docs to see how it's done.
...
This was SVN commit r2548.
2005-07-25 19:07:06 +00:00
0014fe0e27
Temporary animal entities for Matei's RM development.
...
This was SVN commit r2542.
2005-07-25 03:04:02 +00:00
Gee
cdfabb9acc
Changed <icon>'s property 'texture' to 'sprite'. Better late than never.
...
This was SVN commit r2538.
2005-07-25 00:50:38 +00:00
Gee
26d44ba616
Changed <icon>'s property 'texture' to 'sprite'. Better late than never.
...
This was SVN commit r2537.
2005-07-25 00:50:17 +00:00
26d88c5e52
Deleted uppercase version
...
This was SVN commit r2536.
2005-07-24 21:42:26 +00:00
Gee
4bf9c15ece
This was SVN commit r2535.
2005-07-24 15:55:14 +00:00
c6ea4f36bf
Changed the file naming convention again, mainly to annoy Jason. :) (I forgot that filenames are meant to be lowercase with underscore separators.)
...
Experimented with Philip's view-config-variables-workaround.
This was SVN commit r2534.
2005-07-24 14:04:56 +00:00
65abb78611
main menu changes for the new dds files
...
This was SVN commit r2531.
2005-07-24 05:49:18 +00:00
b3b9349cc4
Textures for the updates to the shell
...
This was SVN commit r2530.
2005-07-24 05:27:10 +00:00
Fire Giant
8525183732
Broke networking code. Fixed messageBox() code.
...
This was SVN commit r2529.
2005-07-24 01:13:50 +00:00
Fire Giant
462c85a3ba
Fixed some silly variable assigment bugs. Made the game continue to work if a multiplayer host session is cancelled.
...
This was SVN commit r2525.
2005-07-23 23:15:58 +00:00
1de8e29c41
I've revised the example list to use Gee's revised functions.
...
This was SVN commit r2524.
2005-07-23 22:32:10 +00:00
Gee
4ad8de51bb
Added more functions. Changed addItem to insertItem
...
This was SVN commit r2522.
2005-07-23 20:17:36 +00:00
b50d9f529a
Some GUI fixes.
...
This was SVN commit r2521.
2005-07-23 14:06:38 +00:00
165be6397e
This was SVN commit r2520.
2005-07-23 08:19:15 +00:00
4655a6ded3
Renamed the GUI object functions (probably missed a few calls), and made first attempt at list control for SP (warning: a lot of maps are too outdated to run, so choose with caution).
...
This was SVN commit r2518.
2005-07-23 02:02:45 +00:00
Gee
57ab45c380
Functions for lists and dropdowns.
...
This was SVN commit r2510.
2005-07-22 00:02:39 +00:00
Gee
02f715ea69
Renamed functions_list => functions_utility_list
...
This was SVN commit r2509.
2005-07-21 23:51:10 +00:00
Gee
f818449e72
Functions for lists and dropdowns.
...
This was SVN commit r2508.
2005-07-21 23:45:17 +00:00
Gee
7eaf8bc13c
Added functions_list.jp to the list.
...
This was SVN commit r2507.
2005-07-21 23:44:46 +00:00
9b2736e1d1
Removed absolute properties, since they're now used by default. Hurrah!
...
This was SVN commit r2504.
2005-07-21 03:01:58 +00:00
Gee
4e64200131
This was SVN commit r2501.
2005-07-20 23:47:46 +00:00
eed104e139
Made objects relative by default, cutting down on some redundant properties. Cleaned up loading screen script.
...
This was SVN commit r2500.
2005-07-20 23:00:48 +00:00
Fire Giant
81bdf6e1c4
Fixed the join dialog window. Establishing connection now works, but is currently not reported by anything but the console.
...
This was SVN commit r2494.
2005-07-20 02:56:32 +00:00
e7946ad774
functions_pregame_load.js: fixed whitespace
...
new OpenAL version.
This was SVN commit r2489.
2005-07-20 00:51:38 +00:00
71f4587d1c
oops forgot the actor for the celt_ijv_e.xml
...
This was SVN commit r2485.
2005-07-15 11:58:15 +00:00
3278f6d0a9
celt tattoo updates
...
This was SVN commit r2484.
2005-07-14 09:08:53 +00:00
24da4d7c7d
This was SVN commit r2481.
2005-07-12 00:36:41 +00:00
9b4de9a016
Quick JS fixes.
...
This was SVN commit r2480.
2005-07-12 00:06:31 +00:00
a96fd84391
The game loading was broken, and I fixed it! Wahooo, my first venture into the world of GUI scripting.
...
This was SVN commit r2479.
2005-07-11 04:52:20 +00:00
0342f01580
Revised structure of mainmenu script (better property visibility, more use of styles, removal of redundant default properties).
...
This was SVN commit r2478.
2005-07-11 01:29:14 +00:00
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
