Compare commits

...

1273 Commits

Author SHA1 Message Date
Ykkrosh a4637c25d0 Fix no-PCH builds
This was SVN commit r9786.
2011-07-08 15:07:08 +00:00
Pureon dff4add6a6 Making unfinished Neareastern Badlands map hidden
This was SVN commit r9784.
2011-07-07 23:25:53 +00:00
historic_bruno e0eed68835 Sets default single player map to Acropolis II (also moves these constants to the top of gamesetup.js for clarity)
This was SVN commit r9783.
2011-07-07 23:16:09 +00:00
Ykkrosh 1771545a3b Stop BuildingAI picking up messages for other components' range queries
This was SVN commit r9782.
2011-07-07 23:07:36 +00:00
historic_bruno e705e366d6 Fixes missing templates in Peloponnese map
This was SVN commit r9781.
2011-07-07 22:54:14 +00:00
Ykkrosh db9e05d83e Bump version number
This was SVN commit r9780.
2011-07-07 22:21:34 +00:00
Ykkrosh 58c33071d6 Disable unnecessary noisy AI greeting message
This was SVN commit r9779.
2011-07-07 22:18:55 +00:00
Ykkrosh 871d321050 Fix undefined property warning
This was SVN commit r9778.
2011-07-07 22:14:37 +00:00
Ykkrosh 6371afbc76 Remove the rarely-used source code option from the Windows installer. See #855.
This was SVN commit r9777.
2011-07-07 20:11:47 +00:00
Ykkrosh b6d04004b6 Avoid errors when using planes in formations, by not allowing them to join formations
This was SVN commit r9776.
2011-07-07 17:05:22 +00:00
Mythos_Ruler 519b0020ba Updated text from "Super" to "Champion."
This was SVN commit r9775.
2011-07-07 07:56:43 +00:00
Mythos_Ruler bc7991028b Preliminary Carthaginian stuff. Will move Carthage to Public very soon after Alpha VI release.
This was SVN commit r9774.
2011-07-07 06:58:26 +00:00
Mythos_Ruler fed5830189 Updated shield pattern.
This was SVN commit r9773.
2011-07-07 06:06:07 +00:00
Mythos_Ruler c1eb1c3b7a Fixed portrait.
This was SVN commit r9771.
2011-07-07 03:54:14 +00:00
Mythos_Ruler 65baa6d567 Quick update to Acropolis II
This was SVN commit r9770.
2011-07-07 03:18:30 +00:00
Ykkrosh 899f5105b9 Fix glwprintf errors on OS X with non-ASCII strings, by setting LC_CTYPE to UTF-8
This was SVN commit r9768.
2011-07-06 21:19:59 +00:00
Ykkrosh e9b3bcf467 Disable building Atlas by default on OS X
This was SVN commit r9766.
2011-07-06 20:14:25 +00:00
Jubal df9270a892 Hopefullyfixeslag.
This was SVN commit r9765.
2011-07-06 18:04:30 +00:00
historic_bruno 1bc2db56ea Stops unit following when other object selected. Fixes #775
This was SVN commit r9764.
2011-07-05 21:29:11 +00:00
Mythos_Ruler d2d631d2ed This was SVN commit r9763. 2011-07-05 06:00:52 +00:00
Mythos_Ruler ba52ff7604 made Triremes and Quinquiremes able to garrison siege engines.
Added some sound stuff to all siege weapons.

Tweaked siege tower.

This was SVN commit r9762.
2011-07-05 05:59:28 +00:00
Ykkrosh 315dfbff5d Fix use of outdated cached transform when computing bounding boxes.
Should fix #867.

This was SVN commit r9761.
2011-07-05 00:12:00 +00:00
historic_bruno c766f40da3 Changes Cantabrian Highlands random map to temperate biome
This was SVN commit r9760.
2011-07-04 23:54:04 +00:00
Pureon f8c62201b2 Siege tower update
This was SVN commit r9759.
2011-07-04 20:50:52 +00:00
Jubal 2763c7817d In theory, should make buildings point in the right direction.
This was SVN commit r9758.
2011-07-04 17:40:13 +00:00
Ykkrosh 528b833db0 Fix assertion failure in replay mode
This was SVN commit r9757.
2011-07-04 15:17:46 +00:00
Mythos_Ruler fc2b89a780 This was SVN commit r9756. 2011-07-03 23:23:01 +00:00
Mythos_Ruler 3c6789747b This was SVN commit r9755. 2011-07-03 22:32:26 +00:00
Mythos_Ruler 9d7a5da65a #New Thracian unit.
Tweaked Acropolis II.

This was SVN commit r9754.
2011-07-03 22:26:12 +00:00
Ykkrosh f01097b23c Avoid crash when pressing 'h' while multiplayer host game setup screen is loading
This was SVN commit r9753.
2011-07-03 18:36:43 +00:00
Jubal 4065cb1cd2 Few minor tweaks.
This was SVN commit r9750.
2011-07-03 09:43:31 +00:00
Jubal b4d0c09569 Building directions now 100% random. Can set it to a specific angle if we'd prefer, but someone needs to tell me what.
This was SVN commit r9749.
2011-07-03 08:46:30 +00:00
Mythos_Ruler c9b2273532 Fixed an error with the Iberian fortress.
This was SVN commit r9748.
2011-07-03 07:52:52 +00:00
Mythos_Ruler f138be6565 #New Greek shields patterns.
This was SVN commit r9747.
2011-07-03 06:10:02 +00:00
historic_bruno 972ca3cd22 Increases unit selection limit to 200 (equal to max population). See #789
This was SVN commit r9745.
2011-07-02 23:04:59 +00:00
Pureon 3da5afd8d5 Stop siege tower garrisoning itself inside itself
This was SVN commit r9744.
2011-07-02 22:52:17 +00:00
Mythos_Ruler 5c4b6e2320 Fixes #878
This was SVN commit r9743.
2011-07-02 22:26:51 +00:00
Mythos_Ruler 9b601d7ad4 Map updates to fix moved templates.
This was SVN commit r9741.
2011-07-02 17:47:23 +00:00
Mythos_Ruler 12eb4919be Stone and Metal added.
This was SVN commit r9740.
2011-07-02 17:17:07 +00:00
Jubal 9a6f90b90d This was SVN commit r9739. 2011-07-02 16:57:51 +00:00
Jubal 3756aaef48 This might help speed a fraction.
This was SVN commit r9738.
2011-07-02 16:49:26 +00:00
Jubal 6267a61962 This was SVN commit r9737. 2011-07-02 15:32:16 +00:00
Jubal 7bba760801 This was SVN commit r9736. 2011-07-02 15:29:20 +00:00
Jubal f1eb662cf6 This was SVN commit r9735. 2011-07-02 15:29:08 +00:00
Jubal 8612600a13 This was SVN commit r9734. 2011-07-02 15:27:35 +00:00
Pureon 5183a5d4de Mechanical siege tower update
This was SVN commit r9733.
2011-07-02 11:56:57 +00:00
Pureon 4139140916 # Giraffe, giraffe infant, lion, and lioness movement animations by Athos
This was SVN commit r9732.
2011-07-02 10:37:45 +00:00
Pureon f833529e63 skeletons xml update
This was SVN commit r9731.
2011-07-02 10:17:10 +00:00
Mythos_Ruler 885c220e9f This was SVN commit r9730. 2011-07-02 06:15:35 +00:00
Mythos_Ruler 8da4334a85 Re-skinned Belgian Bog.
This was SVN commit r9729.
2011-07-02 02:06:41 +00:00
Mythos_Ruler fa812a5ac5 A bunch of texture additions and changes, mostly to temperate terrains.
This was SVN commit r9728.
2011-07-02 02:04:15 +00:00
Mythos_Ruler 805dbe7640 Some new Greek shields.
This was SVN commit r9727.
2011-07-02 01:46:19 +00:00
historic_bruno 4d188452f8 Adds ownership checks to UI selections.
Adds ownership and diplomacy checks to Commands.js (fixes #880).
Adds control all units setting to Player component (network synced).
Adds helpers for diplomacy checks - use these instead of directly
accessing diplomacy array.
Fixes tests according to these changes.

This was SVN commit r9726.
2011-07-02 00:06:39 +00:00
historic_bruno 24f981cb2c Adds hack for random map data saved as typed arrays (see #658)
This was SVN commit r9725.
2011-06-30 23:09:59 +00:00
Mythos_Ruler 3dc70800ee Changed tooltip to reflect the current uselessness of this structure.
This was SVN commit r9724.
2011-06-30 21:56:51 +00:00
Mythos_Ruler c7fd1eaaf2 Tweaking some temperate terrains.
This was SVN commit r9723.
2011-06-29 04:49:25 +00:00
Mythos_Ruler 834271b878 Some updated maps.
This was SVN commit r9722.
2011-06-29 02:49:41 +00:00
historic_bruno 6ba00117e0 Fixes bug in Atlas player editor: saving team as "None" had no effect
This was SVN commit r9721.
2011-06-29 00:57:02 +00:00
Ykkrosh 996a32125c Add per-player LOS-reveal flag.
Reveal LOS for Gaia and AI players (fixes #879).
Use player_id_t slightly more consistently in interfaces.

This was SVN commit r9720.
2011-06-28 23:24:42 +00:00
janwas d9c944c975 fix one last super_unit - at least given the following search criteria:
Find all "super_unit", Match case, Subfolders, Find Results 1,
"0ad\svn\binaries\data", "*.xml;*.xsl;*.xslt;*.xsd;*.dtd"
0ad\svn\binaries\data\mods\public\art\actors\units\celts\boudicca_chariot.xml(16):
<prop actor="units/celts/super_unit_4_d.xml" attachpoint="driver"/>

This was SVN commit r9717.
2011-06-28 19:32:49 +00:00
Pureon 7ee28348ec Garrison multiplier for hele siege tower
This was SVN commit r9716.
2011-06-28 19:11:46 +00:00
Ykkrosh 709260e339 Fix occasional script error with planes
This was SVN commit r9715.
2011-06-28 18:26:29 +00:00
Ykkrosh 151539a92b Fix #882 (test failure)
This was SVN commit r9714.
2011-06-28 18:25:38 +00:00
Chakakhan 293adad0ba Fix #829 - Stuck units bug
This was SVN commit r9713.
2011-06-28 07:27:03 +00:00
Mythos_Ruler da79f8edbe Last Champion fix. Or is it? <_<
This was SVN commit r9712.
2011-06-28 04:46:44 +00:00
Mythos_Ruler f0c2c15d3f Champion fix for this unit.
This was SVN commit r9711.
2011-06-28 04:42:02 +00:00
Mythos_Ruler 7f79dcd379 Champion FIX for maps.
This was SVN commit r9710.
2011-06-28 04:28:09 +00:00
Mythos_Ruler 91a972238a Champion FIXES commit.
This was SVN commit r9709.
2011-06-28 04:19:01 +00:00
Mythos_Ruler 520788cafb Champions. Commit #3.
This was SVN commit r9708.
2011-06-28 04:02:54 +00:00
Mythos_Ruler ac0576f326 Champions. Commit #2.
This was SVN commit r9707.
2011-06-28 03:56:04 +00:00
Mythos_Ruler 75c1ae84d5 This was SVN commit r9706. 2011-06-28 03:30:35 +00:00
Mythos_Ruler d8725c1df7 This was SVN commit r9705. 2011-06-28 03:29:12 +00:00
Mythos_Ruler f3fe7aaa67 Changing nomenclature from "Super Units" to "Champions." Commit Part 1.
This was SVN commit r9704.
2011-06-28 03:24:50 +00:00
Mythos_Ruler c2f9496a4f Temp solution to Ship finished sound.
This was SVN commit r9703.
2011-06-28 01:52:40 +00:00
Mythos_Ruler f4e773f7ba Celt Temple costs Wood, not Stone.
Greek Fortress builds the new Greek siege tower.

Females have order acknowledgments. This is a temp solution until we
have dedicated female sounds.

Added verbal acknowledgments to the Priests as well.

Siege Tower stat tweaks.

This was SVN commit r9702.
2011-06-28 01:50:42 +00:00
Mythos_Ruler 85e49e9d13 Fixed a team error on the map.
This was SVN commit r9701.
2011-06-28 01:30:58 +00:00
WhiteTreePaladin 7baab8e221 Moved stances and idle worker button to more appropriate locations
This was SVN commit r9700.
2011-06-28 01:09:55 +00:00
historic_bruno a8fdcfde59 Fixes broken autostart for random maps with AI
This was SVN commit r9699.
2011-06-27 23:27:25 +00:00
Mythos_Ruler bdde44d9aa Balancing war elephants.
This was SVN commit r9698.
2011-06-27 22:43:36 +00:00
Pureon a7ea5ed3ae Hele siege tower basic setup
This was SVN commit r9697.
2011-06-27 22:43:03 +00:00
Mythos_Ruler 20030f1515 This was SVN commit r9696. 2011-06-27 22:41:17 +00:00
Mythos_Ruler d78d4f7169 # Moved Roman and Carthaginian Champion Units to Public.
This was SVN commit r9695.
2011-06-27 22:23:03 +00:00
Mythos_Ruler c276a45fae Tweaked Greek Farmstead and Gymnasion.
This was SVN commit r9694.
2011-06-27 21:45:37 +00:00
Pureon 552d81e1c9 Temple select OGG file update
This was SVN commit r9693.
2011-06-27 20:01:44 +00:00
Pureon aef4db11c0 Sound effects for wall gate
This was SVN commit r9691.
2011-06-27 19:56:29 +00:00
Mythos_Ruler f044c7f6df This was SVN commit r9690. 2011-06-27 06:55:13 +00:00
Mythos_Ruler c8f63fc366 Updated license wording for CGTextures.
This was SVN commit r9689.
2011-06-27 05:47:25 +00:00
Mythos_Ruler 0ff7997d9f Moving the last of the terrains.
This was SVN commit r9688.
2011-06-27 05:39:53 +00:00
Mythos_Ruler 2c9835cbc4 Moving and deleting terrains.
This was SVN commit r9687.
2011-06-27 05:11:17 +00:00
Mythos_Ruler 27b68a5a88 Deleting from Internal
This was SVN commit r9686.
2011-06-27 04:51:29 +00:00
Mythos_Ruler 25bbfb81c4 This was SVN commit r9685. 2011-06-27 04:50:25 +00:00
Mythos_Ruler 89d388669d This was SVN commit r9684. 2011-06-27 04:28:30 +00:00
Mythos_Ruler 2e1200fa8c This was SVN commit r9683. 2011-06-27 04:27:08 +00:00
Mythos_Ruler 0503fea0d8 This was SVN commit r9682. 2011-06-27 04:25:11 +00:00
Mythos_Ruler 45017504aa This was SVN commit r9681. 2011-06-27 04:22:18 +00:00
Mythos_Ruler 9da83a992e Renaming and deleting some terrains, preparing to move to Public.
This was SVN commit r9680.
2011-06-27 04:17:28 +00:00
Mythos_Ruler b43ca11379 This was SVN commit r9679. 2011-06-27 03:29:34 +00:00
Mythos_Ruler 577aaedc7c Portrait for plane.
This was SVN commit r9678.
2011-06-27 00:41:50 +00:00
Mythos_Ruler a47ef2060a Updated the Plane entity.
This was SVN commit r9677.
2011-06-27 00:32:28 +00:00
Mythos_Ruler a64f1356cb P-51 Mustang
This was SVN commit r9676.
2011-06-27 00:26:33 +00:00
Pureon ff1277d4d8 Barracks select sound fix
This was SVN commit r9675.
2011-06-26 22:46:29 +00:00
Pureon 421df0a53c Selection sound effect xml files updated
This was SVN commit r9674.
2011-06-26 22:36:18 +00:00
Ykkrosh 31832cd9ae Initialise minimap and LOS textures properly
This was SVN commit r9673.
2011-06-26 21:47:07 +00:00
Ykkrosh 3f51747440 Fix uninitialised value
This was SVN commit r9672.
2011-06-26 21:45:58 +00:00
Pureon 9901f47065 Universal select audio file update
This was SVN commit r9671.
2011-06-26 21:06:23 +00:00
Pureon cc70aacdb7 Added new building constructed and selected sound effects
This was SVN commit r9670.
2011-06-26 21:01:16 +00:00
Ykkrosh 1f20444e4c Trigger 'constructed' sound when a building finishes construction
This was SVN commit r9669.
2011-06-26 18:27:10 +00:00
Chakakhan df2e499efc Post code review version - previous commit was pre code review version.
This was SVN commit r9666.
2011-06-26 07:47:03 +00:00
Chakakhan 2aedf48304 #788 Eliminate delay in path finding (and therefore moving)
This was SVN commit r9665.
2011-06-26 07:03:08 +00:00
historic_bruno 5bc125a91f Changes terrain data returned by CMapGenerator to typed arrays, instead of an array of objects (this greatly reduces the size of the serialized data)
This was SVN commit r9664.
2011-06-26 02:56:54 +00:00
Badmadblacksad d89eafaf83 stances improvement and bugfixing. units now targets buildings last, after workers, and after every other units.
This was SVN commit r9663.
2011-06-26 02:03:36 +00:00
Mythos_Ruler 95756627ec New aeroplane stuff.
Polishing up the Persian cataphract.

More edits to Peloponnese map.

This was SVN commit r9662.
2011-06-25 20:57:06 +00:00
Badmadblacksad fed56af8a7 avoid trying to attack (before gathering) for ever an animal which is not visible anymore (bug not yet met because unlikely)
This was SVN commit r9661.
2011-06-25 20:56:46 +00:00
Badmadblacksad c8b0d7c11c fix a small bug related to units stances and gathering
This was SVN commit r9660.
2011-06-25 19:14:08 +00:00
historic_bruno 8bdc1b0882 Enforces max population limit, cleans up population variables in Player component. See #862
Max population defaults to 200

This was SVN commit r9659.
2011-06-25 00:47:46 +00:00
historic_bruno 33e8ac6fa5 Applies Kenny's patch for CInput pasting behavior (fixes #640)
Simplifies some clipboard hotkeys

This was SVN commit r9658.
2011-06-25 00:04:41 +00:00
Ykkrosh 92fcb737cd Attempt minor improvements to stances code (see #865).
Don't chase units that are no longer visible, beyond where they were
last seen (fixes #595).

This was SVN commit r9657.
2011-06-24 12:35:15 +00:00
Mythos_Ruler 4e809a02e8 Moving some prop actors over.
This was SVN commit r9656.
2011-06-24 05:49:22 +00:00
Mythos_Ruler 1bf469755f This was SVN commit r9655. 2011-06-24 05:19:23 +00:00
Mythos_Ruler 99f9d3f159 Bunch of helmet fixes and random other stuff.
This was SVN commit r9654.
2011-06-24 05:18:28 +00:00
Mythos_Ruler 94460f6994 Moved the rest of the props to Public with MOVE command.
Moved Persian Cataphract and War Elephant to Public.

This was SVN commit r9653.
2011-06-24 04:25:02 +00:00
Mythos_Ruler 53d1293da9 Added treasures and other stuff to Peloponnese.
This was SVN commit r9652.
2011-06-24 03:28:54 +00:00
Mythos_Ruler 90a06957e9 This was SVN commit r9651. 2011-06-24 02:49:06 +00:00
Mythos_Ruler 1ce1cfea45 Hero Stars
This was SVN commit r9650.
2011-06-24 02:45:49 +00:00
historic_bruno 195c7a00e9 Adds player settings shortcut to Atlas map panel. Fixes #874
Tweaks some control positions and layouts for consistency

This was SVN commit r9649.
2011-06-23 22:38:26 +00:00
Mythos_Ruler bd80c1ea42 Stars for public heroes *(to be replaced with something better in the future).
This was SVN commit r9648.
2011-06-23 21:26:59 +00:00
Ykkrosh 05898c75d1 # Increase maximum camera distance
This was SVN commit r9647.
2011-06-23 12:52:43 +00:00
janwas 492e49da38 add support for selection and deletion of entire words in text controls (ctrl+backspace/delete/left/right) based on patch by Chakakhan/kenny (thanks!)
also refactored wclipboard
closes #511

This was SVN commit r9646.
2011-06-23 10:12:43 +00:00
historic_bruno 889f4698f2 Moves population bonus to new line in construction tooltip (based on patch from pejuko). Fixes #873
This was SVN commit r9645.
2011-06-22 21:11:37 +00:00
Mythos_Ruler b99b37387b Updated cliff texture. Updated Peloponnese map.
This was SVN commit r9644.
2011-06-22 04:05:42 +00:00
historic_bruno abdc846a65 Adds getInt to AtlasObject
Uses this instead of wxAtoi for consistency, and adds brief comment
about why wxAtof should be avoided

This was SVN commit r9643.
2011-06-21 02:56:49 +00:00
janwas ef4df42895 add support for .dylib on OS X based on patch by Yves (thanks!)
c.f.
http://www.wildfiregames.com/forum/index.php?showtopic=14173&pid=220828&st=0&#entry220828

This was SVN commit r9642.
2011-06-20 20:06:51 +00:00
Mythos_Ruler d41e859b67 #Updated Iberian Corral by Zaggy.
This was SVN commit r9641.
2011-06-20 05:57:45 +00:00
Mythos_Ruler 5005398619 Update to the Peloponnese map. Still incomplete.
This was SVN commit r9640.
2011-06-20 05:57:28 +00:00
Ykkrosh 10481ca174 Avoid potentially dangerous locale-dependent atof functions
This was SVN commit r9639.
2011-06-19 19:51:53 +00:00
Mythos_Ruler 9b930d9617 Test 'selected' stance icon
This was SVN commit r9638.
2011-06-19 19:02:32 +00:00
Ykkrosh 9965c1ef1b Remove label that is no longer labelling anything
This was SVN commit r9636.
2011-06-19 14:55:43 +00:00
Ykkrosh db5e483266 Fix typo in comment
This was SVN commit r9635.
2011-06-19 14:18:07 +00:00
historic_bruno 74f849ad0b Adds message when profiler snapshot is first saved (Shift+F11)
This was SVN commit r9633.
2011-06-17 23:40:13 +00:00
Badmadblacksad e01917b961 Entities faces toward themself. fixed.
This was SVN commit r9632.
2011-06-17 23:08:46 +00:00
Badmadblacksad 71a6775b92 Stances draft, refs #865
This was SVN commit r9631.
2011-06-17 22:13:39 +00:00
Mythos_Ruler 032794b7c8 This was SVN commit r9629. 2011-06-16 22:58:14 +00:00
Mythos_Ruler 578936d7d0 Moved all the Skies to Public.
This was SVN commit r9628.
2011-06-16 22:31:02 +00:00
Mythos_Ruler 86505030cb Made huntable animals easier to kill. We may change this again later, so we can have some hunting techs.
This was SVN commit r9627.
2011-06-16 22:21:37 +00:00
Mythos_Ruler 0dcaa3d9a1 Greece real-world map. Work-In-Progress.
This was SVN commit r9626.
2011-06-16 22:03:26 +00:00
Mythos_Ruler 3a9f7b9884 Some terrain texture updates and moves.
This was SVN commit r9625.
2011-06-16 21:44:08 +00:00
Mythos_Ruler 80391fc30a Cleaning out bad textures. Preparing to move the rest of the good ones to Public.
This was SVN commit r9624.
2011-06-16 21:32:36 +00:00
historic_bruno 3be43ede41 Adds rotation to starting camera (currently unused)
This was SVN commit r9623.
2011-06-16 21:21:33 +00:00
Mythos_Ruler 2fa7c8aeca Moving terrain assets to Public.
This was SVN commit r9622.
2011-06-16 20:12:55 +00:00
historic_bruno 9e486cd6e3 Fixes bug in Atlas camera control (clear button didn't erase the setting)
This was SVN commit r9620.
2011-06-14 01:03:35 +00:00
historic_bruno 3e4d74480d Adds AI control to Atlas player panel
Adds camera control to Atlas player panel
Changes map reader to handle per-player starting camera position. See
#55
Adds entity name filter to Atlas object panel
Fixes bug in Atlas map settings (caused crash when object panel was not
loaded)

This was SVN commit r9617.
2011-06-13 23:32:41 +00:00
WhiteTreePaladin 7e1cbf6ece increase length of main menu version number field to accommodate longer version text
This was SVN commit r9616.
2011-06-11 14:22:03 +00:00
historic_bruno 29edc1b8e9 Delete previous player icon and use Michael's
This was SVN commit r9615.
2011-06-10 21:32:09 +00:00
Mythos_Ruler 543c02c149 This was SVN commit r9614. 2011-06-10 19:16:04 +00:00
Mythos_Ruler ec1e1a4042 Undo and redo icons for Atlas.
This was SVN commit r9613.
2011-06-10 19:00:59 +00:00
Mythos_Ruler b3e7b80b68 New players icon.
This was SVN commit r9612.
2011-06-10 18:50:47 +00:00
historic_bruno 4a3230a870 This was SVN commit r9610. 2011-06-09 23:52:29 +00:00
historic_bruno 0c803f99e8 This was SVN commit r9609. 2011-06-09 23:47:20 +00:00
historic_bruno 23f1072a2e Adds player editor to Atlas scenario editor. See #91
Fixes object panel so the list of players updates correctly.
Atlas map settings are now observable and shared between various panels.
Fixes panels for maps missing settings (caused JSON error)
Changes map reader so that entities with invalid players cause a warning
but are not added to the game. That prevents further errors. Fixes #869
Uses map size choices from simulation/data/map_sizes.json instead of
multiple locations. Fixes #787
Prepares Atlas map settings for undo/redo support

This was SVN commit r9608.
2011-06-09 23:45:12 +00:00
Ykkrosh 266977bc78 Attempt to fix manifest problems in autobuild.
This was SVN commit r9607.
2011-06-09 23:16:27 +00:00
Ykkrosh 2c58b07223 # Add experimental fighter planes.
This was SVN commit r9605.
2011-06-09 19:44:40 +00:00
Ykkrosh 1357000401 Fix #805 more so it doesn't ignore the second click on non-double-clickable buttons.
This was SVN commit r9604.
2011-06-09 17:30:34 +00:00
Ykkrosh 7b8a33f374 Fix tests.
This was SVN commit r9603.
2011-06-09 17:15:01 +00:00
Ykkrosh 5132f814e3 Clean up some formatting and comments.
This was SVN commit r9602.
2011-06-09 17:01:01 +00:00
Ykkrosh 902b33a181 Remove redundant code for animal fleeing, and don't omit expected arguments.
This was SVN commit r9601.
2011-06-09 16:41:55 +00:00
Ykkrosh 28d952404e Improve selection details debug display.
This was SVN commit r9600.
2011-06-09 16:40:29 +00:00
Ykkrosh 8720b4a220 Fix Atlas saving game type under wrong property name.
This was SVN commit r9599.
2011-06-09 16:39:31 +00:00
Mythos_Ruler 8eadd4e25f #Ship balance.
This was SVN commit r9598.
2011-06-09 05:06:34 +00:00
Mythos_Ruler 24b0e1cafb This was SVN commit r9597. 2011-06-08 21:12:57 +00:00
Mythos_Ruler f1c1f400c9 Lots of Helmet stuff.
This was SVN commit r9596.
2011-06-08 07:18:52 +00:00
Badmadblacksad 24cca252e3 Ranged units always face their targets when attacking. fixes #831
This was SVN commit r9595.
2011-06-06 22:08:26 +00:00
Badmadblacksad 43d817bc22 --
This was SVN commit r9593.
2011-06-06 19:39:19 +00:00
Badmadblacksad 9906a86a2e Support double-click on unit group buttons. patch by Merolum. fixes #805.
This was SVN commit r9592.
2011-06-06 19:31:34 +00:00
Mythos_Ruler 6b0cbd10c3 Finished the new Cycladic Archipelago map.
Added promotion animations to some units.

Added triple-click to Hypaspists and Roman Legions.

This was SVN commit r9591.
2011-06-06 00:46:58 +00:00
Mythos_Ruler 18dd17ea4a fixed a Scipio animation problem. Edited some Roman stuff.
This was SVN commit r9590.
2011-06-05 23:54:01 +00:00
Mythos_Ruler d0560bd93e Playtesting a water map, I came to the conclusion that ships took way too long to build.
This was SVN commit r9589.
2011-06-05 20:38:01 +00:00
Badmadblacksad 304d4e82f0 (minor) fix an animation event value
This was SVN commit r9588.
2011-06-05 20:03:44 +00:00
Mythos_Ruler d892403f90 Adjusted the look of the Persian temple.
This was SVN commit r9587.
2011-06-05 05:57:28 +00:00
Mythos_Ruler 091cba16c6 Flipped the Iberian Civ Centre so it faces the correct way.
This was SVN commit r9585.
2011-06-05 01:52:25 +00:00
Mythos_Ruler 916b4b7e92 Pureon's map, with my edits. Now turning it back over to him for his own edits.
This was SVN commit r9584.
2011-06-04 04:19:36 +00:00
Mythos_Ruler 97528d25f1 This was SVN commit r9583. 2011-06-04 03:14:49 +00:00
janwas 6feb143e61 OS X compile fix
This was SVN commit r9582.
2011-05-30 23:06:16 +00:00
janwas ef74ad7f7b OS X compile fix (hopefully): add definition for O_DIRECT
This was SVN commit r9581.
2011-05-30 21:49:33 +00:00
janwas 034881d30c sync with work. simplify wnuma, refactor+fix topology (bugs: APIC IDs array didn't correspond to OS processor number; couldn't handle noncontiguous APIC ID field values)
This was SVN commit r9580.
2011-05-30 13:00:20 +00:00
Ykkrosh f25407e7fb Fix typo
This was SVN commit r9579.
2011-05-30 11:51:14 +00:00
Mythos_Ruler 8ecf3aa1b5 Bumped up the Wood in trees from 150 to 200.
Reoriented the Carthaginian House C to face South East.

Working on a new version of Cycladic Archipelago II.

This was SVN commit r9578.
2011-05-30 01:50:49 +00:00
Ykkrosh ce647cf8e3 Add a manifest hack to fix building in VC2008+, when loading DLLs built in VC2005
This was SVN commit r9576.
2011-05-29 21:13:21 +00:00
Ykkrosh 59124006c8 Work around problem with quote keys in Windows on an Apple machine
This was SVN commit r9575.
2011-05-29 21:12:09 +00:00
Ykkrosh c2677b4bb0 Upgrade game and build system to ENet 1.3
This was SVN commit r9574.
2011-05-29 20:57:28 +00:00
janwas e3d87b0375 remove no longer necessary lowlevel wsock implementation (superseded by enet) since the delay load hook isn't compatible with a DLL packaging of enet.
-> cstr serialization uses lib/byte_order.h instead of htons; removed
hostname/IP from system_info (Philip agrees its utility is negligible)

This was SVN commit r9572.
2011-05-29 19:59:51 +00:00
Ykkrosh acb48663d7 Windows fixes
This was SVN commit r9570.
2011-05-29 18:14:52 +00:00
Ykkrosh 6bdafee6a0 Update Atlas sidebar buttons slightly
This was SVN commit r9569.
2011-05-29 16:36:15 +00:00
Ykkrosh fa7855f3d9 Delete now-unused wxJavaScript library
This was SVN commit r9568.
2011-05-29 15:46:07 +00:00
Ykkrosh a81f180dd6 Remove Atlas UI scripting support
This was SVN commit r9567.
2011-05-29 15:43:08 +00:00
Ykkrosh dc2035efc9 Move Atlas map settings from JS to C++.
Replace New dialog box with separate tools for resizing maps and
replacing terrain textures, to provide more power and to simplify the
problem of initialising map settings.
Fix engine to cope with dynamic map resizing.
Add JSON support to AtObj, to let C++ interact with JSON more easily.

This was SVN commit r9566.
2011-05-29 15:02:02 +00:00
Ykkrosh 1618aa9c36 Add missing file for actor viewer
This was SVN commit r9565.
2011-05-29 14:57:54 +00:00
Mythos_Ruler f1c4904071 Map tweaks.
Rain particle experiment.

This was SVN commit r9564.
2011-05-28 21:21:36 +00:00
Mythos_Ruler ea36fdad2d New forestfloor texture for Mediterranean biome.
This was SVN commit r9563.
2011-05-28 16:56:59 +00:00
Mythos_Ruler bb5a66ac35 Moved Gambia River map to Public.
Moved Fog sky to Public.
Made separate fish entities.

This was SVN commit r9562.
2011-05-28 03:16:26 +00:00
Mythos_Ruler 0f616d42c6 This was SVN commit r9561. 2011-05-28 03:09:40 +00:00
Mythos_Ruler 9b70228997 Updated the terrains of The Massacre of Delphi.
New "Gambia River" map using Tropic terrains.

This was SVN commit r9560.
2011-05-28 02:47:17 +00:00
Ykkrosh 07e307c49a Move Atlas's terrain and object sections from JS back into C++, per http://www.wildfiregames.com/forum/index.php?showtopic=14741
This was SVN commit r9559.
2011-05-27 21:56:43 +00:00
Ykkrosh 4496fcd2df Restore some old Atlas files
This was SVN commit r9558.
2011-05-27 21:48:23 +00:00
Ykkrosh 755802d0ce Fix build errors
This was SVN commit r9556.
2011-05-27 13:32:34 +00:00
historic_bruno 5da713af2f Removes debugging output from Latium rms
This was SVN commit r9555.
2011-05-27 03:55:01 +00:00
historic_bruno 1bf2598429 Fixes square maps to behave like circular maps and fit within the circle. Fixes #822
This was SVN commit r9554.
2011-05-27 03:04:59 +00:00
Mythos_Ruler 293f7cbae0 This was SVN commit r9553. 2011-05-26 03:16:14 +00:00
Mythos_Ruler a3705a7d11 Updated SMOKE particles. They look much much nicer now. Enjoy!
This was SVN commit r9552.
2011-05-26 02:27:34 +00:00
Mythos_Ruler 2c05745c7d Flipped the Celt Barracks so it points to the "front" where units come out.
This was SVN commit r9551.
2011-05-26 00:44:58 +00:00
janwas 34186dd017 refactor file interface. requires workspace update
- separate file_system_util into vfs functions (-> vfs/vfs_util) and
file_system (avoids ugly fs_util namespace prefix)
- get rid of non-portable O_BINARY_NP etc. flags
- use standard O_WRONLY etc. flags instead of LIO_WRITE; but avoid the
need for specifying O_CREAT|O_TRUNC
- only open files for aio when O_DIRECT is specified (which 0ad does
not) - avoids wasting time and security issues
- return file descriptor directly instead of via output param
- waio: safer FCB mechanism that avoids mixing descriptors between lowio
and aio

This was SVN commit r9550.
2011-05-25 10:39:13 +00:00
Mythos_Ruler ceea205782 This was SVN commit r9549. 2011-05-25 05:45:49 +00:00
janwas 7600c3862b refactor gfx detection code (interface), allow exporting from DLL (required at work)
This was SVN commit r9546.
2011-05-24 14:17:47 +00:00
janwas f1a1f023df reinstate aligned_allocator.h (required at work)
further fixes to preserve the last error while building error messages
somewhat more accurate NUMA factor computation

This was SVN commit r9545.
2011-05-23 14:10:45 +00:00
Mythos_Ruler d7f4935dce This was SVN commit r9544. 2011-05-23 01:50:45 +00:00
Mythos_Ruler 2239a261ee Last new Greek house variant.
This was SVN commit r9543.
2011-05-23 01:48:22 +00:00
Mythos_Ruler 003037e102 Moves "new" terrains elsewhere and reverted the Medit terrains back. I wasn't happy with how the new ones were blending with all the other textures and realized I'd have to redo all the others as well.
This was SVN commit r9542.
2011-05-22 01:59:15 +00:00
Mythos_Ruler 501f72ec0c Map updates. Terrain updates.
This was SVN commit r9541.
2011-05-21 05:51:28 +00:00
Mythos_Ruler 171917d0c6 Terrain updates
This was SVN commit r9540.
2011-05-21 02:21:38 +00:00
Mythos_Ruler 2c6fc32a57 This was SVN commit r9539. 2011-05-20 19:37:59 +00:00
Mythos_Ruler 2f94551716 New Greek house by Privateer! Good work. Test "hero star" for Themistocles.
This was SVN commit r9537.
2011-05-20 15:48:12 +00:00
Ykkrosh 84030de9b7 Fix compile error with Boost 1.39 (ambiguous overloads)
This was SVN commit r9536.
2011-05-20 14:45:04 +00:00
Mythos_Ruler 608db46c16 Tweaks to the map
This was SVN commit r9535.
2011-05-18 20:17:42 +00:00
Ykkrosh 1075e206f7 Fix some format string errors
This was SVN commit r9534.
2011-05-18 19:10:36 +00:00
Badmadblacksad 069f567f7e check that enemy units don't leave foundations. based on patch from Stork. fixes #724
This was SVN commit r9532.
2011-05-17 20:30:21 +00:00
Badmadblacksad 1fac936d68 fixes a bug related to foundations and animals corpses (previously, when an animal has already been ordered to leave a foundation once, it will not leave the construction site if you place an another building on top of it).
This was SVN commit r9531.
2011-05-17 16:26:47 +00:00
Mythos_Ruler ea455fa983 Fixed some issues with Belgian Bog
This was SVN commit r9529.
2011-05-16 15:09:06 +00:00
Ykkrosh a6d519e70f Fix #779 differently, to avoid problems with building on top of cheering units
This was SVN commit r9528.
2011-05-15 23:51:51 +00:00
Ykkrosh fd65a492d9 Add button to promote selected units, for testing
This was SVN commit r9527.
2011-05-15 21:53:24 +00:00
historic_bruno b9f04a3d27 Fixes some scenario bugs. Fixes #856, #857
This was SVN commit r9526.
2011-05-15 20:43:34 +00:00
Badmadblacksad d5d5fd3b7d units are not stuck on construction sites anymore. fixes #779
This was SVN commit r9525.
2011-05-15 20:30:54 +00:00
Ykkrosh 6539456746 Fix format string
This was SVN commit r9524.
2011-05-15 19:52:46 +00:00
Ykkrosh f4b55a9acf Fix non-PCH build
This was SVN commit r9523.
2011-05-15 19:51:33 +00:00
Mythos_Ruler 87a44a6b38 This was SVN commit r9522. 2011-05-15 18:17:41 +00:00
Mythos_Ruler 0eae00d75d Moved Rome struct texture from Internal to Public (so OSers can work on Roman buildings if they want). Updated a terrain.
This was SVN commit r9521.
2011-05-15 17:17:21 +00:00
janwas 0ea42d3185 avoid stomping on the last error while dumping stack
refs #849

This was SVN commit r9519.
2011-05-15 00:00:01 +00:00
Mythos_Ruler 886bc301d9 This was SVN commit r9518. 2011-05-14 23:26:37 +00:00
Jubal 65b75fbb7f Small fix, it now shuffles troops round the CC every minute or so to avoid issues with gatherers not being able to get in. Crappy way of doing it, but should solve the problem 90+% of the time.
This was SVN commit r9517.
2011-05-14 20:31:33 +00:00
janwas 45d358dd9a add code to output both affected paths in case separators are being mixed
This was SVN commit r9516.
2011-05-14 20:25:32 +00:00
Ykkrosh 2dff290c28 Fix entity validation errors
This was SVN commit r9515.
2011-05-14 19:15:43 +00:00
Ykkrosh 05688548d0 Fix a bogus Doxygen comment
This was SVN commit r9513.
2011-05-14 17:27:14 +00:00
Ykkrosh a976045f0f Report filename in Collada warning messages.
Skip harmless warnings about missing materials in Collada files.

This was SVN commit r9512.
2011-05-14 16:43:08 +00:00
janwas 963960fafa no longer warn when SetFileValidData fails, as it does on all FAT volumes (boo)
fixes #849

This was SVN commit r9511.
2011-05-14 10:37:42 +00:00
Ykkrosh edd8ef2bf2 Fix units in formation blocking construction and not moving out of the way (see #779).
Make non-movement-blocking buildings (e.g. farms) not require units to
move out of the way.

This was SVN commit r9510.
2011-05-13 20:32:41 +00:00
Ykkrosh c41b7904d2 Fix burst of particles when starting to construct a building.
Fix crash when particle XML loading failed.

This was SVN commit r9509.
2011-05-13 19:36:56 +00:00
Ykkrosh 03b87f9a8d Fix typo
This was SVN commit r9508.
2011-05-13 19:32:19 +00:00
Ykkrosh 123c00763a Use JuBot by default.
Fixes #774.

This was SVN commit r9507.
2011-05-12 23:55:35 +00:00
Ykkrosh b741feafb1 Add global deepcopy() function in scripts, to do a structured clone of objects.
Remove an unused include.

This was SVN commit r9506.
2011-05-12 23:50:42 +00:00
historic_bruno ff7cc75055 Fixes garrisoning bug (units don't have to approach buildings in order to garrison)
This was SVN commit r9505.
2011-05-12 21:48:59 +00:00
Ykkrosh ba66de2143 Fix #835 more comprehensively (the same bug affects other actions performed on nearby targets while moving)
This was SVN commit r9504.
2011-05-12 21:27:15 +00:00
Mythos_Ruler 6b499bdc8a Armour for Persian cataphract.
This was SVN commit r9503.
2011-05-12 05:10:56 +00:00
Mythos_Ruler fc9a9789e0 Extra starting resources for Median Oasis.
Added XP value to mechanical units.

This was SVN commit r9502.
2011-05-12 03:59:01 +00:00
Badmadblacksad 8a434aae1b Ensure units don't move while gathering. fixes #835
This was SVN commit r9501.
2011-05-11 19:34:39 +00:00
Mythos_Ruler b96a3f74c2 This was SVN commit r9500. 2011-05-11 17:05:21 +00:00
Badmadblacksad afd8a79f9c fix #842
This was SVN commit r9499.
2011-05-11 16:10:40 +00:00
historic_bruno 025a00340e Fixes garrisoned units being found as idle (even if they are, we can't select them, so skip them instead). Fixes #844.
Garrisoned units now remain in the GARRISONED state until explicitly
ungarrisoned

This was SVN commit r9498.
2011-05-11 04:05:05 +00:00
Mythos_Ruler cda5c5f5c9 Promotion stuff.
This was SVN commit r9497.
2011-05-09 07:32:57 +00:00
Mythos_Ruler aad79f54d1 This was SVN commit r9496. 2011-05-09 07:26:03 +00:00
Mythos_Ruler 14ecca8052 Lots of work on Temperate and Tropical biome terrains.
This was SVN commit r9495.
2011-05-09 06:37:17 +00:00
Ykkrosh 1420a229ff Fix various position-related errors with garrisoned units.
Fix some formatting consistency.

This was SVN commit r9494.
2011-05-09 02:02:00 +00:00
Mythos_Ruler 33a2a50d2c This was SVN commit r9493. 2011-05-09 01:45:47 +00:00
Mythos_Ruler 84817e1a6f Updated some cavalry attack event times.
This was SVN commit r9492.
2011-05-09 01:22:44 +00:00
historic_bruno 834b3fc134 This was SVN commit r9491. 2011-05-08 22:56:00 +00:00
historic_bruno 2eeaf9f5af Deleting broken audio files (to be replaced next)
This was SVN commit r9490.
2011-05-08 22:53:57 +00:00
janwas 452670738a fix StatusDescription (remove unnecessary and wrong cast)
This was SVN commit r9489.
2011-05-08 20:09:31 +00:00
Mythos_Ruler cf80b9bb97 Fixed a bunch of trees being Player 1
This was SVN commit r9488.
2011-05-08 16:16:27 +00:00
Mythos_Ruler 4ca43e453e Made aggressive animals a little more formidable. Previously they only has 1H1P attack.
This was SVN commit r9487.
2011-05-08 16:12:47 +00:00
Mythos_Ruler 8be54aac90 This was SVN commit r9486. 2011-05-08 15:23:34 +00:00
janwas 9b7cdef124 ensure WHRT debug messages are always displayed (in case of compatibility trouble)
refs #709

This was SVN commit r9485.
2011-05-08 09:14:21 +00:00
OmriLahav 2ed0c665b6 Updated Ogg file size.
This was SVN commit r9483.
2011-05-08 08:10:05 +00:00
Mythos_Ruler 343101588b This was SVN commit r9482. 2011-05-08 05:23:26 +00:00
Mythos_Ruler 821556c50e This was SVN commit r9481. 2011-05-08 04:27:12 +00:00
Mythos_Ruler a0de656c60 Updated description.
This was SVN commit r9480.
2011-05-08 04:22:36 +00:00
Mythos_Ruler be5e4933d8 Added shields to Celt cav skirmisher Advanced and Elite to differentiate from the Basic.
Finalized Acropolis II. Please playtest. It's a 1v1 acropolis-style map
with the Mediterranean assets.

This was SVN commit r9479.
2011-05-08 04:19:05 +00:00
Mythos_Ruler ede48a077b Edited some actors so that the melee sound effect happens at the correct time. I may need to go through all of the melee cavalry unit actors and do this.
New Acropolis II map for Alpha 5. Nearly complete. Is already playable.

This was SVN commit r9478.
2011-05-08 03:24:12 +00:00
janwas 7ed9a84252 avoid double-free when sounds are reclaimed and then freed.
fixes #833

This was SVN commit r9477.
2011-05-07 17:34:47 +00:00
janwas b82913ea14 make explicit that both iterator debugging and _SECURE_SCL (which is less than iterator debugging) are disabled in release builds
This was SVN commit r9476.
2011-05-07 16:46:28 +00:00
janwas 46e5db4dc4 fix build with ICC
This was SVN commit r9475.
2011-05-07 15:47:20 +00:00
WhiteTreePaladin 9837e23808 Changed release name
This was SVN commit r9474.
2011-05-07 15:23:11 +00:00
WhiteTreePaladin 1a17fde105 Change health bar tooltip from hitpoints to health
This was SVN commit r9473.
2011-05-07 02:57:23 +00:00
Ykkrosh c49f4c677b Fix bogus error messages when errno=0
This was SVN commit r9472.
2011-05-07 00:14:43 +00:00
Ykkrosh 5bda00c230 Fix test
This was SVN commit r9471.
2011-05-07 00:14:17 +00:00
historic_bruno 0fc0335285 Tweaks resources in all random maps.
Updates progress steps for random maps.
Latium is not circular, so explicitly set that.
Fixes some weirdness with Atlas random map generation.

This was SVN commit r9470.
2011-05-06 23:50:30 +00:00
Ykkrosh f6ffe7f121 Fix triple-click's accepted inter-click timing to match double-click's
This was SVN commit r9468.
2011-05-06 22:24:03 +00:00
Ykkrosh cd7abda9f1 Handle triple-click selections a bit more efficiently
This was SVN commit r9467.
2011-05-06 22:22:56 +00:00
Ykkrosh b2bf04c5ae Reduce projectile decay time
This was SVN commit r9466.
2011-05-06 21:53:33 +00:00
Ykkrosh e90470020b Try to make the pathfinder less likely to get stuck
This was SVN commit r9465.
2011-05-06 21:52:15 +00:00
Mythos_Ruler c1ed608291 Modified starting resources.
This was SVN commit r9464.
2011-05-06 19:35:34 +00:00
Mythos_Ruler 05cf7d0249 Added a new "bridge" across the center and some eye candy stuff. :)
This was SVN commit r9463.
2011-05-06 19:10:37 +00:00
janwas f608b44d1d fix self-test and map load on Windows (avoid mixing dir separators).
add more specific error codes (used at work)

This was SVN commit r9462.
2011-05-06 18:45:30 +00:00
Mythos_Ruler e7e2e03bb9 Changed tooltip to read "Experience" instead of simply "XP." This is to help spell it out better for the players who may not be familiar with our internal nomenclature.
This was SVN commit r9461.
2011-05-06 18:29:01 +00:00
Ykkrosh 15e4500a01 Fix tests
This was SVN commit r9460.
2011-05-06 17:04:32 +00:00
Mythos_Ruler cb612b17b5 Rebalancing some armour stats.
This was SVN commit r9459.
2011-05-06 16:46:08 +00:00
janwas 0a7aeb23f7 smbios fix
This was SVN commit r9458.
2011-05-06 14:54:46 +00:00
WhiteTreePaladin 6f3761a73a shrink displayed rank icons to actual resolution of 16x16
This was SVN commit r9457.
2011-05-06 02:19:36 +00:00
historic_bruno 022950a540 Documents AI autostart option in readme
This was SVN commit r9455.
2011-05-05 22:10:09 +00:00
Ykkrosh 1da3cdb498 Fix build errors
This was SVN commit r9453.
2011-05-05 20:24:22 +00:00
historic_bruno a8c087d46b Missing files
This was SVN commit r9451.
2011-05-05 20:07:51 +00:00
Ykkrosh 45426ac21c Probably fix build error
This was SVN commit r9450.
2011-05-05 18:06:36 +00:00
Mythos_Ruler 5ed18a103d Tweaked the colors a bit.
This was SVN commit r9449.
2011-05-05 16:54:04 +00:00
Ykkrosh a7aed9957d Build fix
This was SVN commit r9448.
2011-05-05 16:24:06 +00:00
janwas 5c76bc12fa refactor status code definitions: allow modules to define an array of them (more convenient+efficient).
merge ERR::NO_SYS, NOT_IMPLEMENTED into NOT_SUPPORTED
renderer: remove unnecessary ogl_shader include

This was SVN commit r9447.
2011-05-05 13:03:34 +00:00
janwas fd561cb88b hotloading fix on Windows
refs #781

This was SVN commit r9446.
2011-05-05 10:50:47 +00:00
janwas a741fb2f33 fix ChooseCacheSize - more simple, no longer relies on available-memory reporting (because Linux has a weird understanding of "available")
closes #611, refs #832

This was SVN commit r9445.
2011-05-05 09:53:07 +00:00
historic_bruno 508f56d2dd Fixes bug in triple-click unit selection for units without a SelectionGroupName defined. In this case, triple-click will behave the same as double-click.
This was SVN commit r9444.
2011-05-05 02:06:53 +00:00
historic_bruno 26de01cdd1 Adjusts unit selection behavior to account for ranks. Triple-click now selects units regardless of their rank.
Adds modifier hotkey to select units offscreen.
Fixes #826.

This was SVN commit r9443.
2011-05-05 01:27:49 +00:00
WhiteTreePaladin f423e269e2 shrunk rank icons
This was SVN commit r9442.
2011-05-05 00:19:48 +00:00
WhiteTreePaladin 141cc51573 reference new rank icons
This was SVN commit r9441.
2011-05-05 00:10:43 +00:00
Mythos_Ruler 99e45311ab Possible new rank insignia.
This was SVN commit r9440.
2011-05-04 23:15:03 +00:00
Mythos_Ruler db0a2f8cef Made promotions a little easier for this release so it is more obvious for end users who install the Alpha.
This was SVN commit r9439.
2011-05-04 22:36:31 +00:00
WhiteTreePaladin 3bffcff90d update experience bar tooltip text and style
This was SVN commit r9438.
2011-05-04 22:20:49 +00:00
janwas dcec9c4ca9 gracefully handle the case where the file cache is full of data still referenced elsewhere.
fixes #832

This was SVN commit r9437.
2011-05-04 22:19:38 +00:00
Mythos_Ruler 002c40ede4 Some miscellaneous stuff. Also Fixes #828
This was SVN commit r9436.
2011-05-04 21:51:29 +00:00
historic_bruno fffcdbbf21 Balances random map resources.
Attempts to avoid "invalid argument" errors in typed arrays by forcing
them to integer (see #658).
Removes script preloading from map generator (VFS is thread-safe now)
Removes thread checking from ScriptInterface file loading functions.
Adjusts starting entities in civ data.

This was SVN commit r9435.
2011-05-04 21:24:25 +00:00
Ykkrosh d6b073df22 Fix typo
This was SVN commit r9434.
2011-05-04 20:49:17 +00:00
WhiteTreePaladin 1ba34b973f clean up
This was SVN commit r9430.
2011-05-04 19:36:29 +00:00
WhiteTreePaladin dd264f46cf make music civ specific
This was SVN commit r9429.
2011-05-04 19:31:01 +00:00
OmriLahav da40ea8e2c First 3 completed score pieces from Omri: Celts Peace 1, Hellens Peace 1 and Iberians Peace 1 - 04.05.11.
This was SVN commit r9428.
2011-05-04 15:39:33 +00:00
Ykkrosh fa16181e84 Fix build error in tests.
Don't call wrealpath on the value returned by GetArg0, since it breaks
the tests and changes the semantics of that function.

This was SVN commit r9427.
2011-05-04 14:40:14 +00:00
Ykkrosh b560ff5fb7 Fix warning from cccd6849a7
This was SVN commit r9426.
2011-05-04 14:18:16 +00:00
janwas 9719432ff9 fix memory leak (wasn't freeing the entire chain of SMBIOS structures)
This was SVN commit r9425.
2011-05-04 13:08:09 +00:00
janwas a7152270f4 Path now goes to some trouble to prevent mixing / and \ slashes (causes trouble when hotloading, and some Windows APIs can't handle it, either)
WARNING: that means stuff like Path(nativeDataPath/"art/") is forbidden
and will raise errors on Windows when nativeDataPath contains \. always
use /"" to add a trailing slash. never embed "/" in OsPath component
strings (it's OK for VFS strings since they consistently use /).

wdir_watch, CmdLineArgs: avoid mixed separators
wutil: remove overzealous assertion (infinite recursion if an error
arose before we create a window)

refs #781

This was SVN commit r9424.
2011-05-04 12:16:51 +00:00
janwas 7523894760 ENSURE(0) -> DEBUG_WARN_ERR(ERR::LOGIC) (a bit smaller, and more descriptive)
This was SVN commit r9423.
2011-05-04 12:10:17 +00:00
Mythos_Ruler 6c3b41db3f New minimap buttons ready for implementation.
This was SVN commit r9422.
2011-05-04 05:55:53 +00:00
Ykkrosh 9733affb05 Fix non-PCH build
This was SVN commit r9419.
2011-05-04 01:17:09 +00:00
Ykkrosh 962fb41729 Support parallel build jobs in update-workspaces (via JOBS=-j3 or argument -j3 etc)
This was SVN commit r9418.
2011-05-03 23:54:29 +00:00
Ykkrosh 16a654ccae Fix script tests.
Fixes #827.

This was SVN commit r9416.
2011-05-03 23:16:16 +00:00
WhiteTreePaladin 1a6e75de4e updated alpha version name - fixes #816
This was SVN commit r9415.
2011-05-03 20:22:42 +00:00
Mythos_Ruler b26d543da1 Fixes #821
This was SVN commit r9414.
2011-05-03 19:44:08 +00:00
Ykkrosh 178a700c16 Fix build
This was SVN commit r9412.
2011-05-03 15:58:25 +00:00
janwas cce3bebe0c fix error propagation/avoid SetLastError pollution
This was SVN commit r9411.
2011-05-03 13:46:35 +00:00
janwas cccd6849a7 cleanup (requires update-workspaces)
lib_errors.cpp: replace with status.cpp, adapt to needs at work
wutil: fix runtime warning reported via feedback box
config: merge CONFIG_PARANOIA and !CONFIG_FINAL into
CONFIG_ENABLE_CHECKS
add openmp, pointer_typedefs.h

This was SVN commit r9410.
2011-05-03 12:38:42 +00:00
Mythos_Ruler 114ca8e4ce Changed map lighting.
This was SVN commit r9409.
2011-05-03 01:44:59 +00:00
Mythos_Ruler 0734122a9d Added some stone quarries to the map.
This was SVN commit r9408.
2011-05-03 01:39:45 +00:00
Mythos_Ruler 04f5a34f2d New Mediterranean stonemine "quarry."
This was SVN commit r9407.
2011-05-03 01:25:43 +00:00
Mythos_Ruler ae0ac056b3 Changed lighting.
This was SVN commit r9406.
2011-05-03 01:14:01 +00:00
Ykkrosh 333c62a490 Report errors in GL limit detection properly.
Report slightly more detailed RAM and CPU data.

This was SVN commit r9405.
2011-05-02 23:46:56 +00:00
Mythos_Ruler 0a4a7683b9 Deleted some random particles hanging around.
This was SVN commit r9404.
2011-05-02 23:40:15 +00:00
Pureon 548ed2e4eb Celt wall turret projectile error fix
This was SVN commit r9403.
2011-05-02 22:36:26 +00:00
Mythos_Ruler 7ac1ca1122 This was SVN commit r9402. 2011-05-02 22:10:33 +00:00
historic_bruno aa38415b3f Changes default scenario to Death Canyon. Fixes #820.
This was SVN commit r9401.
2011-05-02 21:52:14 +00:00
Mythos_Ruler 8ec73ac5d1 Tinkering with XP/promotions
This was SVN commit r9400.
2011-05-02 21:46:29 +00:00
historic_bruno b4889d5346 Fixes broken team init (based on patch by Stork). Fixes #814.
This was SVN commit r9399.
2011-05-02 20:34:48 +00:00
Pureon b8595fd196 palisade texture and spike walls added
This was SVN commit r9398.
2011-05-02 19:52:33 +00:00
fcxSanya ed105d3ad1 Disable promotion component for elite Iberian units.
This was SVN commit r9397.
2011-05-02 19:44:16 +00:00
fcxSanya e8e0d0b576 Promotion animation for Iberian units.
This was SVN commit r9396.
2011-05-02 19:31:42 +00:00
fcxSanya a523dc48ac Add missing file for units promotion.
This was SVN commit r9395.
2011-05-02 17:42:48 +00:00
historic_bruno e2f006e1a5 Changes Atlas keyword list to checkboxes, which properly reflect a scenario's keywords.
This was SVN commit r9394.
2011-05-02 16:29:53 +00:00
Ykkrosh 674eaa1283 Latest version of user-report server code
This was SVN commit r9393.
2011-05-02 15:47:12 +00:00
Ykkrosh 0b996bbe75 Prevent selecting unusable civs in random map setup. Fixes #813.
This was SVN commit r9392.
2011-05-02 15:26:38 +00:00
fcxSanya 7499b23991 Units promotion. Closes #697.
This was SVN commit r9391.
2011-05-02 15:03:01 +00:00
Pureon e8a2ed69f7 Selection sounds added to siege ballista and onager
This was SVN commit r9390.
2011-05-02 14:48:02 +00:00
historic_bruno c02818ceea Tweaks random map appearance and resource placement.
Cleans up rmgen library.
Fixes bug in bound checking for circular maps.

This was SVN commit r9388.
2011-05-01 22:29:58 +00:00
Pureon e297dac1a5 Initial structure destruction sound effects added.
This was SVN commit r9387.
2011-05-01 22:10:40 +00:00
Pureon 884f4bbbf1 Iberian and Hele wall tower garrison flags
This was SVN commit r9386.
2011-05-01 21:06:18 +00:00
Ykkrosh bfd6614b55 # Add support for many formation shapes, based on patch from Badmadblacksad.
See #13.

This was SVN commit r9385.
2011-05-01 20:40:53 +00:00
Mythos_Ruler adc0d79d8b Fixes ticket #808.
This was SVN commit r9384.
2011-05-01 20:15:59 +00:00
Mythos_Ruler 1008d60bc3 Deleted some JPEGS out of the props folder.
This was SVN commit r9383.
2011-05-01 17:11:02 +00:00
Mythos_Ruler 564524df54 This was SVN commit r9382. 2011-05-01 17:07:24 +00:00
Mythos_Ruler 4112523878 This was SVN commit r9381. 2011-05-01 17:07:11 +00:00
Mythos_Ruler b34259449f This was SVN commit r9380. 2011-05-01 17:06:47 +00:00
Jubal 126c2276cd This was SVN commit r9379. 2011-05-01 15:03:51 +00:00
Jubal 02ed11ac54 Removes references to Testbot, replaces with JuBot.
This was SVN commit r9378.
2011-05-01 15:02:33 +00:00
janwas 88c44c7d73 smbios: add support for structures 34,35,36,39,41 (found on rather new BIOS)
This was SVN commit r9377.
2011-05-01 12:18:45 +00:00
Mythos_Ruler f88c61911b Spring Cleaning.
This was SVN commit r9376.
2011-05-01 06:44:00 +00:00
Mythos_Ruler c108a13505 This was SVN commit r9375. 2011-05-01 05:24:38 +00:00
Mythos_Ruler cf78c42761 Move the rest of the helmet assets from Internal to Public (a process I started many moons ago but failed to finish).
This was SVN commit r9374.
2011-05-01 01:25:32 +00:00
Mythos_Ruler 7087281573 A few updated terrains and I added another ramp to each side of the Death Canyon plateaus.
This was SVN commit r9373.
2011-05-01 00:27:12 +00:00
Pureon df6ab6688e Iberian and Celt civ centre garrison nodes added
This was SVN commit r9372.
2011-04-30 22:45:58 +00:00
Ykkrosh b371686fb7 Rename class to prevent conflict between generated auto_ptr symbols in Atlas and engine
This was SVN commit r9371.
2011-04-30 21:08:53 +00:00
janwas 1636f062a3 make VFS thread-safe, per long-standing request by Philip
This was SVN commit r9369.
2011-04-30 15:57:43 +00:00
janwas 635c2a12e2 add error code for file not found. return error code from io::Load, warn and return from io::Store (both without triggering assertions).
remove out of date comment in io.cpp
fixes #811

This was SVN commit r9368.
2011-04-30 15:41:19 +00:00
Ykkrosh 9a125ac5a1 Fix typo
This was SVN commit r9367.
2011-04-30 15:27:27 +00:00
Ykkrosh 3ac72813ef Relinquish CPU when running RMS scripts, to speed up loading on single-core machines
This was SVN commit r9366.
2011-04-30 15:18:11 +00:00
Ykkrosh 791ecee26b Build fixes
This was SVN commit r9365.
2011-04-30 13:55:55 +00:00
janwas 5ca66fc757 cleanup: move ADTs into lib/adts (separate files). fix definition of ASSERT
This was SVN commit r9364.
2011-04-30 13:35:36 +00:00
janwas 0720025073 cleanup
reduce dependency on PCH. move KiB constants to alignment, ARRAY_SIZE to
code_annotation.h.
move glext_funcs.h to external_libraries/glext_funcs.h, move part of
ogl.h to external_libraries/opengl.h
remove unused saturating arithmetic functions

This was SVN commit r9363.
2011-04-30 13:22:46 +00:00
janwas 4663ac0fe7 split debug_assert into ENSURE and ASSERT as discussed in a previous meeting.
the old debug_assert always ran and tested the expression, which slows
down release builds. wrapping them in #ifndef NDEBUG is clumsy. the new
ASSERT behaves like assert and ENSURE like the old debug_assert. Let's
change any time-critical but not-super-important ENSURE to ASSERT to
speed up release builds. (already done in bits.h and unique_range.h)

This was SVN commit r9362.
2011-04-30 13:01:45 +00:00
janwas 6c915291cc cleanup (requires update-workspaces):
major refactor of wfilesystem - remove gotos and workaround for FAT file
times
replace more round_up of constants with Align<>
remove old unused allocators (STL aligned, matrix, some shared_ptr)
move allocator utils into separate headers.
remove lockfree, wterminal
avoid testing __cplusplus

This was SVN commit r9361.
2011-04-30 12:34:28 +00:00
Ykkrosh 188c020ae0 Fix reading outside buffer, when terrain alpha maps are 8-bit.
Change alpha map composite texture to 8-bit to avoid wasting memory.
Warn about non-square alpha maps.

This was SVN commit r9360.
2011-04-30 11:46:23 +00:00
Jubal 1dcbb02958 This fixes the error messages at game start, makes a few final weaks to training queues, and changes the first base strategy to a small raid rather than the huge 3-prong assault.
This was SVN commit r9359.
2011-04-30 11:26:32 +00:00
janwas 9bdb54bc76 fix failure to preallocate disk space on Windows by always rounding up the file size regardless of the io::Parameters
This was SVN commit r9358.
2011-04-30 09:13:10 +00:00
Mythos_Ruler 0b46d58ae8 A couple updated desert terrains. Updated Necropolis map.
This was SVN commit r9357.
2011-04-30 07:39:41 +00:00
Ykkrosh e292c55e94 Delete warning-prone unused unusable event recording code
This was SVN commit r9355.
2011-04-30 00:06:30 +00:00
Ykkrosh f22e40b64c Fix warning
This was SVN commit r9354.
2011-04-29 23:55:47 +00:00
Ykkrosh 335e7db6be Fix build more
This was SVN commit r9353.
2011-04-29 23:30:29 +00:00
janwas 34ba390a0d build fix for pre-C++0x compilers.
archive_zip, stream: work around possibly missing support for
std/tr1::bind in GCC by defining a functor manually
also renamed RVREF to RVALUE_REF and ensured RVALUE can convert from
both lvalue and rvalue.
io: avoid dodgy constants and possible overflow by using blockSize=0 to
indicate "don't split"

This was SVN commit r9352.
2011-04-29 22:55:35 +00:00
Ykkrosh 1139124451 Fix some build errors and warnings
This was SVN commit r9351.
2011-04-29 20:38:13 +00:00
janwas 2374caac3e major refactor of file/io and alignment code. requires update-workspaces
. completely rewrite waio - use IOCP, add several hardcore
optimizations. now outperforms the
  AS SSD and ATTO benchmarks when writing
. refactor file interface - use LIO_READ instead of 'r', allow access to
file descriptor.
. completely rewrite the IO wrapper. now much more simple, less CPU
overhead, adds
  support for pre-issue/post-completion hooks and preallocation.
  io::Run defaults to simple synchronous IO; use io::Parameters to get
asynchronous.
. add alignment.h with constants and Align() function template (more
efficient than
  round_up for compile-time constants)
. add UniqueRange - similar to C++0x unique_ptr (emulated for C++03),
plus a
  built-in size. avoids expensive thread-safe reference counting in
shared_ptr.

cleanup:
- move fat_time functions into archive_zip
- remove no longer needed io_align and block_cache
- reduce dependencies in sysdep/compiler (move parts to
code_annotation.h)
- move IOCP into separate file (reused by waio)

This was SVN commit r9350.
2011-04-29 19:10:34 +00:00
historic_bruno 7ed6a164ba Idle worker button now cycles through Worker, Trade, and CitizenSoldier classes in that order (then by increasing entity ID). Fixes #209.
This was SVN commit r9349.
2011-04-29 18:09:07 +00:00
Ykkrosh d2e06ecdbb Fix some obstruction shapes.
Fixes #808.

This was SVN commit r9348.
2011-04-29 17:51:27 +00:00
Ykkrosh cb380a9b1c Simplify profile report code. Bump version number to make it easily distinguishable.
This was SVN commit r9347.
2011-04-29 17:32:35 +00:00
Ykkrosh d96fefd4a4 Fix linker errors with GCC 4.6, and some warnings.
This was SVN commit r9346.
2011-04-29 16:32:58 +00:00
Ykkrosh 8af82baf67 # Minor particle system fixes.
Support emitters that are fully running as soon as the game starts.
Fix particle clumping when moving from off-screen to on-screen, by
computing updates more incrementally.
Fix overzealous culling of models with particle emitters.
Add particles to renderer stats.

This was SVN commit r9345.
2011-04-29 12:26:31 +00:00
Mythos_Ruler 96eb76f860 This was SVN commit r9344. 2011-04-29 03:11:02 +00:00
Mythos_Ruler 5f634930e2 This was SVN commit r9343. 2011-04-29 03:04:52 +00:00
Mythos_Ruler affea0f2ce #Updated Iberian unit stats and balance.
This was SVN commit r9342.
2011-04-29 02:33:11 +00:00
Pureon 17ee62bc0b Iberian and Celt outpost garrison flags
This was SVN commit r9341.
2011-04-28 22:51:38 +00:00
historic_bruno 67ca7461cd Adds Skip method to SGUIMessage which works more or less like wxEvent.Skip: GUI objects can allow other event handlers to process an input event after they finish.
Allows hotkey handling of mousewheel events after minimap. Fixes #673.
Adds SendEvent to GUI objects, used in place of separate calls to
HandleMessage and ScriptEvent.

This was SVN commit r9340.
2011-04-28 20:42:11 +00:00
janwas 9d5539a215 fix runtime check error - see http://www.wildfiregames.com/forum/index.php?showtopic=14656&pid=218675&st=0&#entry218675
thanks to Yves for reporting this + suggesting the fix.

This was SVN commit r9339.
2011-04-28 17:13:55 +00:00
Mythos_Ruler f69c013d68 Beginnings of balancing Iberian units.
This was SVN commit r9338.
2011-04-28 05:35:52 +00:00
Mythos_Ruler 587b41016f Fixed the scale of the decal.
This was SVN commit r9337.
2011-04-28 03:09:03 +00:00
historic_bruno fb411d3f39 Fixes slightly broken game attributes and setup.
Includes random map size and seed in reportPerformance. Fixes #793.
Fixes loading screen to use actual map names.

This was SVN commit r9336.
2011-04-28 01:21:02 +00:00
Pureon fbfecbf802 fortress_briton garrison flag
This was SVN commit r9335.
2011-04-27 22:04:16 +00:00
Pureon 24a1d91feb iber_fortress garrison flag added
This was SVN commit r9334.
2011-04-27 21:35:29 +00:00
Ykkrosh 4e74798585 Be more robust to visibility checks outside the map. Fixes #765.
This was SVN commit r9333.
2011-04-27 21:03:08 +00:00
Pureon 6da0027b32 fortress_gallic garrison flag added
This was SVN commit r9332.
2011-04-27 21:02:01 +00:00
Ykkrosh e4b530fb1a Clean up some GL state explicitly
This was SVN commit r9331.
2011-04-27 20:12:58 +00:00
Mythos_Ruler e9e0f0035f This was SVN commit r9330. 2011-04-27 17:07:52 +00:00
Mythos_Ruler 88f6633b22 Tweaked the Median Oasis map a bit. Slowed down the slinger projectile a little bit so we can see it in-flight. :)
This was SVN commit r9329.
2011-04-27 14:38:02 +00:00
Mythos_Ruler 6e2bfa0f07 This was SVN commit r9328. 2011-04-27 12:12:01 +00:00
Ykkrosh a872e4a6ad Attempt to fix reported GL error
This was SVN commit r9327.
2011-04-27 09:41:28 +00:00
Pureon 9759362b62 New celt temple. celt_struct texture changes. Renaming old temples to stone monuments
This was SVN commit r9326.
2011-04-26 22:40:08 +00:00
Mythos_Ruler 51c7a6d193 This was SVN commit r9325. 2011-04-26 22:03:21 +00:00
Mythos_Ruler baabff617d Iberian Spearman animation line fixed. It was calling an empty animation line in the actor.
This was SVN commit r9324.
2011-04-26 21:55:58 +00:00
Mythos_Ruler 7a0b545286 New Acropolis map called "Necropolis."
This was SVN commit r9323.
2011-04-26 21:48:50 +00:00
Ykkrosh 8e20c00dd3 # Add numbered unit selection groups, based on patch from Badmadblacksad.
Fixes #773.

This was SVN commit r9322.
2011-04-26 18:19:16 +00:00
Mythos_Ruler 0a66f8a188 Larger siege texture.
This was SVN commit r9321.
2011-04-25 07:07:25 +00:00
Mythos_Ruler b3ec9b35a5 #3 new Loading Tips.
This was SVN commit r9320.
2011-04-25 02:19:28 +00:00
Mythos_Ruler 1272587a3e #5 new Loading Tips.
Map tweaks and updates.

This was SVN commit r9319.
2011-04-25 01:04:51 +00:00
Mythos_Ruler 0a1313a9ff #New tips images.
This was SVN commit r9318.
2011-04-24 18:49:54 +00:00
Mythos_Ruler 6468bfa2c4 Name fix.
This was SVN commit r9317.
2011-04-24 16:52:02 +00:00
Mythos_Ruler 3698b9acd4 This was SVN commit r9316. 2011-04-24 05:58:05 +00:00
Mythos_Ruler 4f3fe0f64c Updated some Iberian unit animations.
This was SVN commit r9315.
2011-04-24 05:55:29 +00:00
Mythos_Ruler a39da292fe This was SVN commit r9314. 2011-04-24 05:31:08 +00:00
Mythos_Ruler 7e4f3cd44c Map adjustments.
This was SVN commit r9313.
2011-04-23 23:37:43 +00:00
Mythos_Ruler 84b17115a2 Matching the Iberian names with the Design Document.
This was SVN commit r9312.
2011-04-23 22:26:55 +00:00
Mythos_Ruler df847cd9c2 Attack animation speeds
This was SVN commit r9311.
2011-04-23 21:51:51 +00:00
Ykkrosh 2d0c183afb Fix use of uninitialised variable, causing errors randomly when GL_ARB_fragment_program_shadow is missing
This was SVN commit r9310.
2011-04-23 18:51:47 +00:00
Jubal 17eae9d92a This was SVN commit r9309. 2011-04-23 18:34:03 +00:00
Ykkrosh 2d04d78db8 Disable apparently buggy shader mode on r300c drivers. Fixes #780.
This was SVN commit r9308.
2011-04-23 17:06:27 +00:00
Mythos_Ruler f0286a72e3 Ram tweaks.
This was SVN commit r9307.
2011-04-23 15:59:59 +00:00
Mythos_Ruler 775b6589c0 This was SVN commit r9306. 2011-04-23 15:56:44 +00:00
Ykkrosh 213b344820 Disable shadows/fancywater by default on more Intel devices. Fixes #623 for now.
Add script to help verify correctness of hwdetect.

This was SVN commit r9305.
2011-04-23 15:39:20 +00:00
Mythos_Ruler 9f7eef5a1c Lots of Neareastern Badlands stuff.
This was SVN commit r9304.
2011-04-23 05:06:25 +00:00
Mythos_Ruler d7497a71d1 This was SVN commit r9303. 2011-04-23 02:39:47 +00:00
Mythos_Ruler 0cd16d8464 New badlands terrains
This was SVN commit r9302.
2011-04-23 02:39:24 +00:00
Mythos_Ruler 5c768f803d This was SVN commit r9301. 2011-04-22 19:50:05 +00:00
Mythos_Ruler f9e5bbb8b0 Added Iberians to the map.
This was SVN commit r9300.
2011-04-22 19:31:30 +00:00
Ykkrosh 5a773d4ca0 Be robust to null proxy URL strings. Should fix #778.
This was SVN commit r9299.
2011-04-22 16:05:00 +00:00
Ykkrosh c82d619cc4 Make decals only rotate around the Y axis, to avoid buggy stretched appearance when rotated non-horizontally
This was SVN commit r9298.
2011-04-22 13:19:23 +00:00
Mythos_Ruler d9cbf6c9a8 Attempting to implement Blood for killed units. It's not quite working as I hoped.
The Roman super unit has the blood attached to his chest prop point.
Problem: The Blood decal gets stretched strangely.

The Persian super unit has the blood attached to his root prop point.
Problem: 1.) Blood doesn't look in the right spot when the unit's death
animation ends. 2.) The blood actor (decal) is not randomizing as it
should.

This was SVN commit r9297.
2011-04-22 04:10:04 +00:00
Mythos_Ruler 04dc0c2d3c Moved "civs" json files to Public because we are releasing a few of the other civs' units as a teaser.
Lots of unit and map tweaks. Names, stats, civs, etc.

Made the civ icons at the top of the screen 96 pixels instead of 64
pixels just to see if people like them. They are easily changed back to
64 pixels if unsatisfactory.

This was SVN commit r9296.
2011-04-22 03:51:18 +00:00
Mythos_Ruler 13b62f6613 Iberian javelinist tweaks.
This was SVN commit r9295.
2011-04-22 02:28:47 +00:00
Mythos_Ruler dc98a4a06a This was SVN commit r9294. 2011-04-21 17:27:26 +00:00
Mythos_Ruler bd67ad73e3 Iberian Javelinist named and shields added.
This was SVN commit r9293.
2011-04-21 17:07:34 +00:00
Mythos_Ruler 0bd1b7edbd Animation speeds.
This was SVN commit r9292.
2011-04-21 14:46:24 +00:00
historic_bruno 712eda131d Random map tweaks for better, faster resource placement.
Moves some constants to rmgen library.

This was SVN commit r9291.
2011-04-21 14:13:13 +00:00
Pureon 38e4eda857 Adding building sounds to Celt, Hele, and Iberian units
This was SVN commit r9290.
2011-04-20 22:14:02 +00:00
Pureon 697c4731b4 preparing construction sound xml
This was SVN commit r9289.
2011-04-20 21:43:09 +00:00
Pureon 02d7fd1ed8 skeletons.xml addition
This was SVN commit r9288.
2011-04-20 19:43:59 +00:00
Ykkrosh 91ad17c685 Fix entity ID association with animations. Fixes #790.
This was SVN commit r9286.
2011-04-20 00:04:05 +00:00
Ykkrosh 6d946cc58d Fix badly-named variable
This was SVN commit r9285.
2011-04-20 00:02:59 +00:00
Ykkrosh b35d3a5e3d __cpuidex was added in VC2008 SP1, so don't use it if pre-SP1
This was SVN commit r9284.
2011-04-19 23:23:16 +00:00
WhiteTreePaladin 1caf223410 Max selection size now 64 units (may need further adjusting)
This was SVN commit r9283.
2011-04-18 23:31:37 +00:00
Ykkrosh 7ec3266da5 Fix assertion failures when running RMS in debug mode
This was SVN commit r9282.
2011-04-18 17:10:57 +00:00
historic_bruno 5759a54b32 Removes few remnants of rmgen from the binaries directory.
Updates readme.txt with new command line options.

This was SVN commit r9281.
2011-04-17 20:58:14 +00:00
Mythos_Ruler ab32d3000f This was SVN commit r9280. 2011-04-17 17:45:56 +00:00
Ykkrosh 458cfbf48c Fix 64-bit build error
This was SVN commit r9279.
2011-04-16 22:57:00 +00:00
Mythos_Ruler ecdffb6fbd fire arrow
This was SVN commit r9278.
2011-04-16 19:32:56 +00:00
Mythos_Ruler 82af989a6e Fire Arrows for a few structures.
This was SVN commit r9277.
2011-04-16 19:32:02 +00:00
ShieldBearer a495f298e7 This was SVN commit r9276. 2011-04-16 14:27:52 +00:00
Pureon f2b432cbe5 Iberian ram animations
This was SVN commit r9275.
2011-04-16 11:56:52 +00:00
Mythos_Ruler 87d97000e3 Some nice updates to the Death Canyon map (I think this should be the next 'default' map for Alpha V).
Updated the name for the Roman legions.

Fixed footprint for Iberian Fortress.

This was SVN commit r9274.
2011-04-16 06:32:37 +00:00
historic_bruno fa001fdabe Fixes a typo in Atlas UI scripts affecting actor viewer.
This was SVN commit r9273.
2011-04-16 05:09:20 +00:00
historic_bruno b4503bb61e Simplifies random map output, see #782.
Changes random maps to XZ coordinates, matching the engine.
More documentation for rmgen library.

This was SVN commit r9271.
2011-04-16 04:04:06 +00:00
Mythos_Ruler 3adba8721a Some map updates
This was SVN commit r9270.
2011-04-16 03:49:43 +00:00
Mythos_Ruler de613274f0 Added a (not so) super secret unit for Alpha V. Other stuff.
This was SVN commit r9269.
2011-04-16 00:59:45 +00:00
Mythos_Ruler ac81892517 Replaced Greeks with Iberians.
This was SVN commit r9268.
2011-04-16 00:11:18 +00:00
Mythos_Ruler a52638873e Adjusting some iberian units.
This was SVN commit r9267.
2011-04-15 23:35:53 +00:00
Mythos_Ruler d445e9eb35 Fixed a mistake
This was SVN commit r9266.
2011-04-15 22:50:39 +00:00
Mythos_Ruler 9b227e4626 Added Iberians and Celts to the Serengeti map.
This was SVN commit r9265.
2011-04-15 22:39:42 +00:00
Mythos_Ruler a60f0e0340 first of the minimap buttons.
This was SVN commit r9264.
2011-04-15 20:10:57 +00:00
Mythos_Ruler 098adf47f5 This was SVN commit r9263. 2011-04-15 06:18:37 +00:00
historic_bruno 481f570a0e CMapGeneratorWorker thread safety issue. Fixes #783.
VFS access moved to main thread, where random map scripts are preloaded
and stored prior to use by the worker thread.
Adds LoadGlobalScript to ScriptInterface, for evaluating script content
in the global scope.

This was SVN commit r9261.
2011-04-15 05:23:51 +00:00
Mythos_Ruler 225346ffc9 #Falling leaf particles. New foundation for Greek Temple. Tweaking Gold Mine sparkle.
This was SVN commit r9260.
2011-04-15 05:05:07 +00:00
Mythos_Ruler 9c44e908d4 This was SVN commit r9259. 2011-04-15 02:15:26 +00:00
Pureon e604035c97 Iberian healer update
This was SVN commit r9257.
2011-04-15 00:07:49 +00:00
Mythos_Ruler 5e5e0354db This was SVN commit r9256. 2011-04-14 23:48:09 +00:00
Pureon b1a566800f Rotate Iberian corral
This was SVN commit r9255.
2011-04-14 23:12:29 +00:00
Pureon cb2e1e8f21 Iberian corral fix
This was SVN commit r9254.
2011-04-14 22:35:46 +00:00
Mythos_Ruler 76a22a6258 Sparkly metal mines. :)
This was SVN commit r9253.
2011-04-14 21:34:00 +00:00
Ykkrosh f072b47dc1 Warn earlier about some non-thread-safe calls.
This was SVN commit r9252.
2011-04-14 14:28:24 +00:00
Ykkrosh 57e6980465 Fix 64-bit build. Avoid using variable-sized types in Atlas message interface.
This was SVN commit r9251.
2011-04-14 14:27:42 +00:00
Mythos_Ruler d3c00a4c61 Added arrows to the Iberian Wall Tower.
This was SVN commit r9250.
2011-04-14 08:18:48 +00:00
ShieldBearer bb81f679de New Iberian Fortress.
This was SVN commit r9249.
2011-04-14 06:24:08 +00:00
historic_bruno bf53b6f3b5 This was SVN commit r9248. 2011-04-14 04:16:06 +00:00
historic_bruno ad6f305359 Integrates random maps with Atlas. Fixes #460.
Adds various map controls to Atlas.
Adds New Map dialog to Atlas.
Removes a few references to old simulation header files.

This was SVN commit r9247.
2011-04-14 04:01:59 +00:00
Mythos_Ruler 3b8e216622 Beginning stages of balancing Iberian units.
This was SVN commit r9246.
2011-04-13 23:26:34 +00:00
Mythos_Ruler a627f4a34e tweaked lighting
This was SVN commit r9245.
2011-04-13 22:41:30 +00:00
Pureon 67b5bc2df3 Sling projectile colour and size updates
This was SVN commit r9244.
2011-04-13 22:24:37 +00:00
Ykkrosh 73add20727 Load original Pagella .otf font with hinting explicitly disabled, instead of loading via .ttf
This was SVN commit r9243.
2011-04-13 22:15:04 +00:00
Pureon dac7b2d82b Iberian fishing boat fixes
This was SVN commit r9242.
2011-04-13 22:01:05 +00:00
Mythos_Ruler 22374de942 This was SVN commit r9241. 2011-04-13 21:40:34 +00:00
Pureon 17d67b87c3 Iberian sling projectiles
This was SVN commit r9240.
2011-04-13 20:42:41 +00:00
Mythos_Ruler 22313c1356 Corral footprint.
This was SVN commit r9239.
2011-04-13 19:33:18 +00:00
Mythos_Ruler 3f9d67889a Some fixes to the Iberian Corral.
This was SVN commit r9238.
2011-04-13 19:29:10 +00:00
Mythos_Ruler 24042bec50 Worked on the siege projectile, (made a separate flaming rock, along with a non-flaming one).
This was SVN commit r9237.
2011-04-13 18:56:13 +00:00
Ykkrosh 5a8d291403 Remove old vertexshader renderpath option from Atlas
This was SVN commit r9236.
2011-04-13 18:28:27 +00:00
Mythos_Ruler a84f58ecb8 Added projectile to Iberian fortress. Fixed icons for Iberian ships.
This was SVN commit r9235.
2011-04-12 20:27:49 +00:00
Mythos_Ruler ef125b4d95 Animation speeds.
This was SVN commit r9234.
2011-04-12 20:20:02 +00:00
Mythos_Ruler d3b140fc5f Move the body textures for the Carth and Iberian skirmishers over to Public.
This was SVN commit r9233.
2011-04-12 19:44:51 +00:00
Mythos_Ruler e841ff4095 tweaked the smoke duration to make the plume higher.
This was SVN commit r9232.
2011-04-12 18:56:58 +00:00
Mythos_Ruler f09af634cb This was SVN commit r9231. 2011-04-12 18:50:03 +00:00
Mythos_Ruler 216e09afdd Map tweaks.
This was SVN commit r9230.
2011-04-12 07:55:57 +00:00
Mythos_Ruler b330e8ce57 Added flames to the Elite Iberian Javelinist's projectiles. ;) Made a new flame and smoke for it. Tweaked the "original" smoke to emit a little higher above the flame (so the smoke doesn't mask the flame).
This was SVN commit r9229.
2011-04-12 03:49:32 +00:00
Mythos_Ruler 7414764298 Added Iberian javelinist. Need a name for him though (and added to the Wiki entry).
This was SVN commit r9228.
2011-04-12 03:11:35 +00:00
Pureon 567d3aafea Iberian resource gathering sounds and animation speed boost
This was SVN commit r9227.
2011-04-11 20:42:03 +00:00
Ykkrosh 9526706b5c Fix reference to old vertexshader mode
This was SVN commit r9226.
2011-04-11 10:04:39 +00:00
Mythos_Ruler 64e72f464f This was SVN commit r9225. 2011-04-11 00:39:21 +00:00
historic_bruno 818b02b0fc Fixes a few error cases in the map generator.
This was SVN commit r9224.
2011-04-10 22:21:15 +00:00
ShieldBearer a5a2cd3a3c New HP bars.
This was SVN commit r9222.
2011-04-10 10:34:49 +00:00
Mythos_Ruler ebc31bfc43 Name updates.
This was SVN commit r9221.
2011-04-10 05:36:29 +00:00
historic_bruno 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
historic_bruno 469d0fe5c5 Remove rmgen tool.
Log error description when sound engine fails (instead of cryptic
LibError code).

This was SVN commit r9219.
2011-04-10 00:54:15 +00:00
janwas a3812af176 smbios: avoid warning when no information is returned (happens on 32-bit XP)
This was SVN commit r9218.
2011-04-09 17:09:48 +00:00
Mythos_Ruler ee3190e0e9 Fixed some Iberian Monument issues.
This was SVN commit r9217.
2011-04-09 07:05:54 +00:00
Mythos_Ruler 8501fd441c Moved from Internal to Public.
This was SVN commit r9216.
2011-04-09 00:20:21 +00:00
Ykkrosh c59f7bcb8f Fix Clang warning ("operands of ? are integers of different signs")
This was SVN commit r9214.
2011-04-09 00:07:21 +00:00
Ykkrosh bd0063607a Fix build in Clang
This was SVN commit r9213.
2011-04-09 00:05:37 +00:00
Ykkrosh 7a8aefae34 Fix release-mode warnings in unused code
This was SVN commit r9212.
2011-04-09 00:05:00 +00:00
Mythos_Ruler fe51c90cf5 This was SVN commit r9211. 2011-04-08 23:58:43 +00:00
Mythos_Ruler d7fa62b3e6 Tweaks to map. Replaced some stone mines with some stone quarries. Gave a stone quarry to the Player 4 starting area, which erroneously had no stone before.
This was SVN commit r9210.
2011-04-08 23:52:33 +00:00
Mythos_Ruler 51f0141b6d Moved from Internal to Public.
This was SVN commit r9209.
2011-04-08 23:46:19 +00:00
Mythos_Ruler 815a6215e5 This was SVN commit r9208. 2011-04-08 23:45:45 +00:00
janwas d46a892a5d smbios: avoid displaying unknown maxError value; add enumerators for BIOS characteristics and extended characteristics
This was SVN commit r9207.
2011-04-08 07:10:31 +00:00
Mythos_Ruler 832f8a5367 Dust particle tweaks.
This was SVN commit r9206.
2011-04-08 01:02:18 +00:00
Ykkrosh 8f6fda9626 Deallocate expired projectiles properly
This was SVN commit r9205.
2011-04-08 00:11:27 +00:00
Mythos_Ruler 1b606ed276 This was SVN commit r9204. 2011-04-08 00:08:25 +00:00
Mythos_Ruler 5d84f0ad09 Shore waves textures for particles.
This was SVN commit r9203.
2011-04-07 23:57:16 +00:00
Mythos_Ruler 98458988bd name change
This was SVN commit r9202.
2011-04-07 20:25:31 +00:00
Ykkrosh 50e30ae8af Be more explicit about function types in font builder to fix crash
This was SVN commit r9201.
2011-04-07 19:59:34 +00:00
janwas 5b7dbe6bc9 smbios: more convenient interface that avoids having to check if the structures pointer is null (can still detect failure by checking whether all/guaranteed member pointers are zero)
This was SVN commit r9200.
2011-04-07 19:35:45 +00:00
janwas b5c6868ac2 smbios SystemSlot fix: add missing field, avoid displaying unknown device/function numbers
This was SVN commit r9199.
2011-04-07 19:28:24 +00:00
Mythos_Ruler c754c63376 Greek naming tweaks.
This was SVN commit r9198.
2011-04-07 17:29:02 +00:00
Ykkrosh aab98f90e0 Fix startup crash on non-Windows
This was SVN commit r9197.
2011-04-07 17:22:28 +00:00
Ykkrosh e1b9083c41 Fix probable OS X build error
This was SVN commit r9196.
2011-04-07 17:18:32 +00:00
janwas 99aa427ffa make use of SMBIOS information to detect CPU frequency and memory size
smbios fixes: also ignore max value (used by Dell BIOS to report invalid
MemoryDevice bit width); fix incorrect error check that caused 0 to be
returned on all but the first call; add implicit conversion operator to
allow using size without appending .value

This was SVN commit r9195.
2011-04-07 17:06:00 +00:00
Ykkrosh e5e9e38532 Fix GCC 4.6 "set but not used" warnings
This was SVN commit r9194.
2011-04-07 16:34:51 +00:00
historic_bruno 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
Mythos_Ruler 2a6cfb36d2 #Decal fixing. :)
This was SVN commit r9192.
2011-04-06 22:55:33 +00:00
Mythos_Ruler 98910972c6 This was SVN commit r9191. 2011-04-06 22:34:10 +00:00
Ykkrosh ed62b49a74 Renderer simplification: Remove now-unused texgen stream.
This was SVN commit r9190.
2011-04-06 22:09:58 +00:00
Ykkrosh 1866c2d3b7 Renderer simplification: Remove non-FBO shadow mode.
This was SVN commit r9189.
2011-04-06 22:08:51 +00:00
Ykkrosh a1eb830f2c Renderer simplification: Remove old non-depth-texture shadows.
This was SVN commit r9188.
2011-04-06 22:08:07 +00:00
Ykkrosh 7339a346e3 Renderer simplification: Remove fixed-function shadowing. Remove now-unused diffuse-only model lighting mode.
This was SVN commit r9187.
2011-04-06 22:07:13 +00:00
Ykkrosh 8753f881ee Renderer simplification: Remove old vertexshader path.
This was SVN commit r9186.
2011-04-06 22:02:05 +00:00
historic_bruno 06903af31f Fixes build warning in C/C++ preprocessor (moves initialization outside test expression)
This was SVN commit r9185.
2011-04-06 21:47:42 +00:00
Ykkrosh 8e0bfdfc33 Make actor entities stay visible in FoW.
This was SVN commit r9184.
2011-04-06 21:01:50 +00:00
Ykkrosh a122f55bde Avoid hardcoding the actor entity template details.
This was SVN commit r9183.
2011-04-06 21:01:00 +00:00
Ykkrosh df4b74ccf6 Render animationless skeletal meshes in their bind pose at their current position, instead of rendering at the world's origin.
This was SVN commit r9182.
2011-04-06 13:49:05 +00:00
ShieldBearer a751a2d6f6 added particles for all construction actors + changed color of particles to a more dusty tint
This was SVN commit r9181.
2011-04-06 11:13:29 +00:00
ShieldBearer 59f4848333 This was SVN commit r9180. 2011-04-06 11:00:14 +00:00
Ykkrosh 3fb9d9e5f6 Fix tests
This was SVN commit r9178.
2011-04-06 00:53:35 +00:00
Ykkrosh e9cc697c2b Animate particles in the default editor view
This was SVN commit r9177.
2011-04-06 00:22:07 +00:00
Mythos_Ruler 8cb19ff1f3 Fixed civs
This was SVN commit r9176.
2011-04-06 00:13:47 +00:00
Ykkrosh d03559f2c9 Add dust particles on under-construction buildings, varying based on number of active builders.
This was SVN commit r9175.
2011-04-06 00:11:40 +00:00
Ykkrosh 2fd4c62cbb Remove some unused variable declarations
This was SVN commit r9174.
2011-04-06 00:04:35 +00:00
Mythos_Ruler 1956e2bd23 Map tweaks and new (work in progress) maps.
This was SVN commit r9173.
2011-04-05 23:45:51 +00:00
Ykkrosh 29dd635d3b Fix decals and LOS texture in Actor Viewer, by slightly reducing use of globals.
Fix particles in Actor Viewer.
Expand terrain in Actor Viewer.
Change background to black so it blends with the LOS texture more
nicely.

This was SVN commit r9172.
2011-04-05 20:32:03 +00:00
janwas 329d044a9e 64-bit gcc warning fix
This was SVN commit r9171.
2011-04-05 19:49:04 +00:00
Mythos_Ruler 67433e65eb Added smoke to the flaming projectile rock. ;)
This was SVN commit r9170.
2011-04-05 19:28:26 +00:00
janwas dcde67038f ICC compile fixes (VC's overload resolution is apparently quite different)
This was SVN commit r9169.
2011-04-05 17:45:47 +00:00
janwas 1c2e410b7d final smbios improvements.
add comments
add support for bit flags
use wrapper classes and SFINAE instead of flags to detect enums / sizes
/ handles
avoid potential truncation of byte sizes
avoid displaying numeric_limits::min values ("unknown")

This was SVN commit r9168.
2011-04-05 17:14:18 +00:00
Ykkrosh d3ba9a24d3 Fix GCC build errors ("explicit template specialization cannot have a storage class",
"need 'typename' before 'static_assert_<...>::type' because
'static_assert_<...>' is a dependent scope").
Fixes #767.

This was SVN commit r9167.
2011-04-05 17:07:06 +00:00
ShieldBearer 99a1049ef9 added flame particle to hele_litho projectile and removed from female heads
This was SVN commit r9166.
2011-04-05 16:50:48 +00:00
janwas 3dbb29d665 smbios improvements: add specializations for bool/Handle (no longer requires a flag); omit empty/meaningless fields
convert remaining enumerators to ENUM, lowercase them to avoid conflicts
with macros, wrap them in struct to allow identical enumerator names

This was SVN commit r9165.
2011-04-05 09:52:57 +00:00
ShieldBearer c95b88a0c8 New particle textures and campfire.
This was SVN commit r9164.
2011-04-05 05:43:32 +00:00
janwas f35da41a0c smbios: minor fixes, add partial support for displaying enumerator names, move visitors to .cpp, use pragma pack regardless of compiler
This was SVN commit r9163.
2011-04-04 17:44:36 +00:00
janwas 68bc0a5651 smbios: add support for stringizing the structures
This was SVN commit r9162.
2011-04-04 16:50:02 +00:00
janwas a2bad46f27 smbios fixes:
- memmove all bytes in the table, not just 8
- end pointer was off by 4
- add support for structures 8,10,22,26,27,28

This was SVN commit r9161.
2011-04-04 15:01:40 +00:00
Ykkrosh 6beb1ea89b Exclude FCollada tests from Unix releases, since they rely on non-free data file Eagle.DAE
This was SVN commit r9160.
2011-04-04 14:20:16 +00:00
Ykkrosh 1abbf8b64b Old changes to compress releases better
This was SVN commit r9159.
2011-04-04 14:17:39 +00:00
Ykkrosh 0ddf2b0f34 Fix build on VC2008
This was SVN commit r9157.
2011-04-03 21:41:17 +00:00
janwas 66807d40c1 windows build fix: use arb names/function pointers; +noncopyable/struct vs. class warning fix
This was SVN commit r9156.
2011-04-03 20:45:43 +00:00
janwas 3d21cf98f9 better aio error checking / avoid unnecessary repeated calls to aio_error (investigated on the occasion of the recent Linux aio trouble)
This was SVN commit r9155.
2011-04-03 20:07:55 +00:00
Ykkrosh a9531bd88c Add missing files
This was SVN commit r9154.
2011-04-03 19:51:25 +00:00
janwas 231387d2da linux compile fix (explicit instantiation must be at namespace scope), adjust end pointer to match 8 bytes removed in workaround
This was SVN commit r9153.
2011-04-03 19:29:16 +00:00
Ykkrosh 9e1850bbe5 Set female citizens' heads on fire.
This was SVN commit r9152.
2011-04-03 19:16:20 +00:00
Ykkrosh 823e63a93b # Initial version of new particle system.
This was SVN commit r9151.
2011-04-03 19:15:15 +00:00
janwas 01a0825c94 disable aio on linux until the glibc aio implementation and/or kernel is fixed (see http://www.wildfiregames.com/forum/index.php?showtopic=14561&pid=217711&st=0&#entry217711)
This was SVN commit r9150.
2011-04-03 19:07:35 +00:00
Ykkrosh 384b8fa3e1 Delete old particle data files
This was SVN commit r9148.
2011-04-03 18:54:01 +00:00
Ykkrosh 253efdad57 Delete non-working particle system code
This was SVN commit r9147.
2011-04-03 18:49:48 +00:00
Ykkrosh 09413d940c Delete an obsolete particle system editor
This was SVN commit r9145.
2011-04-03 18:44:20 +00:00
janwas 2c72e1f364 (requires update-workspaces)
add initial SMBIOS implementation for retrieving system information
wacpi -> wfirmware (now also used to retrieve SMBIOS table)

This was SVN commit r9144.
2011-04-03 15:38:48 +00:00
Ykkrosh 1a072a3f37 Use a predictable RNG seed for random actor variations, so they are consistent between runs of the game.
This was SVN commit r9143.
2011-04-02 12:51:42 +00:00
Ykkrosh 97c934ad1c Apply unit shading colour in shader renderpath.
Don't adjust the shading colour of units in FoW (the shading comes from
the LOS texture instead).

This was SVN commit r9142.
2011-04-02 12:04:19 +00:00
Ykkrosh 012c47057a Optimise some matrix operations, based on patch from ortalo.
Fixes #750.

This was SVN commit r9141.
2011-04-01 18:33:47 +00:00
Ykkrosh 6d3d93c355 # Add idle worker button, based on patch from veprbl.
Fixes #744.

This was SVN commit r9140.
2011-04-01 18:00:04 +00:00
Ykkrosh ce85f4e825 Fix minimap ignoring GUI z-ordering.
This was SVN commit r9139.
2011-04-01 17:58:33 +00:00
Ykkrosh 5b7a23f75c Make ResetCameraTarget more sensible if the camera was rotated.
This was SVN commit r9138.
2011-04-01 17:57:04 +00:00
janwas 6026330fce updated version of Aken that includes support for MSR and static validation (-> .c instead of .cpp)
closes #754 (please re-open if not)

This was SVN commit r9137.
2011-04-01 15:06:52 +00:00
janwas d5b3201bfe noted while checking MSR prerequisites that the previous HasNehalem is inaccurate. PLATFORM_INFO is also supported by newer processors (e.g. Sandy Bridge), whereas UNCORE_* are tied to Nehalem and Westmere => split up HasNehalem into HasPlatformInfo and HasUncore. (the latter has been replaced by a "system agent" in newer designs)
refs #754

This was SVN commit r9136.
2011-03-31 21:30:42 +00:00
Mythos_Ruler bbc5d4142e This was SVN commit r9135. 2011-03-31 04:45:06 +00:00
Mythos_Ruler 7d95b3bc62 Added Iberians to Gold Rush.
This was SVN commit r9134.
2011-03-31 02:23:40 +00:00
Mythos_Ruler eac7d55675 Moved Cloudless skybox to Public.
This was SVN commit r9133.
2011-03-30 21:50:12 +00:00
Ykkrosh 1014da1f88 Use pool allocator to avoid apparently expensive dynamic allocations when rendering terrain.
Add function to get pool usage, for debugging.

This was SVN commit r9132.
2011-03-30 21:42:35 +00:00
Mythos_Ruler 98fa860199 Adjusting lighting.
This was SVN commit r9131.
2011-03-30 13:57:37 +00:00
Mythos_Ruler 044eaaccf3 Messing with the new lighting.
This was SVN commit r9130.
2011-03-30 13:34:05 +00:00
janwas fb872e0bd5 fix: update all pool freelist initializations to reflect the new invariant (prevents null-pointer dereference crash)
This was SVN commit r9129.
2011-03-28 21:10:41 +00:00
janwas c396997009 fixes from work: avoid potential 0-pointer dereference in freelist, also avoid branching in freelist functions via sentinel
wdll_main.h: avoid warning for DLLs using TLS
file_system_util.h: export functions

This was SVN commit r9128.
2011-03-28 12:28:29 +00:00
historic_bruno 0dfc72bc2c Fixes filter behavior in setup when switching map type.
Fixes broken texture in Latium rms.
Adds demo keyword to rms test.
Fixes default rms lighting with new model.

This was SVN commit r9127.
2011-03-27 22:00:49 +00:00
WhiteTreePaladin daad510013 fix bug where AI would only train one unit type
This was SVN commit r9126.
2011-03-26 22:22:22 +00:00
Ykkrosh 53f522d220 Fix warning
This was SVN commit r9124.
2011-03-26 20:38:42 +00:00
Ykkrosh d295dacb9b # Add new renderer mode based on GL_ARB_fragment_program.
Change lighting model for new maps to allow better overbrightness.
Cache player colours instead of loading from scripts every time the
renderer wants them.

This was SVN commit r9123.
2011-03-26 20:17:21 +00:00
Ykkrosh 8b11b73226 Tweak OGRE preprocessor to fit in our code, and fix bug with #define inside #ifdef.
This was SVN commit r9122.
2011-03-26 20:09:54 +00:00
Ykkrosh d1241cd6e9 Import original OgreGLSLProcessor from OGRE 1.7.2
This was SVN commit r9121.
2011-03-26 20:07:57 +00:00
Pureon 6e98a886ed broken rope bridge eyecandy object added
This was SVN commit r9120.
2011-03-26 09:32:03 +00:00
Pureon e08c5e22a0 Added unit icon to Iberian siege ram
This was SVN commit r9119.
2011-03-25 01:00:16 +00:00
Pureon 2a822eb4d4 Added Iberian siege ram unit
This was SVN commit r9118.
2011-03-25 00:46:02 +00:00
Ykkrosh afbfca17ce Fix silhouettes being displayed for some models that always stick into the ground
This was SVN commit r9117.
2011-03-24 23:54:08 +00:00
janwas 1eb5eeb225 minor fixes from integration with working copy at work.
This was SVN commit r9116.
2011-03-24 09:05:06 +00:00
Ykkrosh 9193ba56f9 Build fixes and whatnot
This was SVN commit r9115.
2011-03-23 21:15:22 +00:00
Pureon 4a2b47689b kennel.png portrait width to 256px
This was SVN commit r9114.
2011-03-23 20:32:14 +00:00
historic_bruno 0b8e3b3adf Fixes rounding error on Latium map, would break with odd number of players. Fixes #761.
This was SVN commit r9113.
2011-03-23 20:25:46 +00:00
historic_bruno 8f658ee81d Change remaining scenarios with "rome" civ. Fixes #758.
This was SVN commit r9112.
2011-03-23 20:16:10 +00:00
janwas 1f7e8d7194 per discussion with Philip, remove STL_HASH_MAP etc. because they're ugly, rarely used and superseded by boost::unordered*
This was SVN commit r9111.
2011-03-23 16:56:27 +00:00
janwas 588bfa11bf remove unnecessary utf8 includes
This was SVN commit r9110.
2011-03-23 16:32:44 +00:00
janwas 0999ba0941 refactoring:
- simplify sys_get_executable_name interface - return OsPath directly,
rename to sys_ExecutablePathname
- add validation of path components in GetDirectoryEntries
- replace multiple calls to GetModuleFileNameW with
sys_ExecutablePathname
- lift nearly all MAX_PATH limitations (required at work)

This was SVN commit r9109.
2011-03-23 16:14:47 +00:00
janwas 64a02932e3 refactor headers: path_util -> path, native_path -> os_path, remove where unnecessary
This was SVN commit r9108.
2011-03-23 14:43:35 +00:00
janwas dcd192cb60 refactor path interface:
- use wrapper class instead of std::wstring (reduces mixing of
strings/paths; allows safe+easy join via operator/ and convenient
case-insensitive comparison via operator==, avoids NativePathFromString,
similar to boost::filesystem)
- NativePath -> OsPath
- add hash and To/FromJSVal for Path
- add TS_ASSERT_PATH_EQUALS
- replace _wfopen_s with sys_OpenFile
- remove obsolete SortFiles/Directories

This was SVN commit r9107.
2011-03-23 13:36:20 +00:00
Mythos_Ruler e39fb7d0de This was SVN commit r9106. 2011-03-23 09:04:59 +00:00
Mythos_Ruler 8851028832 Moved face textures from Internal to Public.
This was SVN commit r9105.
2011-03-23 08:59:23 +00:00
historic_bruno f618605477 Changes default random map sizes.
Tweaks random map resources.
Adds support for circular maps to rmgen library.
Various fixes in map generator.
On Miletus map, change player 2 civ, as Romans are not fully implemented
(fixes #758)

This was SVN commit r9104.
2011-03-23 08:12:04 +00:00
Ykkrosh 575e3b0a69 Don't enable JITs when they can interfere with profiling.
Fix dangerous trailing slashes.

This was SVN commit r9103.
2011-03-23 00:36:34 +00:00
Ykkrosh e825a98671 Fix flag filtering of transparent models
This was SVN commit r9102.
2011-03-22 23:09:38 +00:00
Ykkrosh c4cd85bb98 Build fixes
This was SVN commit r9100.
2011-03-22 18:46:39 +00:00
historic_bruno 5565b9e898 Fixes bugs in Latium map script. Changes default environment settings for random maps, adds environment setters
This was SVN commit r9099.
2011-03-22 08:19:19 +00:00
historic_bruno 3050551eae Move data for non-implemented civs to internal
This was SVN commit r9098.
2011-03-22 02:53:53 +00:00
historic_bruno 46c54ef62c Fixes missing texture in Neareastern Badlands random map
This was SVN commit r9097.
2011-03-22 02:04:58 +00:00
historic_bruno 0e0ed94926 Implements random map system, fixes #6.
Includes default library "rmgen" w/ API based on rmgen tool.
Modifies rmgen scripts Cantabrian Highlands, Neareastern Badlands, and
Latium.
Old map support dropped from MapReader.
Fixes a few bugs in existing game setup and initialization scripts.

This was SVN commit r9096.
2011-03-22 01:34:45 +00:00
historic_bruno 23ebe32b4c Moving old random scripts to avoid conflicts
This was SVN commit r9095.
2011-03-22 01:33:17 +00:00
Ykkrosh c0a105432e Use path types and conversions more consistently.
This was SVN commit r9094.
2011-03-21 22:59:00 +00:00
Ykkrosh 5b7ea2371f Fix some line endings.
This was SVN commit r9093.
2011-03-21 22:47:02 +00:00
Ykkrosh 83271ec816 Fix build errors.
Fix VFS root directory failing IsDirectory, which breaks the search for
textures.xml.
Fix incompatible change to loose cache name determination.

This was SVN commit r9092.
2011-03-21 21:06:08 +00:00
janwas c3405e6f50 path improvements/fixes:
- replace more std::wstring with Native or VfsPath; wstring_from_utf8 ->
NativePathFromString
- replace sequences of Join(Path(), Basename+extension) with
ChangeExtension in wsdl, CacheLoader
- add Path::IsDirectory to replace .empty() / path_is_dir_sep(.back()).
also changed behavior to reflect the fact that "" is the VFS root
_directory_
- Path::Join now allows 2 identical path types (e.g. VfsPath) or one
char* literal (prevents inadvertently introducing non-safe characters).
to convert from wstring or wchar_t, use an explicit ctor (e.g.
VfsPath(wchar_t_string))

This was SVN commit r9091.
2011-03-21 19:54:08 +00:00
janwas 6d25329412 # towards locale-independent pathnames on Linux
c.f.
http://www.wildfiregames.com/forum/index.php?showtopic=14541&st=0&p=217250&#entry217250
and 2011-03-19 meeting

This was SVN commit r9090.
2011-03-21 17:53:13 +00:00
ShieldBearer 1da78409f9 New icon for celtic kennel
This was SVN commit r9089.
2011-03-21 11:57:49 +00:00
janwas 9a22dc1351 warning fixes
This was SVN commit r9088.
2011-03-21 11:55:49 +00:00
janwas cec05f02ea fix insidious OpenAL issue: the spec doesn't guarantee 0 isn't a valid source name => we need to use an out-of-band mechanism for specifying whether the source is valid.
refs #557

This was SVN commit r9087.
2011-03-20 16:40:36 +00:00
Ykkrosh 2392eb6720 Skip reporting caches that were initialised but never filled in
This was SVN commit r9086.
2011-03-19 15:17:14 +00:00
Ykkrosh 44e1a863e1 Fix cache detection assertion failure
This was SVN commit r9085.
2011-03-19 15:16:14 +00:00
Ykkrosh 0af8cdc54a Fix likely cache table typos, based on Intel Software Developer's Manual.
This was SVN commit r9084.
2011-03-19 15:03:25 +00:00
janwas fb499ff0d0 further refactoring of new cache detect code
- add invariant - level/type are always valid, numEntries indicates
whether the cache is actually present and not disabled
- handle pseudo-descriptors 0xF0 and F1 (avoids warning)

This was SVN commit r9083.
2011-03-19 12:48:56 +00:00
historic_bruno 4ae8cfe858 Converted remaining old scenarios to the latest format (version 5). Support will soon be dropped from MapReader.
This was SVN commit r9082.
2011-03-19 00:04:55 +00:00
Ykkrosh 89b7b6b52d Avoid divide-by-zero on AMDs with missing caches
This was SVN commit r9081.
2011-03-18 19:48:54 +00:00
Ykkrosh 25524dc99f Fix tests
This was SVN commit r9080.
2011-03-18 19:35:31 +00:00
Ykkrosh 22a651bb86 Fix assertion failure when no L3 cache.
Fix typo.

This was SVN commit r9078.
2011-03-18 18:42:10 +00:00
Ykkrosh ecbd0ae31b Fix Windows build.
Improve compatibility with GL1.3.

This was SVN commit r9077.
2011-03-18 18:07:18 +00:00
Ykkrosh d805e764c5 # Render unit silhouettes when behind buildings.
Fixes #144.
Start using stencil buffer.
Simplify materials a little.

This was SVN commit r9076.
2011-03-18 16:57:54 +00:00
Ykkrosh d49994a0b4 Explicitly clamp gl_FrontColor, for llvmpipe compatibility
This was SVN commit r9075.
2011-03-18 16:55:51 +00:00
janwas 5b91e2d7ab move cache detection into separate file.
add support for CPUID.2 cache descriptors (many Bothans died to bring us
this information)
simplify the API - use one structure to describe cache and TLB; only one
accessor for both.

HWDetect: version change, since dtlbs and itlbs are no longer
distinguished

fixes #752

This was SVN commit r9074.
2011-03-18 16:44:03 +00:00
Mythos_Ruler 875fce5e63 This was SVN commit r9073. 2011-03-17 07:52:01 +00:00
Mythos_Ruler f73aff7016 Fixed parent code.
This was SVN commit r9072.
2011-03-17 07:50:03 +00:00
Mythos_Ruler b6cc8e9cf6 The Big Iberian Move™.
This was SVN commit r9071.
2011-03-17 07:31:58 +00:00
Mythos_Ruler be59aa012d Iberian shield actors.
This was SVN commit r9070.
2011-03-17 06:05:50 +00:00
Mythos_Ruler 730a119e4f Moving stuff from Internal to Public. Ongoing project.
This was SVN commit r9069.
2011-03-17 06:03:54 +00:00
Mythos_Ruler d3ec3e7c7f This was SVN commit r9068. 2011-03-17 06:02:34 +00:00
historic_bruno e47e916853 This was SVN commit r9067. 2011-03-17 01:31:56 +00:00
Mythos_Ruler 78a54071c4 #Implemented remaining decals.
This was SVN commit r9066.
2011-03-15 22:07:22 +00:00
Ykkrosh 9659ec298b Fix off-by-one error in date logging, and rearrange to standard format.
This was SVN commit r9065.
2011-03-15 20:29:29 +00:00
Ykkrosh e70fae8d80 Stop using glMultiDrawElements since it's too buggy
This was SVN commit r9064.
2011-03-14 21:57:09 +00:00
Ykkrosh 099dbdb24a Fix use of uninitialised variable
This was SVN commit r9063.
2011-03-14 21:54:44 +00:00
Ykkrosh 5fa577ea25 Attempt to fix shadowAlphaFix to generate FBOs in a more widely supported format
This was SVN commit r9062.
2011-03-14 02:50:43 +00:00
Ykkrosh 612539f109 Don't bother creating shadow textures if shadows are disabled
This was SVN commit r9061.
2011-03-14 02:49:53 +00:00
Mythos_Ruler f0f87796f0 Farm field edit for decal
This was SVN commit r9060.
2011-03-13 23:56:22 +00:00
Mythos_Ruler 28096de106 My first try at making a decal. :)
This was SVN commit r9059.
2011-03-13 23:24:40 +00:00
Ykkrosh 8bb5f2e480 Add missed file
This was SVN commit r9057.
2011-03-13 19:44:06 +00:00
Ykkrosh 77e2130ff2 Replace some decal meshes with real decals
This was SVN commit r9056.
2011-03-13 19:26:01 +00:00
Ykkrosh d24c93237c # Initial version of terrain decal textures.
Rejig CModel to support non-mesh-based props.
Avoid redundant recomputation for non-moving CRenderableObjects.

This was SVN commit r9055.
2011-03-13 19:22:05 +00:00
Ykkrosh ba8163e248 # Explicitly triangulate terrain tiles.
Store blend splats as indexed triangles.
Remove unnecessary copy of vertex data.
Fixes #169.

This was SVN commit r9054.
2011-03-13 19:10:38 +00:00
Ykkrosh fc2c54c39f # Optimise terrain renderer.
Batch patch splats by texture match.
Use VBOs for patch indices.
Fixes #722.

This was SVN commit r9053.
2011-03-13 19:06:33 +00:00
Ykkrosh 2f28b07356 Support storing index data in VBOs.
Use index VBOs in model renderers, for performance.
Be more explicit about static/dynamic VBOs.
Add VBO usage to renderer stats.
Clean up some obsolete unused code.

This was SVN commit r9052.
2011-03-13 18:58:09 +00:00
Ykkrosh b70a0a5b5a Latest version of user-report server code
This was SVN commit r9051.
2011-03-12 02:36:20 +00:00
janwas a0a245d0ec sync with work. add u8_from_larger, sys_IsDebuggerPresent, wdll_main.h;
robustify waio file mode and remove a safety check (since
OVERLAPPED.Internal is documented to be subject to change)

This was SVN commit r9050.
2011-03-11 16:29:27 +00:00
feneur 6abd49d60a #Added link to online manual (from in-game manual). Also updated the year in the "about box" from 2010 to 2011.
This was SVN commit r9049.
2011-03-10 17:37:29 +00:00
Ykkrosh 51b58328f7 Fix negative 'unlogged' time in profiler at start of game.
Remove redundant Reset call.

This was SVN commit r9047.
2011-03-08 16:58:07 +00:00
Ykkrosh 8a0cbe009a Stop the AI wasting time chasing after any animals except chickens.
Make the AI behave better when it can't find any viable food sources.

This was SVN commit r9046.
2011-03-08 01:40:44 +00:00
Ykkrosh 9787f963ba Minor adjustments to feedback details
This was SVN commit r9045.
2011-03-08 01:34:25 +00:00
Pureon 910c1b7c67 make bridge unselectable entity
This was SVN commit r9044.
2011-03-08 00:09:17 +00:00
Pureon a77c807e06 Simple bridge demo map
This was SVN commit r9043.
2011-03-07 22:31:00 +00:00
Ykkrosh 18f44bebbc Add workaround for missing tree shadows on certain graphics drivers
This was SVN commit r9042.
2011-03-07 00:34:03 +00:00
Pureon 21785dc97c hele wall and wall tower obstruction stat changes
This was SVN commit r9041.
2011-03-06 14:38:06 +00:00
WhiteTreePaladin 4261983c9d Fix reveal map checkbox after winning
This was SVN commit r9040.
2011-03-06 02:29:07 +00:00
WhiteTreePaladin ecbe92bdda automatically reveal map when a player wins
This was SVN commit r9039.
2011-03-06 01:54:38 +00:00
Ykkrosh b4d9ab336b Simplify hiding of system cursor on non-Windows.
Fixes #683.

This was SVN commit r9038.
2011-03-06 00:48:26 +00:00
Ykkrosh 7d6cfe58de Fix non-PCH build
This was SVN commit r9037.
2011-03-06 00:01:23 +00:00
Ykkrosh 6f9da85d9f Improve performance of full state hash computation, by skipping script components that are known to have no data.
Switch to much quicker (and less comprehensive) per-turn hashing in
multiplayer games.

This was SVN commit r9036.
2011-03-05 22:30:32 +00:00
Ykkrosh 20ebaa5b79 Fix units getting stuck inside foundations
This was SVN commit r9035.
2011-03-05 22:18:29 +00:00
Mythos_Ruler 52d767a404 This was SVN commit r9034. 2011-03-05 19:59:46 +00:00
Mythos_Ruler c562ed6894 Fixed obstruction.
This was SVN commit r9033.
2011-03-05 19:59:02 +00:00
Ykkrosh 22e16e4554 Make builders look for nearby foundations to help with, once they finish their own building
This was SVN commit r9032.
2011-03-05 17:38:15 +00:00
Ykkrosh 08d5e7bf66 Sort AI list by name, and rename Test Bot so it's a bit clearer and is listed first
This was SVN commit r9031.
2011-03-05 16:55:58 +00:00
Ykkrosh c0383ffc30 Fix units not auto-gathering after a group is given a construction order
This was SVN commit r9030.
2011-03-05 15:56:24 +00:00
Mythos_Ruler b914f82d2a Celt ram edit.
This was SVN commit r9029.
2011-03-05 15:36:22 +00:00
Ykkrosh d62e9de7da Fix shift-click building placement
This was SVN commit r9027.
2011-03-05 14:41:44 +00:00
Ykkrosh 18cdbd9eab Increase tile-based pathfinder maximum search range, so it's at least enough to reach from one side of Acropolis to the other
This was SVN commit r9026.
2011-03-05 14:38:08 +00:00
Ykkrosh 18a2968919 Fix errors when starting multiplayer games
This was SVN commit r9025.
2011-03-05 14:30:24 +00:00
Ykkrosh d3929b6af1 Actually, delete the cpuid() inline asm entirely since it still causes various problems in various compilers
This was SVN commit r9024.
2011-03-05 14:11:57 +00:00
Ykkrosh 712a92caa1 Save PIC register in cpuid() to fix "can't find a register in class 'BREG'" error in some versions of GCC
This was SVN commit r9023.
2011-03-05 13:53:02 +00:00
Ykkrosh 18798c3f8d OS X build fix
This was SVN commit r9022.
2011-03-05 13:49:36 +00:00
WhiteTreePaladin 637412cb5a update name for alpha 4
update default single player map for alpha 4

This was SVN commit r9020.
2011-03-05 03:53:04 +00:00
Ykkrosh e608d9269a Load entity templates for the AI via the progressive loader.
Display message while loading the map list for the setup screen.

This was SVN commit r9019.
2011-03-05 01:56:59 +00:00
Pureon 19c8ca3ef4 siege ram trained sound effect added
This was SVN commit r9018.
2011-03-05 00:43:26 +00:00
Pureon 8b655f4f99 Celt siege ram produced in fortress buildings
This was SVN commit r9017.
2011-03-05 00:21:09 +00:00
Ykkrosh e6ebfa2ab9 Fix tests
This was SVN commit r9016.
2011-03-04 23:22:09 +00:00
Ykkrosh 2229c10e05 Delete rint/rintf emulation for Windows, since it got broken (the tests fail) and we don't use it any more
This was SVN commit r9015.
2011-03-04 23:16:04 +00:00
Ykkrosh 09cbe4f341 Disable debug messages when instantiating AIs
This was SVN commit r9014.
2011-03-04 21:50:30 +00:00
Ykkrosh cae4b1b1af Hide useless 'server name' field on setup screen
This was SVN commit r9013.
2011-03-04 21:48:01 +00:00
Ykkrosh 3e7731e8ca Stop units wasting their lives chasing animals they'll never be able to catch.
Let AI players collect treasures.

This was SVN commit r9012.
2011-03-04 21:42:39 +00:00
Ykkrosh 3a5ca7fdbc Improve camera restraints at edge of map to be independent of zoom, and to work on circular maps.
Fixes #573.

This was SVN commit r9011.
2011-03-04 20:02:05 +00:00
Ykkrosh bec4c6437b Make non-combat units flee when under melee attack, and not attack enemies automatically.
Fixes #703.

This was SVN commit r9010.
2011-03-04 14:36:41 +00:00
Ykkrosh 3e22cf4cae Focus map-selection list by default in single-player game setup screen, to allow keyboard navigation
This was SVN commit r9009.
2011-03-04 14:29:28 +00:00
Ykkrosh 2ef1b9a867 Make projectiles that miss their target continue until hitting the terrain.
Fixes #706.

This was SVN commit r9008.
2011-03-04 00:43:48 +00:00
Ykkrosh 6bcce22a88 Tell the profiler about a few more bits of code
This was SVN commit r9007.
2011-03-03 22:38:01 +00:00
Ykkrosh 58ae08522f Let local.cfg override the hardware-dependent defaults set by hwdetect
This was SVN commit r9005.
2011-03-03 01:49:49 +00:00
Ykkrosh 1c1564daaf Make profiler JSON output much more concise.
Right-align values in in-game profile viewer.
Add alternating row shading in profile viewer, to make it easier to
read.

This was SVN commit r9004.
2011-03-03 01:09:19 +00:00
Ykkrosh 16a4eb36dd Various minor optimisations.
Enable SpiderMonkey method JIT in Release mode.
Add Engine.ProfileStart/Engine.ProfileStop functions for scripts.
Fix AI to clone initial entity data and shared metadata.

This was SVN commit r9003.
2011-03-03 00:16:14 +00:00
Ykkrosh 8d2d4a8505 Fix profile parser
This was SVN commit r9002.
2011-03-03 00:14:23 +00:00
Ykkrosh dbc6d27411 Optimise obstruction grid updates in the common case when terrain hasn't changed
This was SVN commit r9001.
2011-02-28 01:24:12 +00:00
Ykkrosh 794584ea11 Optimise tile-based pathfinder, particularly for large maps.
This was SVN commit r9000.
2011-02-28 00:35:53 +00:00
Ykkrosh cb0e322a61 # Minor AI fixes.
Avoid script errors on Miletus.
Use pre-existing female citizens as workers.
Fix autostart.

This was SVN commit r8999.
2011-02-27 19:20:36 +00:00
Ykkrosh b15ea0691f Attempt to improve AI selection in the game setup screen.
This was SVN commit r8998.
2011-02-27 17:58:41 +00:00
Ykkrosh d045258c29 Let exceptions in GUI script events triggered by script setters propagate out of the setter, so error messages aren't useless.
This was SVN commit r8997.
2011-02-27 17:57:32 +00:00
Ykkrosh eb163c8d24 Improve reporting of extensions promoted into GL 1.2
This was SVN commit r8996.
2011-02-27 14:25:04 +00:00
Ykkrosh 18b317bc19 # Improve animal AI, based on patch from Badmadblacksad.
Fixes #563.

This was SVN commit r8995.
2011-02-27 13:34:22 +00:00
Pureon 83d0492fca New Celt fishing boat. Hele fishing boat update.
This was SVN commit r8993.
2011-02-26 22:52:58 +00:00
Ykkrosh 407b1ef80f Bump hwdetect version, to identify reports that include recent bugfixes
This was SVN commit r8992.
2011-02-26 19:41:01 +00:00
janwas bb562ce179 fixes:
avoid reporting a (not-present) third-level cache for Athlon X2 that
don't have one
add better documentation of cache information
ensure we're running on the same CPU while retrieving cache/TLB
descriptors
wgfx: always check all known graphics driver names (more robust in the
face of changing gfx_card strings), correct the intel driver name

This was SVN commit r8991.
2011-02-26 19:22:02 +00:00
janwas 567a698628 check all file names known to belong to a GPU's drivers instead of trying to rule out 32/64 bit variants
fixes #737

This was SVN commit r8990.
2011-02-26 17:10:09 +00:00
Ykkrosh 4f8dc9c777 Fix script error message when starting Atlas
This was SVN commit r8989.
2011-02-26 00:19:02 +00:00
Ykkrosh 6d7c27edfe Fix occasionally rendering just terrain and no models when starting a game
This was SVN commit r8988.
2011-02-26 00:07:16 +00:00
Ykkrosh 92e84a9112 Fix keys like F11 triggering two events when sent from Atlas to the game engine
This was SVN commit r8987.
2011-02-25 23:53:09 +00:00
Ykkrosh f0ea32cb8d Import user-report server side code
This was SVN commit r8986.
2011-02-25 19:46:01 +00:00
janwas 4e8c305c6e sync with work - export app_hooks_update; add boost replacement FileExists and FileSize; avoid conflict with stdint.h;
remove asm rintf implementation (sse is faster); avoid the need for an
external 64-bit asm file with vc2008/vc2010; allow arbitrarily long
command line args

This was SVN commit r8985.
2011-02-25 16:31:42 +00:00
janwas d805ef356e FileExists -> VfsFileExists (see next commit)
scriptInterface: fix bool cast warning

This was SVN commit r8984.
2011-02-25 16:30:55 +00:00
Ykkrosh 77fe5c9e40 Disable shadows and fancy-water by default on some slower graphics devices.
See #623.

This was SVN commit r8983.
2011-02-25 02:00:57 +00:00
Ykkrosh a903b4c9d3 Fix #684 (disable S3TC on R600 drivers).
Clean up hwdetect a tiny bit.

This was SVN commit r8982.
2011-02-25 01:31:00 +00:00
Ykkrosh 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
Ykkrosh f4f36af852 Block new buildings being placed on top of existing not-yet-started foundations. Fixes #740.
This was SVN commit r8980.
2011-02-24 21:49:24 +00:00
Ykkrosh 798278a6c1 Fix template validation error
This was SVN commit r8979.
2011-02-24 21:45:25 +00:00
Ykkrosh 63f958878d Fix GUI errors and glitches when placing buildings and not moving the mouse.
This was SVN commit r8977.
2011-02-24 02:12:47 +00:00
Ykkrosh e16681f0e5 Fix destruction queue warnings when using some GUI features with time-warp enabled
This was SVN commit r8976.
2011-02-24 02:05:06 +00:00
Ykkrosh f6c1d98c9a Fix #739 (test failures).
Use JSON in debug serializer output unless it fails due to e.g. cyclic
values, in which case use toSource.
Disable file stats code by default, since its output isn't used.

This was SVN commit r8975.
2011-02-24 00:32:38 +00:00
Ykkrosh 059a53dd37 Fix startup hang on OS X, caused by using timers before initialising them
This was SVN commit r8974.
2011-02-23 09:19:41 +00:00
Ykkrosh 6b783aebd6 Try to fix build errors
This was SVN commit r8973.
2011-02-22 21:50:26 +00:00
Ykkrosh 0c1e05d672 Fix typo
This was SVN commit r8972.
2011-02-22 20:15:59 +00:00
Ykkrosh e370223d1d Fix register handle leak
This was SVN commit r8971.
2011-02-21 22:25:51 +00:00
Ykkrosh abe07e096a Build fix
This was SVN commit r8970.
2011-02-21 22:22:49 +00:00
Ykkrosh 9bbda8b80b HTTP proxy discovery for Windows
This was SVN commit r8969.
2011-02-21 21:54:47 +00:00
Ykkrosh 25039d3aff Fix build errors with old glext.h.
Report full cache details, and lsb-release when available.

This was SVN commit r8968.
2011-02-21 18:56:23 +00:00
Ykkrosh ee8b193cdb Fix profiler crash differently
This was SVN commit r8967.
2011-02-21 11:57:01 +00:00
janwas a155809447 avoid crash due to null pointer in profiler (triggered by returning from the root node)
This was SVN commit r8966.
2011-02-21 09:41:11 +00:00
janwas 8f59d52697 sync with work; fix compile error due to lack of boost/serialization in 0ad svn
This was SVN commit r8965.
2011-02-21 09:23:51 +00:00
Ykkrosh d75d9c3b75 Make the script profiler more useful, by giving the filename/line for anonymous functions.
Fix the turn-based profiler a bit.

This was SVN commit r8964.
2011-02-21 02:16:12 +00:00
Ykkrosh 0be515280b Memoize some common entity lists in AI scripts.
This was SVN commit r8963.
2011-02-21 02:14:45 +00:00
Kimball 4ba59510b5 Corral with new type of roof.
This was SVN commit r8962.
2011-02-20 23:50:52 +00:00
Ykkrosh 807663cd54 Fix uninitialised value
This was SVN commit r8961.
2011-02-20 20:52:35 +00:00
Ykkrosh d7a243343d Add per-turn counts to profiler, as well as per-frame.
Remove percent-of-parent and percent-of-frame timings since they're not
particularly useful.
Simplify profiler update code by using RingBuf.
Handle profiler keys via character codes rather than keysyms, to
hopefully work with different keyboard layouts.
Make console intercept all keys, to stop digits, shift-D, etc having
unexpected side-effects.
Disable console copy/paste when console is inactive.

This was SVN commit r8960.
2011-02-20 20:50:26 +00:00
Ykkrosh b24396740c Disable XML validation when loading templates for AI, to save startup time
This was SVN commit r8959.
2011-02-20 20:45:39 +00:00
Ykkrosh 6ba12dd2ff Pretty-print JS values in debug serializer
This was SVN commit r8958.
2011-02-20 20:44:36 +00:00
Ykkrosh 720bb3c87d Remove unnecessary rooting
This was SVN commit r8957.
2011-02-20 20:44:13 +00:00
Ykkrosh e8a650bc30 Const-correctness
This was SVN commit r8956.
2011-02-20 20:42:54 +00:00
Pureon 2501b42447 Celt warship and merchant ship updates. New Celt sail textures
This was SVN commit r8955.
2011-02-20 14:40:15 +00:00
Pureon 28354159db Added eyecandy bridge edges.
This was SVN commit r8954.
2011-02-20 12:27:12 +00:00
Ykkrosh 5f64937d02 Skip detecting some not-very-useful GL values that cause errors in some drivers
This was SVN commit r8953.
2011-02-20 11:46:48 +00:00
Ykkrosh c29f2d26b3 Add some more stuff to hwdetect, because there can never be too much
This was SVN commit r8951.
2011-02-20 00:54:36 +00:00
Ykkrosh e91434a23d Extend isImplementedInCore up to GL 3.0
This was SVN commit r8950.
2011-02-20 00:52:50 +00:00
Ykkrosh b2f5dd1b62 Non-PCH build fixes
This was SVN commit r8949.
2011-02-19 22:30:34 +00:00
WhiteTreePaladin ffa8bf5ea4 added missing word and reworded some text
This was SVN commit r8948.
2011-02-19 21:58:38 +00:00
janwas 1a2a7677fd replace set/map with boost::unordered_* to reduce the number of expensive filesystem::basic_path::operator< calls based on a patch by ortalo (thanks!)
This was SVN commit r8947.
2011-02-19 21:24:39 +00:00
WhiteTreePaladin 007985332b formatted feedback dialog to look a little nicer
This was SVN commit r8946.
2011-02-19 21:24:03 +00:00
janwas a02a5d8e5e refactor graphics driver detect code, ensure both variants return name.dll(version)
This was SVN commit r8945.
2011-02-19 20:46:43 +00:00
janwas 83569c8f13 detect when detecting OpenGL driver version failed because the driver didn't describe itself in the registry;
fall back to detecting the version of the driver DLL (whose name we
guess)

This was SVN commit r8944.
2011-02-19 20:24:38 +00:00
janwas 7445342b61 wdll_ver: avoid errors while reading DLL version due to (lack of) FS redirection
UserReport: avoid windows iterator debugging warning due to invalid
operator[]

This was SVN commit r8942.
2011-02-19 19:15:00 +00:00
Ykkrosh 06a088efa8 Replace libcurl with a self-compiled (in VC2005) copy of 7.21.4 with no SSL/zlib support, in an attempt to fix errors on 64-bit Windows
This was SVN commit r8941.
2011-02-19 18:44:09 +00:00
janwas 1b1230ca3e wgl compile fix: add types required by new wglext.h
wutsname fix (noticed by Philip from hwdetect information, thanks!):
uname.release wasn't always set.
BinarySerializer.h: warning fix

This was SVN commit r8940.
2011-02-19 18:00:09 +00:00
Ykkrosh f3372bf11d Add some rough performance reporting.
Make the profiler converge a bit faster.

This was SVN commit r8939.
2011-02-19 03:14:37 +00:00
Ykkrosh 3e13c300cc Fix non-PCH build error
This was SVN commit r8938.
2011-02-19 00:46:14 +00:00
Ykkrosh ceb4bc9b94 Report more hardware details
This was SVN commit r8937.
2011-02-19 00:39:32 +00:00
Ykkrosh 3e1f09a58f Fix missing newline in GL error reporting
This was SVN commit r8936.
2011-02-19 00:38:08 +00:00
Ykkrosh c7f647ae73 Don't bother initialising shadow map textures with data that will never be used.
Add some profiling in the shadow rendering code.

This was SVN commit r8934.
2011-02-18 23:41:27 +00:00
Ykkrosh 04dcbd294c Push the near clip plane further out, to reduce z-fighting
This was SVN commit r8933.
2011-02-18 23:38:28 +00:00
Ykkrosh d600a400fe Fix GUI text input box scrollbars not moving when the window is resized.
This was SVN commit r8932.
2011-02-18 22:49:24 +00:00
Ykkrosh 387b801aed Fix tooltip crash/corruption, caused by inconsistently changing types.
This was SVN commit r8931.
2011-02-18 22:36:39 +00:00
Kimball a9e920a467 Iberian corral (still needs new footprint)
This was SVN commit r8930.
2011-02-17 23:09:04 +00:00
Ykkrosh 1c7e33b528 Remove a load of implicit CStr type conversions, since they're error-prone and can cause silent data loss.
Handle most CStr8/CStrW conversions via UTF-8 instead of effectively
assuming Latin-1.
Return UTF-8 strings from Xeromyces API.

This was SVN commit r8929.
2011-02-17 20:08:20 +00:00
Ykkrosh 4f724056d5 Remove some unused bits from CRenderer
This was SVN commit r8927.
2011-02-16 22:40:15 +00:00
Ykkrosh 3d997365d8 Fix CStr numeric constructors on 32-bit platforms.
Remove unnecessary assignment operators.

This was SVN commit r8926.
2011-02-16 21:14:08 +00:00
Ykkrosh 0da7e822ff # Add opt-in automatic feedback system.
Add GL implementation limits to hwdetect.
Make the in-game manual support multiple text files.
Remove unnecessary instruction on how to close the manual window.
Make guitextobject.caption return the original value without stripping
formatting tags.
Remove unused non-VFS support from config system.
Support writing config files back to their original path.
Remove unnecessary user profile directory; use normal config directory.

This was SVN commit r8925.
2011-02-16 20:40:15 +00:00
Ykkrosh 1c3c962ea1 Import libcurl for Windows
This was SVN commit r8924.
2011-02-16 11:22:34 +00:00
Ykkrosh 3d992ffea6 GCC build fix
This was SVN commit r8923.
2011-02-15 16:40:23 +00:00
janwas ddba0cc311 topology.cpp: fix for non-contiguous APIC IDs
wcpu: avoid undefined shift right on 64-CPU systems (caught via
assertion)
filesystem: add wrename
path_util: add std::wstring variants of common boost::filesystem
routines

This was SVN commit r8922.
2011-02-15 10:38:11 +00:00
Pureon 90c60c6580 Hele fishing boat update
This was SVN commit r8921.
2011-02-13 19:02:21 +00:00
Ykkrosh fca69efd76 Fix build for GCC 4.5
This was SVN commit r8920.
2011-02-13 18:38:22 +00:00
Ykkrosh 11837204b6 Fix archive builder to not compress the recently-renamed terrain blend textures
This was SVN commit r8919.
2011-02-13 17:37:33 +00:00
Pureon 6d798804c3 Quieter resource gathering
This was SVN commit r8918.
2011-02-13 17:01:22 +00:00
Ykkrosh 65af9307ea Change tooltips in commands panel to be bottom-aligned, so they don't obscure the button you're pointing at
This was SVN commit r8917.
2011-02-13 12:17:32 +00:00
Ykkrosh dbd3de82ff Fix #705 (tooltips go off screen when displayed near a corner), based on patch from Leonard
This was SVN commit r8916.
2011-02-13 12:16:31 +00:00
Ykkrosh c7056490b2 Restrict the initial window size to the screen size (hopefully fixes #532).
This was SVN commit r8915.
2011-02-12 21:21:07 +00:00
Pureon 608c7f0e70 Celt siege ram texture update
This was SVN commit r8914.
2011-02-12 00:20:22 +00:00
Ykkrosh eb074ba28c Fix #495 (warn when locale is bogus), based on patch from darrenhoffman and sergiovier
This was SVN commit r8913.
2011-02-12 00:19:59 +00:00
Pureon 7476bad7e2 New siege ram sounds added. Celt siege ram files.
This was SVN commit r8912.
2011-02-12 00:01:21 +00:00
Ykkrosh aa8c3a9ea9 Fixed #582 (add camera reset command in Atlas), based on patch from stilz
This was SVN commit r8911.
2011-02-11 23:56:55 +00:00
Ykkrosh 9b25df5958 Fix #591 (Disable sounds for units in FoW/SoD), based on patch from Bogi
This was SVN commit r8910.
2011-02-11 23:02:19 +00:00
Ykkrosh fb738766ea Recompute building placement preview every turn, so its colour responds to changes in the environment
This was SVN commit r8909.
2011-02-11 11:17:32 +00:00
Pureon 6cd212a68d Female acknowledgement sound placeholder
This was SVN commit r8908.
2011-02-11 00:40:25 +00:00
Ykkrosh 804e817cf5 Fix rendering of main menu buttons after leaving a game
This was SVN commit r8907.
2011-02-10 23:58:33 +00:00
Ykkrosh 11bc751fd3 Save replay log's commands.txt in new locations when playing multiple games in a single session
This was SVN commit r8906.
2011-02-10 23:57:19 +00:00
Pureon ec97d271d6 Added bark sounds to celt war dog
This was SVN commit r8905.
2011-02-10 23:24:10 +00:00
Ykkrosh a1ef809904 Fix error when returning resources before having ever collected any
This was SVN commit r8904.
2011-02-10 23:09:28 +00:00
Ykkrosh b73c544f2a Fix warning
This was SVN commit r8903.
2011-02-10 22:55:41 +00:00
Pureon 72f1e46b97 Gathering sounds for Celt and Hele infantry units
This was SVN commit r8902.
2011-02-10 20:52:29 +00:00
Ykkrosh 78e174af7d Fix auto-gathering after constructing fields.
Fix building on top of animal corpses.
Fix builders getting in the way of their own building.

This was SVN commit r8900.
2011-02-10 19:50:08 +00:00
Ykkrosh b8925fbbc9 # Support AI construction of buildings.
Pass terrain passability data to AI scripts.
Expand pathfinder passability data to 16 bits per tile, to allow more
classes.
Support 16-bit ints in serializer.
Partially support JS typed arrays.
Allow foundations to be placed on top of units (fixes #499).
Stop farms and fishes blocking movement (fixes #534).
Add obstruction flags to allow finer control over what they block.
Associate entity IDs with obstruction shapes, to allow finding colliding
entities.
Support moving to the edge of a target entity with inactive obstruction.
Support foundation entities in AI.
Support playing as non-hele civs.

This was SVN commit r8899.
2011-02-10 16:06:28 +00:00
Mythos_Ruler 556664d477 Animation speed tweaks.
This was SVN commit r8898.
2011-02-09 23:26:43 +00:00
Pureon ddb7bf21f6 Temp fix to fortress_new projectile attachpoint error
This was SVN commit r8897.
2011-02-09 22:36:17 +00:00
Pureon c63fb49154 Added resource gathering sounds to celt and hellene females
This was SVN commit r8896.
2011-02-09 20:55:35 +00:00
Ykkrosh 64f02d5b47 Remove misleadingly obsolete package scripts
This was SVN commit r8895.
2011-02-09 16:36:08 +00:00
Pureon 7a38272e55 This was SVN commit r8894. 2011-02-08 21:51:51 +00:00
Pureon ae48a18258 This was SVN commit r8893. 2011-02-08 21:51:24 +00:00
Ykkrosh 66f2bc6d57 Flip iteration order in LOS texture blur to improve performance
This was SVN commit r8892.
2011-02-06 11:39:06 +00:00
Ykkrosh 57e5bb878a Initial terrible AI player scripts.
This was SVN commit r8891.
2011-02-05 20:35:34 +00:00
Ykkrosh ff785853ad Expand the selection-state box so the text can all fit in.
This was SVN commit r8890.
2011-02-05 20:34:11 +00:00
Ykkrosh aa1fcfd20c Change fog-of-war blur to use a better filter.
This was SVN commit r8889.
2011-02-05 18:19:28 +00:00
Ykkrosh bf3d5c75f0 Be more robust to broken terrain property files.
This was SVN commit r8888.
2011-02-05 13:13:57 +00:00
Ykkrosh caad072347 Expand pathfinder boundaries to stop units disappearing off the edge of the visible map.
This was SVN commit r8887.
2011-02-03 19:40:41 +00:00
Ykkrosh 02e7eb69ff # Add solid black sides to the map, to hide underwater terrain.
This was SVN commit r8886.
2011-02-03 14:36:54 +00:00
Ykkrosh c710e718aa Windows fixes
This was SVN commit r8884.
2011-02-03 02:33:37 +00:00
Ykkrosh cb78822f19 Delete some unused bits.
This was SVN commit r8883.
2011-02-03 01:17:16 +00:00
Ykkrosh fe21c5e023 # Rewrite fog-of-war rendering.
Disable shadows when only 2 TMUs available.
Clean up some other rendering code.

This was SVN commit r8882.
2011-02-03 01:12:24 +00:00
Ykkrosh 1e02fe70a7 Add texture limits to hwdetect
This was SVN commit r8881.
2011-01-31 18:59:37 +00:00
Mythos_Ruler 81ac9285b6 This was SVN commit r8880. 2011-01-31 05:25:38 +00:00
Mythos_Ruler 0e0f16dedb Template for super cav swordsmen.
This was SVN commit r8879.
2011-01-31 05:08:11 +00:00
Ykkrosh 18189ef4fc Simplify terrain blend rendering to use non-indexed arrays
This was SVN commit r8878.
2011-01-30 14:43:35 +00:00
Ykkrosh 566bbf0fa0 Fix assertion failure when running pre-game GUI
This was SVN commit r8877.
2011-01-30 02:14:44 +00:00
Ykkrosh 1243fbaa8c Fix accidental line duplication
This was SVN commit r8876.
2011-01-29 21:30:23 +00:00
Ykkrosh 5e618e1526 Remove redundant bounds check
This was SVN commit r8875.
2011-01-29 21:14:49 +00:00
Ykkrosh 6af877a1cb Fix Windows crash caused by calling js_free (which calls free from the wrong CRT).
Fix some warnings.

This was SVN commit r8873.
2011-01-29 17:50:42 +00:00
Ykkrosh 03c75100ab # Fix terrain blending logic.
Add terrain priority rendering mode in Atlas.
Fix terrain painting in Atlas to be less profligate with priority
values.
Support hotloading of blend textures.
Clean up some trivial things.

This was SVN commit r8872.
2011-01-29 16:31:48 +00:00
Ykkrosh d0bc4253c9 Add new terrain blend textures.
Delete old low-quality ones.

This was SVN commit r8871.
2011-01-29 16:28:41 +00:00
Ykkrosh 63bd39d4a5 Fix perspective calculation in CCamera::GetScreenCoordinates.
Fixes #99.

This was SVN commit r8870.
2011-01-28 21:51:59 +00:00
janwas fd46b9e370 fixes/improvements from work:
file/wfilesystem: avoid error dialog when opening a file that doesn't
exist
precompiled/pch_warnings: remove push/pop that prevented our warning
disables to applying to other code. update comments
topology: refactor APIC field access and add support for constructing
APIC ID from topology
waio: add file_attribute_normal
wsysdep: slightly safer sys_generate_random_bytes implementation

This was SVN commit r8869.
2011-01-28 13:40:07 +00:00
Ykkrosh 0d8ffa58dc AoE3Ed build fixes
This was SVN commit r8868.
2011-01-17 13:29:45 +00:00
Ykkrosh c3b734775b Simplify component interface: remove explicit context parameter, use GetSimContext() instead.
This was SVN commit r8867.
2011-01-16 14:08:38 +00:00
Ykkrosh f39f279132 Add AI script code to provide a cleaner API around the engine interface.
Handle AIProxy entirely through scripts.
Support structured clones of script values.
Improve performance.
Support multiple script contexts sharing a runtime.
Use a separate context per AI player.

This was SVN commit r8866.
2011-01-15 23:35:20 +00:00
Ykkrosh dd501b2a5a # Add initial basic player AI framework.
Support direct access to serializer streams, so serializers can be
nested.
Make component script "this.template" read-only.
Stop globally-subscribed component scripts receiving messages posted to
local components, to reduce out-of-sync risks.
Move pathfinder data out of entity template directory.
Fix GuiInterface deserialization.

This was SVN commit r8865.
2011-01-12 12:29:00 +00:00
Ykkrosh 1051d10f54 Add "chat" command.
Simplify deletion of multiple entities.
Simplify some setTimeouts.

This was SVN commit r8864.
2011-01-12 12:21:41 +00:00
Ykkrosh 23a3dfe755 Fix typo in error message.
This was SVN commit r8863.
2011-01-12 12:19:13 +00:00
Ykkrosh d8cd31d4b6 Add probably-unnecessary script serialization test.
This was SVN commit r8862.
2011-01-12 12:13:11 +00:00
Ykkrosh 19548a7379 Fix use of uninitialised variable.
This was SVN commit r8861.
2011-01-12 12:11:31 +00:00
feneur 0e02272fb5 #Added Hotkeys list to in-game manual, with the help of a patch by dustin_ (the hotkeys list is at the bottom of the list, and the most basic shortcuts are listed in both the Basic controls list and the hotkeys list, but I think that minor duplicate information is fine, feel free to edit if you have a better idea)
closes #714

This was SVN commit r8859.
2011-01-09 17:53:27 +00:00
Ykkrosh aaef1b0d74 Add script for generating mostly-useless component interaction graphs.
Fix some components to use more standard syntax.

This was SVN commit r8857.
2011-01-07 20:31:48 +00:00
janwas 002e3f5606 minor fixes from work; also add sys_WideFromArgv
This was SVN commit r8856.
2011-01-04 19:53:38 +00:00
fcxSanya a0d2d89863 Fixed Cost element in template_unit_mechanical_siege_ballista template
This was SVN commit r8855.
2011-01-03 13:42:57 +00:00
fcxSanya 9af7747d76 Adding necessary BuildRestrictions/Category element to some templates
This was SVN commit r8854.
2011-01-03 13:36:40 +00:00
EmjeR 75136d84d2 This was SVN commit r8853. 2011-01-03 03:10:29 +00:00
Kimball a992bd23ca Better shuttle meat.
This was SVN commit r8852.
2011-01-02 13:10:01 +00:00
Kimball 31effd1cb3 This was SVN commit r8851. 2011-01-02 13:09:19 +00:00
Kimball d6f82d6e8f This was SVN commit r8850. 2011-01-02 12:16:07 +00:00
Kimball c627c4abff This was SVN commit r8849. 2011-01-02 12:15:40 +00:00
Kimball e21ca2f64d Fixed all Iberian actors for new simulation system, added Iberian healer (though currently without art assets).
This was SVN commit r8848.
2011-01-02 12:14:59 +00:00
ShieldBearer 47f9768da8 # New Roman House
This was SVN commit r8846.
2010-12-31 12:41:10 +00:00
Ykkrosh 2fa3c554de Windows build fixes
This was SVN commit r8845.
2010-12-30 20:10:04 +00:00
Ykkrosh 40933c06e1 Primitive support for gamepad camera movement
This was SVN commit r8844.
2010-12-30 19:45:13 +00:00
Kimball 37c1c2e9b8 One last fix
This was SVN commit r8843.
2010-12-28 06:20:20 +00:00
Kimball 564c54c1cf Fixed corral
This was SVN commit r8842.
2010-12-28 06:12:12 +00:00
Kimball 1d05ed7c31 Kart corral updates
This was SVN commit r8841.
2010-12-27 07:23:01 +00:00
Kimball a0add039bd New carthaginian corral
This was SVN commit r8840.
2010-12-27 05:24:28 +00:00
feneur 16be9799fb Edited the about dialog to reflect the present more open development model.
This was SVN commit r8839.
2010-12-25 22:30:17 +00:00
feneur 95044194be fixed where the descriptions for both Shift + WheelUp and Shift + WheelDown said the same thing, now it should be correct (please fix it if I made any mistake)
This was SVN commit r8838.
2010-12-23 20:48:37 +00:00
Kimball e98c18ce04 This was SVN commit r8837. 2010-12-19 17:10:19 +00:00
evanssthomas 5e3049f6b2 BuildLimits. Needs some configuration changes to work
This was SVN commit r8836.
2010-12-11 23:19:17 +00:00
Ykkrosh 2fd6e2e8cc Fix some more warnings
This was SVN commit r8835.
2010-12-11 12:35:50 +00:00
Ykkrosh 802f22485b Fix some warnings on Windows
This was SVN commit r8834.
2010-12-11 12:33:02 +00:00
Ykkrosh ad3f33dd27 Build fix for very old SDL
This was SVN commit r8833.
2010-12-11 02:25:21 +00:00
Ykkrosh 11b767e235 Stop unit deletion prompt text overlapping the window border
This was SVN commit r8832.
2010-12-09 22:15:23 +00:00
Ykkrosh 89b294d536 Disable compression for more UI textures with noticeable artifacts
This was SVN commit r8831.
2010-12-09 22:06:11 +00:00
Ykkrosh 7a9e12613d Update release number
This was SVN commit r8830.
2010-12-09 18:46:56 +00:00
janwas ba2a9d7af3 improvements from work: [update-workspaces required]
- split precompiled.h into several headers (simplifies reuse)
- enable additional warnings not in W4
- split ErrorReaction into ErrorReactionInternal - clarifies which
values can actually be returned by debug_DisplayError
- wsdl: slightly safer HDC usage via CS_OWNDC, avoid dipping into DC
cache via ValidateRect instead of BeginPaint; remove unused thread
create
- StdDeserializer - wasn't including byte_order => BYTE_ORDER was
undefined
- wsysdep: clean up error dialog message handling

This was SVN commit r8828.
2010-12-09 11:16:21 +00:00
historic_bruno 78f2924f9c Changed default maps
This was SVN commit r8827.
2010-12-09 01:30:51 +00:00
Mythos_Ruler 76a67755bc Garrison flag for wall turret.
This was SVN commit r8826.
2010-12-09 00:03:19 +00:00
Mythos_Ruler c7a31987bb Moar garrison flag work.
This was SVN commit r8825.
2010-12-08 23:34:33 +00:00
Mythos_Ruler 5cf1995e2c Fixing up some garrison flag stuff and projectile stuff.
This was SVN commit r8824.
2010-12-08 23:10:24 +00:00
Mythos_Ruler 0b511e33a7 This was SVN commit r8823. 2010-12-08 21:26:50 +00:00
Mythos_Ruler be4b262919 Removed the dudes from the top of the wall gate. Made a bolt projectile for the Oxybeles.
This was SVN commit r8822.
2010-12-08 21:26:08 +00:00
evanssthomas 549a4fc51a Garrisoning bug fixes
This was SVN commit r8821.
2010-12-08 20:12:24 +00:00
Mythos_Ruler e486e6fefb Adjusted health/train time of the Corrals.
This was SVN commit r8820.
2010-12-08 19:41:12 +00:00
Mythos_Ruler a80b139a28 Building tooltip tweaks for Alpha III release. These tooltips will be updated as we add more relevant features.
This was SVN commit r8819.
2010-12-08 19:29:48 +00:00
Mythos_Ruler 2cfd3abf08 This was SVN commit r8818. 2010-12-08 19:16:49 +00:00
Ykkrosh e853dd1079 Display "garrisoned" prop on buildings containing units
This was SVN commit r8817.
2010-12-08 19:03:57 +00:00
Ykkrosh 2540e17f45 Fix non-PCH builds
This was SVN commit r8816.
2010-12-08 18:54:05 +00:00
Mythos_Ruler 3dc6ddc8de Garrison unload button.
This was SVN commit r8815.
2010-12-08 18:46:59 +00:00
Ykkrosh ac3e40fe8f Disable compression for some loading screen textures, to improve quality
This was SVN commit r8812.
2010-12-08 16:23:35 +00:00
Ykkrosh f04c2561b7 Various resource shuttling improvements. Fixes #672.
This was SVN commit r8811.
2010-12-08 16:12:04 +00:00
Ykkrosh 0b0b11d2e0 Fix occasional assertion failure in time warp mode
This was SVN commit r8810.
2010-12-08 16:09:53 +00:00
historic_bruno e710fd25b4 Minor tweaks to game setup layout: options are now properly aligned and "locked teams" defaults to yes (which is what they are). Fix team indices on one map.
This was SVN commit r8809.
2010-12-08 06:19:34 +00:00
Mythos_Ruler 76ac9e7f84 This was SVN commit r8808. 2010-12-06 23:24:07 +00:00
Mythos_Ruler 0f30f08da5 This was SVN commit r8807. 2010-12-06 23:22:54 +00:00
Mythos_Ruler b7240dc3fe This was SVN commit r8806. 2010-12-06 22:50:08 +00:00
Mythos_Ruler 1932f695c4 Fixes #699
This was SVN commit r8805.
2010-12-06 21:30:56 +00:00
Mythos_Ruler 4f67615774 Fixes #701
This was SVN commit r8804.
2010-12-06 21:27:35 +00:00
Ykkrosh 8ddef2fee0 Add fast-forward/rewind commands, to help with testing.
This was SVN commit r8803.
2010-12-06 19:58:06 +00:00
k776 c2f4f56ad6 Add the Demo keyword to one last map
This was SVN commit r8802.
2010-12-06 04:59:44 +00:00
historic_bruno 9714b5dd53 Keyword clean-ups
This was SVN commit r8801.
2010-12-06 04:34:26 +00:00
historic_bruno 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
Mythos_Ruler 01f699b62d Too much stuff to itemize. I'm lazy.
This was SVN commit r8799.
2010-12-06 02:20:57 +00:00
historic_bruno 637b471769 Fixes bug in last change to input.js. Use target HP to determine attack possibility. Thus gaia buildings and animals are attackable, but not trees/mines/etc.
This was SVN commit r8798.
2010-12-05 22:00:07 +00:00
Ykkrosh f2e1443631 Fix playtest mode in Atlas.
This was SVN commit r8797.
2010-12-05 21:09:20 +00:00
Mythos_Ruler 4eb9c898ac Tropic Terrains completely redone.
This was SVN commit r8796.
2010-12-05 17:03:01 +00:00
Ykkrosh 1b9d3fc289 Fix F10 key to open session menu.
This was SVN commit r8795.
2010-12-05 16:02:15 +00:00
Mythos_Ruler 15a663b91c New Iberian Walls
This was SVN commit r8794.
2010-12-05 13:30:04 +00:00
Mythos_Ruler 62dae2279b Updated the map.
This was SVN commit r8793.
2010-12-05 12:10:03 +00:00
historic_bruno 1201956b93 Additional cleaning up of logging: removed LOG_CATEGORY macro definitions.
This was SVN commit r8792.
2010-12-05 08:50:33 +00:00
historic_bruno 19dbbb816d Changed all references from old CLogger API to use the new API. Removed old API. Fixes #247
This was SVN commit r8791.
2010-12-05 08:41:55 +00:00
historic_bruno 67f08751f9 Fixes bug where military units that can't collect resources would show an "attack" icon on hovering a resource - instead they should have a default icon
This was SVN commit r8790.
2010-12-05 06:34:57 +00:00
historic_bruno 95da3789cd Handle SDL_ACTIVEEVENT which notifies us of mouse focus change. If mouse focus is lost don't render cursor, reverting back to OS style. When focus is regained, render cursor again. Fixes #626
This was SVN commit r8789.
2010-12-05 05:17:28 +00:00
Ykkrosh 819bacd538 Automatically disable audio on OS X since it's stupid and broken.
This was SVN commit r8788.
2010-12-04 19:42:50 +00:00
Ykkrosh 5df240d97d Disable broken GUI error reporter on OS X
This was SVN commit r8787.
2010-12-04 19:09:41 +00:00
Ykkrosh 53b1447007 Fix what looks like miscompilation with GCC 4.0 on OS X
This was SVN commit r8786.
2010-12-04 19:06:13 +00:00
Ykkrosh 4575c26616 Disable compression of public.zip (fixes #671).
This was SVN commit r8785.
2010-12-04 15:57:55 +00:00
Ykkrosh 4b37898ab9 Fix tests.
This was SVN commit r8784.
2010-12-04 15:08:18 +00:00
Mythos_Ruler 1de0ce051f This was SVN commit r8783. 2010-12-04 00:12:51 +00:00
Ykkrosh 74114bf09a Handle XMB caching with the same system as texture caching.
Fixes #694.

This was SVN commit r8782.
2010-12-04 00:08:26 +00:00
WhiteTreePaladin 6e37762e3c fix some more issues with the loading tips
This was SVN commit r8781.
2010-12-03 23:52:11 +00:00
WhiteTreePaladin 83f297182e Fix tip loading issue with pre-converted textures
This was SVN commit r8780.
2010-12-03 23:31:02 +00:00
Mythos_Ruler 6662195f66 New desert plants! Updated Death Canyon with the new plants.
This was SVN commit r8779.
2010-12-03 21:33:45 +00:00
evanssthomas 238925f927 Minor garrisoning related tweaks
This was SVN commit r8778.
2010-12-03 20:25:21 +00:00
Mythos_Ruler 3b817d2162 Moved the sails from structural/ to props/ (which is what they are).
This was SVN commit r8777.
2010-12-03 19:22:56 +00:00
Mythos_Ruler cf2638da09 This was SVN commit r8776. 2010-12-03 14:42:19 +00:00
Mythos_Ruler 88a21a6e8a The Persian trireme was already in the Public mod and properly scaled. Ask next time before committing junk.
This was SVN commit r8775.
2010-12-03 02:37:09 +00:00
Ykkrosh 252d9b831b Revert bogus config changes
This was SVN commit r8774.
2010-12-03 01:21:49 +00:00
EmjeR c917a2d6a7 This was SVN commit r8773. 2010-12-03 00:42:27 +00:00
EmjeR c6593fd0ce This was SVN commit r8772. 2010-12-03 00:40:58 +00:00
EmjeR ef6cba9fe9 This was SVN commit r8771. 2010-12-03 00:40:40 +00:00
EmjeR e5792285ab This was SVN commit r8770. 2010-12-02 23:58:00 +00:00
EmjeR 4a66605e49 This was SVN commit r8769. 2010-12-02 23:46:28 +00:00
EmjeR b0dc3c72c9 This was SVN commit r8768. 2010-12-02 23:45:11 +00:00
EmjeR 8086433e2b This was SVN commit r8767. 2010-12-02 23:42:59 +00:00
EmjeR 6b0f06f839 This was SVN commit r8766. 2010-12-02 23:42:14 +00:00
EmjeR 88efdd5cbb This was SVN commit r8765. 2010-12-02 23:29:12 +00:00
EmjeR a7a858b9c0 This was SVN commit r8764. 2010-12-02 23:28:31 +00:00
EmjeR 11f7296188 Persian Trireme updated (added detail)
This was SVN commit r8763.
2010-12-02 21:51:37 +00:00
Mythos_Ruler da3fd69276 Iberian ship textures.
This was SVN commit r8762.
2010-12-02 20:08:29 +00:00
Ykkrosh ead65712eb Delete obsolete archbuild tool
This was SVN commit r8761.
2010-12-02 18:05:16 +00:00
Ykkrosh a6ca28ccf9 Fix reference to big screenshot key (see #627).
This was SVN commit r8760.
2010-12-02 17:44:18 +00:00
Mythos_Ruler f9fb602445 Iberian sail.
This was SVN commit r8759.
2010-12-01 18:29:24 +00:00
Mythos_Ruler 85d093eae1 Made a garrison flag. Added it to the Greek Civic Centre and scout Tower for testing.
This was SVN commit r8758.
2010-12-01 10:40:25 +00:00
Mythos_Ruler 1a7f927946 This was SVN commit r8757. 2010-12-01 07:33:26 +00:00
evanssthomas c09d6dcb83 Added garrison & repair button on the unit's command panel
This was SVN commit r8756.
2010-12-01 03:01:17 +00:00
Mythos_Ruler 1a1bed1294 This was SVN commit r8755. 2010-11-30 16:16:53 +00:00
Ykkrosh a58e7cfb4c Fix call to renamed function
This was SVN commit r8754.
2010-11-30 15:39:48 +00:00
Ykkrosh 6b4478209b Fix accidental use of hard-coded constant.
Don't bother recomputing terrain speeds multiple times per turn.

This was SVN commit r8753.
2010-11-30 14:48:04 +00:00
Ykkrosh ab186c2b16 Update UnitMotion logic, to partially simplify it.
Do all pathfinding asynchronously.
Recalculate paths when the target has moved.
Fix vertex pathfinder start point heuristic, to avoid finding
zero-length paths.
When units fail to reach a resource to gather, look for another resource
of the same type.

This was SVN commit r8751.
2010-11-30 12:31:54 +00:00
Ykkrosh 3401672887 Update pathfinding demo map for testing.
This was SVN commit r8750.
2010-11-30 12:28:51 +00:00
Ykkrosh e509887341 Complain better about invalid player IDs.
This was SVN commit r8749.
2010-11-30 12:27:38 +00:00
Ykkrosh 3b405efc6b Increase serializer reserved buffer space to cope with huge maps.
This was SVN commit r8748.
2010-11-30 12:24:46 +00:00
WhiteTreePaladin 89b0f3a9d7 New session tooltip styles
This was SVN commit r8747.
2010-11-30 04:27:04 +00:00
Mythos_Ruler 103aacd035 Misc stuff.
This was SVN commit r8746.
2010-11-29 22:00:57 +00:00
Mythos_Ruler f17d318359 Projectile for Celtic warship.
This was SVN commit r8745.
2010-11-29 20:19:05 +00:00
WhiteTreePaladin 6e602c15cd Renamed tips
Shorted Spartan tip text

This was SVN commit r8744.
2010-11-29 19:12:48 +00:00
Mythos_Ruler f60485be02 New Hellenes Mill. Deleted old mill assets.
This was SVN commit r8743.
2010-11-29 17:55:22 +00:00
Mythos_Ruler e4694b2d9c updated meshes
This was SVN commit r8742.
2010-11-29 15:01:11 +00:00
Mythos_Ruler 693425c716 New Greek corral by Amish.
This was SVN commit r8741.
2010-11-29 14:21:19 +00:00
Ykkrosh bee013b586 Define CONFIG_FINAL in Release builds, to enable better compression in codec_zlib.cpp
This was SVN commit r8740.
2010-11-29 12:51:45 +00:00
Mythos_Ruler 7ee0ba6e07 This was SVN commit r8739. 2010-11-29 12:12:46 +00:00
Mythos_Ruler 75d6eec95d This was SVN commit r8738. 2010-11-29 08:36:35 +00:00
Mythos_Ruler 9b9eaed50f This was SVN commit r8737. 2010-11-29 08:35:40 +00:00
Mythos_Ruler 28edb498d3 This was SVN commit r8736. 2010-11-28 19:03:23 +00:00
WhiteTreePaladin c922912ac5 Cleaned up loading files
Changed single player start game text

This was SVN commit r8735.
2010-11-28 17:27:00 +00:00
WhiteTreePaladin e53616f857 Fix non power-of-two middle progress bar section dimensions
This was SVN commit r8734.
2010-11-28 16:49:43 +00:00
Mythos_Ruler 8019ee8b5f This was SVN commit r8733. 2010-11-28 16:08:58 +00:00
Mythos_Ruler f06eba3da5 yet another awesome tip. :)
This was SVN commit r8732.
2010-11-28 14:35:48 +00:00
Mythos_Ruler 9ab58ce6e8 Another great "tip".
This was SVN commit r8731.
2010-11-28 14:22:42 +00:00
Mythos_Ruler 216eeea5c9 Updated the Celt ship portraits. Made an Iberian fishing boat.
This was SVN commit r8730.
2010-11-28 14:10:32 +00:00
Mythos_Ruler 31717a71ba Removed rally command from these buildings, since they neither have garrison capacity nor do they train anything.
This was SVN commit r8729.
2010-11-28 13:18:35 +00:00
Mythos_Ruler 1ebcd2e7e3 This was SVN commit r8728. 2010-11-28 11:56:15 +00:00
Mythos_Ruler 4cd93b6105 This was SVN commit r8727. 2010-11-28 09:17:43 +00:00
Mythos_Ruler 1f02df5abc Moved some things. Deleted other things. Updated a few maps.
This was SVN commit r8726.
2010-11-28 09:15:26 +00:00
Mythos_Ruler 7819c4707c Moving a lot of stuff. Deleting duplicate objects.
This was SVN commit r8725.
2010-11-28 08:19:41 +00:00
Mythos_Ruler 98687bfbf6 Removing duplicate and unnecessary textures.
This was SVN commit r8724.
2010-11-28 08:13:25 +00:00
Mythos_Ruler 1b0f3498fe Moved from Internal.
This was SVN commit r8723.
2010-11-28 07:54:13 +00:00
Mythos_Ruler 94aee121fd Removing duplicate or unnecessary textures
This was SVN commit r8722.
2010-11-28 07:53:16 +00:00
Mythos_Ruler 3de4ed7649 Added decals to the Greek buildings.
Updated Saharan Oases.
New "underbrush" object.

This was SVN commit r8721.
2010-11-28 06:46:45 +00:00
Mythos_Ruler 6ff423e45b changed tooltip
This was SVN commit r8720.
2010-11-28 04:24:25 +00:00
WhiteTreePaladin 9837f6207f New session dialog style
This was SVN commit r8719.
2010-11-28 01:39:31 +00:00
WhiteTreePaladin 2640f4c346 Changed victory/defeat dialogs to new session dialog style
Changed title of exit game dialog
Only show resources carried when the quantity is greater than 1

This was SVN commit r8718.
2010-11-27 21:58:19 +00:00
WhiteTreePaladin e486467430 Changed delete dialog text again (to make for easier translating later)
This was SVN commit r8717.
2010-11-27 20:11:42 +00:00
WhiteTreePaladin 961a50b0a2 Changed delete dialog text
This was SVN commit r8716.
2010-11-27 20:03:16 +00:00
WhiteTreePaladin 0b0cd938d5 Made settings and menu use new dialog
Made chat and ESC hotkey interact better with the dialog
Made command icons reference individual icons rather than sheets
Removed menu object cache

This was SVN commit r8715.
2010-11-27 19:46:12 +00:00
Mythos_Ruler bbe49141ec Lots of building stuff.
This was SVN commit r8714.
2010-11-27 17:18:29 +00:00
WhiteTreePaladin 3c318af2e0 Started work on new dialogs for session GUI style
Resized quote area in loading screen

This was SVN commit r8713.
2010-11-27 17:06:32 +00:00
Mythos_Ruler c1cc8d3a19 Updating the Cycladic Archipelago map.
This was SVN commit r8712.
2010-11-27 12:37:23 +00:00
Mythos_Ruler 6c793d6663 Slightly updated greek building texture.
This was SVN commit r8711.
2010-11-27 12:15:42 +00:00
Mythos_Ruler e30698c0c1 New Greek gymnasion by Amish. :)
This was SVN commit r8709.
2010-11-27 09:46:51 +00:00
WhiteTreePaladin bbd6f50af9 Resize quote area so that long quotes don't get cut off
This was SVN commit r8708.
2010-11-27 08:57:09 +00:00
WhiteTreePaladin 51312f84c4 Add gradient to tip image
Resize tip images to fill out rectangle

This was SVN commit r8707.
2010-11-27 08:44:03 +00:00
WhiteTreePaladin ed0fe5b47b Shrink space between tip title and message
This was SVN commit r8706.
2010-11-27 08:10:22 +00:00
Mythos_Ruler 1197d7872e Redone tips screenshots. New shadow overlay.
This was SVN commit r8705.
2010-11-27 08:02:54 +00:00
WhiteTreePaladin 9edd94f0fa Make tip image 512x384 (inside border dimensions)
This was SVN commit r8704.
2010-11-27 07:59:13 +00:00
WhiteTreePaladin 08bfe7b7f9 tweaked image sizes
This was SVN commit r8703.
2010-11-27 07:45:27 +00:00
Mythos_Ruler 55b6fbc669 4th tip. Made tip images use transparency.
This was SVN commit r8702.
2010-11-27 07:00:06 +00:00
Mythos_Ruler 8bcf6b782f tips
This was SVN commit r8701.
2010-11-27 06:09:55 +00:00
Mythos_Ruler 90b4e85b51 New Chinese ships for a mod some of the guys are working on.
This was SVN commit r8700.
2010-11-27 04:56:20 +00:00
WhiteTreePaladin db22548ecb New loading screen style (may need more polishing)
This was SVN commit r8699.
2010-11-27 03:07:48 +00:00
Mythos_Ruler 6d51c3a751 For Kimball, forever may he reign.
This was SVN commit r8698.
2010-11-26 14:13:08 +00:00
Mythos_Ruler ddd2f2a193 Made Units Demo map bigger to accommodate all the entities.
This was SVN commit r8697.
2010-11-26 10:39:56 +00:00
Mythos_Ruler e5d5a76384 This was SVN commit r8696. 2010-11-26 10:21:59 +00:00
Mythos_Ruler cc3d9de386 New berry bushes. Finished Cycladic Archipelago.
This was SVN commit r8695.
2010-11-26 07:08:18 +00:00
Mythos_Ruler 5f6dce1b6e Testing stuff for Bob.
This was SVN commit r8694.
2010-11-26 05:52:51 +00:00
Mythos_Ruler 710c32b712 New Persian sails.
This was SVN commit r8693.
2010-11-26 04:12:15 +00:00
Mythos_Ruler 959da16fdf New texture for the Roman Quinquereme (and remapped mesh). The ekdromos now slings his shield onto his back when he throws his spears.
This was SVN commit r8692.
2010-11-26 03:09:23 +00:00
Mythos_Ruler 35344e243e Wrinkles for the Celt sail textures.
This was SVN commit r8691.
2010-11-26 00:53:03 +00:00
fcxSanya 0d0af824e7 Treasures collected counter for summary screen
This was SVN commit r8690.
2010-11-25 18:01:23 +00:00
Ykkrosh f959390d0b Mostly fix hypothetical thread/fork interaction dangers
This was SVN commit r8689.
2010-11-25 16:11:16 +00:00
Mythos_Ruler 7820c51673 #New loading screen assets.
This was SVN commit r8688.
2010-11-25 06:51:01 +00:00
Ykkrosh 404f7d4caa Don't put 64-bit OS X code in the 32-bit-only file. Do put it in the 64-bit-only file.
This was SVN commit r8687.
2010-11-24 17:08:00 +00:00
Mythos_Ruler 8fe513aba5 1) Added decals to some Iberian buildings. 2) New Greek house variations. 3) skeleton eyecandy thing.
This was SVN commit r8686.
2010-11-24 06:04:03 +00:00
Mythos_Ruler 8148987e59 Added the "cheering" idle animations to the Celt super infantryman so people can see the animations that we could use for capturing buildings and leveling-up.
Also added a skull eyecandy object. lol

This was SVN commit r8685.
2010-11-24 03:09:16 +00:00
Ykkrosh 94dca529b1 Fix OS X build errors
This was SVN commit r8684.
2010-11-23 19:20:03 +00:00
Mythos_Ruler 5672275298 edited starting resources and teams.
This was SVN commit r8683.
2010-11-23 04:24:48 +00:00
Mythos_Ruler 180ab8a748 #New Celt ships.
Some new siege engines. Caution: They need a lot of work.

This was SVN commit r8682.
2010-11-23 02:54:38 +00:00
Ykkrosh f378a63d94 Add some tests for UnitAI.
Fix said tests for UnitAI.
Hopefully fix #647 too.
Document HFSM interface a bit.
Add Engine.DumpSimState() console command for debugging.

This was SVN commit r8681.
2010-11-22 20:12:04 +00:00
WhiteTreePaladin 78ae72d87a Message to let players know formations don't work yet
This was SVN commit r8680.
2010-11-22 00:07:38 +00:00
fcxSanya e4d356c3bf Map exploration counter for summary screen
This was SVN commit r8679.
2010-11-21 19:42:26 +00:00
Ykkrosh 333492b4a9 Add SetInterval to Timer.
Add tests for Timer.

This was SVN commit r8678.
2010-11-21 19:27:53 +00:00
evanssthomas fe5c7cb978 Buildings now target units randomly. Firing interval also made random
This was SVN commit r8677.
2010-11-21 18:41:13 +00:00
historic_bruno 47246c8155 Fixes #572. Changed MoveCameraToTarget so that for minimap scrolling it will ignore changes in Y position, to maintain previous zoom level as expected (constraint keeps the new view from being inappropriate)
This was SVN commit r8676.
2010-11-21 04:59:59 +00:00
historic_bruno 2963422173 Add screenshot location logging w/ rendered console message. Rendered messages are hidden before screenshot is taken. Fixes #675
This was SVN commit r8675.
2010-11-21 01:25:16 +00:00
historic_bruno e7b859b8a5 Add allied victory condition to EndGameManager, defaults to true for now because we can't change teams, but later it can be changed during setup
This was SVN commit r8674.
2010-11-21 00:35:08 +00:00
WhiteTreePaladin e1fa9cd22b Show resource subtype in GUI if main type is treasure
This was SVN commit r8673.
2010-11-20 22:36:04 +00:00
fcxSanya 68a63d62c8 Displaying civ icons on summary screen, moving "Civ centres built" and "Enemy civ centres destroyed" to new "Conquest" tab
This was SVN commit r8671.
2010-11-20 21:42:54 +00:00
fcxSanya 7e41f6d664 Changed treasures gathering: now units will gather treasures immediately, rather than carry resources from treasures to dropsites.
This was SVN commit r8670.
2010-11-20 21:37:31 +00:00
Ykkrosh 80888a7325 Avoid buffer overflow assertion failures when dumping stack trace on Windows.
Try to be marginally less likely to get stuck in infinite recursion.

This was SVN commit r8669.
2010-11-20 21:26:22 +00:00
Mythos_Ruler ed5d91e71f blood
This was SVN commit r8668.
2010-11-20 21:09:11 +00:00
Mythos_Ruler 35e43e133b This was SVN commit r8667. 2010-11-20 21:06:28 +00:00
Ykkrosh 1d8972a540 Add automatic 'root' prop point when loading old PMDs
This was SVN commit r8666.
2010-11-20 20:16:06 +00:00
Mythos_Ruler eeb9fc2145 Resized the Persian trireme a little.
This was SVN commit r8665.
2010-11-20 19:48:44 +00:00
Mythos_Ruler fee8668887 PMDs can't use 'root' prop point, so I removed the blood prop.
This was SVN commit r8664.
2010-11-20 19:48:10 +00:00
Ykkrosh c36fc2b8d7 Add script-based system for doing messy stuff based on system configuration.
Display warning for certain broken NVIDIA drivers.

This was SVN commit r8663.
2010-11-20 19:46:49 +00:00
WhiteTreePaladin 2925ab4ce4 Ghosted version labels in session GUI
This was SVN commit r8662.
2010-11-20 17:40:54 +00:00
Ykkrosh 74c19b5015 Add xmessage-based GUI dialog box for debug messages on Linux (fixes #663).
Switch out of fullscreen before displaying dialog boxes.
Add Engine.DebugWarn for testing.

This was SVN commit r8661.
2010-11-20 17:14:45 +00:00
Mythos_Ruler e971c85da5 map tweaks
This was SVN commit r8660.
2010-11-20 11:50:06 +00:00
Mythos_Ruler c6491b1916 Added blood to animal deaths. Muahahahahahahaha.
This was SVN commit r8659.
2010-11-20 09:31:14 +00:00
Mythos_Ruler 17e580ec42 Rate adjustment.
This was SVN commit r8658.
2010-11-20 07:09:20 +00:00
Ykkrosh 64bd264fc0 Attempt to fix GUI script interaction with JITs.
Simplify some other GUI script interface code.

This was SVN commit r8657.
2010-11-20 00:45:58 +00:00
Ykkrosh 2c8e683214 Fix toString on non-loaded sounds
This was SVN commit r8656.
2010-11-20 00:44:35 +00:00
Mythos_Ruler ab8bb65611 Adjusting rates
This was SVN commit r8655.
2010-11-19 23:07:07 +00:00
Mythos_Ruler a481209669 Updated the ship attacks map with the new ships.
This was SVN commit r8654.
2010-11-19 07:07:56 +00:00
Mythos_Ruler d95a87a5c6 New islands man, work in progress.
This was SVN commit r8653.
2010-11-19 05:32:25 +00:00
historic_bruno f20a6dcfc8 Fixed bug where players would not initialize resource counts properly from scenario
This was SVN commit r8652.
2010-11-19 05:05:45 +00:00
historic_bruno f236fb7bd1 Fixed bug where gaia was not treated as attackable (fences could not be destroyed)
This was SVN commit r8651.
2010-11-18 23:25:42 +00:00
Mythos_Ruler 21acf61d69 This was SVN commit r8650. 2010-11-18 07:40:57 +00:00
Mythos_Ruler ffd184fdd3 added name and description to map.
This was SVN commit r8649.
2010-11-18 07:09:29 +00:00
Mythos_Ruler 3d3720026a Updated Saharan Oases with some more starting treasures, teams, and lower starting resources.
This was SVN commit r8648.
2010-11-18 07:01:35 +00:00
historic_bruno aa9788a40e Fix team index bug in game setup GUI
This was SVN commit r8647.
2010-11-18 06:51:10 +00:00
Mythos_Ruler bf295edda6 shooting fortresses
This was SVN commit r8646.
2010-11-18 06:16:43 +00:00
Mythos_Ruler d8bc3635a2 Adjusted the desert stone.
Adjusted costs and other things for defensive structures.
Continued work on the Saharan Oases map.

This was SVN commit r8645.
2010-11-18 05:53:40 +00:00
Mythos_Ruler 12944d1fdc removed the Corinthian trireme entity (but not the actor).
This was SVN commit r8644.
2010-11-18 03:00:04 +00:00
Mythos_Ruler 1ea07fad83 Moved basket to the female's back.
This was SVN commit r8643.
2010-11-18 02:27:20 +00:00
Mythos_Ruler ee86e13be6 Deleted some overlapping textures. Moved Roman and Persian ships from Internal to Public.
This was SVN commit r8641.
2010-11-17 23:51:04 +00:00
Mythos_Ruler 23cb21ada4 1st of the new Greek houses. A bunch of other stuff, trying to get projectiles to work with towers. I propped a Celtic jav dude into one of the Celt towers to test propping. First graphics (borders) for a new loading screen.
This was SVN commit r8640.
2010-11-17 21:30:00 +00:00
evanssthomas f1f1a44031 Made changes to BuildingAI based on Philip's comments
This was SVN commit r8639.
2010-11-17 18:25:00 +00:00
Ykkrosh f0476b61fb Fix #476 (Use JS_New for ScriptInterface::CallConstructor)
This was SVN commit r8638.
2010-11-17 16:56:11 +00:00
evanssthomas 222095fa44 Added Building AI, and some small changes to GarrisonHolder
This was SVN commit r8636.
2010-11-17 07:30:25 +00:00
Ykkrosh 404456ee8e Fix int8_t redefinition errors in VC2010
This was SVN commit r8635.
2010-11-17 03:02:04 +00:00
Ykkrosh f286ce0b13 Fix crash when loading zero-length config files
This was SVN commit r8634.
2010-11-17 01:39:14 +00:00
Ykkrosh b13e6ae293 Fix script to rebuild SpiderMonkey properly
This was SVN commit r8633.
2010-11-17 00:58:10 +00:00
Ykkrosh 93861485fb Add a script to clean up broken builds of bundled libraries
This was SVN commit r8632.
2010-11-17 00:50:38 +00:00
Ykkrosh bd3bd084c0 Support new SpiderMonkey API.
wposix: Define int8_t compatibly with SpiderMonkey.
Remove unused camera, lightenv JS interfaces.
Remove most of vector JS interface.
Remove some of the redundant JS string conversion functions.
Remove unneeded vmem, _lodBias functions.
Clean up some formatting.

This was SVN commit r8629.
2010-11-16 23:00:52 +00:00
Ykkrosh 9c521ceb3b Add minimum range to range queries
This was SVN commit r8627.
2010-11-16 20:43:15 +00:00
Mythos_Ruler ccca9554c6 #Update for Saharan Oases.
This was SVN commit r8626.
2010-11-16 00:36:23 +00:00
Mythos_Ruler b7e4b197f2 Fixed meat gathering props for the Celt spearman.
This was SVN commit r8625.
2010-11-15 21:28:45 +00:00
WhiteTreePaladin efd0b14029 Make fishing ship not gather treasure
This was SVN commit r8624.
2010-11-15 21:25:22 +00:00
Mythos_Ruler 11cf570faf Fixed some ship problems. Edited cavalry.
This was SVN commit r8623.
2010-11-15 21:05:42 +00:00
Ykkrosh 13d2e44ff5 Run GC frequently in the simulation script context, to keep memory usage down
This was SVN commit r8622.
2010-11-15 15:03:40 +00:00
Mythos_Ruler 58a95ba95c fixed meat gathering animation
This was SVN commit r8621.
2010-11-15 05:11:39 +00:00
Mythos_Ruler 70019ed81c Made civ centres more expensive.
This was SVN commit r8620.
2010-11-15 04:00:55 +00:00
Mythos_Ruler 4328476b67 Actors variations for shuttling.
This was SVN commit r8619.
2010-11-15 03:48:28 +00:00
WhiteTreePaladin d65e47dda0 Properly center loaded resource text
Add attack stats to "armour" icon

This was SVN commit r8618.
2010-11-15 03:38:01 +00:00
Mythos_Ruler ce085e7930 Prop point testing for the wall gate.
This was SVN commit r8617.
2010-11-15 02:21:27 +00:00
Ykkrosh 6a74b798ab Support prop_ prefix in Collada files, as well as prop-
This was SVN commit r8616.
2010-11-15 02:18:49 +00:00
Ykkrosh 816c810791 Windows fix
This was SVN commit r8614.
2010-11-15 00:48:34 +00:00
Ykkrosh 4a1bc8e11a Optimise LOS visibility updates
This was SVN commit r8613.
2010-11-15 00:36:15 +00:00
Ykkrosh bfbd47ffec Fix initial unit separation in combat demo map
This was SVN commit r8612.
2010-11-15 00:34:34 +00:00
Mythos_Ruler e68900e5c4 New metal and stone shuttling. Test out on 'Resources Demo' map. Use spearman and cavjav.
This was SVN commit r8611.
2010-11-15 00:18:03 +00:00
historic_bruno 293e5e33ec Changed GUI mouse event handling so that button events use the mouse position at the time of the button state change. Fixed minimap message handling to respect out-of-order events. Fixes #669
This was SVN commit r8610.
2010-11-14 22:47:39 +00:00
Mythos_Ruler 6b444ea23b Testing a wall gate to see if static prop points will work.
This was SVN commit r8609.
2010-11-14 22:33:02 +00:00
WhiteTreePaladin 042972e298 Renamed "session_new" to "session"
This was SVN commit r8608.
2010-11-14 20:32:38 +00:00
Mythos_Ruler b0e9f7197b Once more.
This was SVN commit r8607.
2010-11-14 19:57:48 +00:00
Mythos_Ruler 577aebe467 This was SVN commit r8606. 2010-11-14 19:27:14 +00:00
Mythos_Ruler 51e10e185e And again.
This was SVN commit r8605.
2010-11-14 19:16:37 +00:00
Mythos_Ruler 1fde5cd4c7 Again, with feeling.
This was SVN commit r8604.
2010-11-14 19:11:24 +00:00
fcxSanya c1c8f64f0d Move statistics from GuiInterface.GetSimulationState to GuiInterface.GetExtendedSimulationState
This was SVN commit r8603.
2010-11-14 19:09:13 +00:00
Mythos_Ruler 15327ac40b Added projectile dummy object to the hele Scout tower for evan.
This was SVN commit r8602.
2010-11-14 18:53:36 +00:00
Mythos_Ruler 43a4667745 Tweaking treasures. Warships no longer gather treasures. Fishing and Merchant boats have greater capacities.
This was SVN commit r8601.
2010-11-14 05:50:30 +00:00
Mythos_Ruler 90d7c0a54f #Another prop for resource shuttling.
This was SVN commit r8600.
2010-11-14 04:21:39 +00:00
Mythos_Ruler eab9f540af Hacked the dock to be a dropsite. Will probably need looked at further by a programmer duder.
This was SVN commit r8599.
2010-11-14 02:27:54 +00:00
Mythos_Ruler cbbca4d3da Basket for shuttling grain.
This was SVN commit r8598.
2010-11-14 00:44:23 +00:00
Mythos_Ruler 62da7e1b37 The Celtic basic spearman now carries brontosaurus burgers when shuttling meat.
This was SVN commit r8597.
2010-11-14 00:10:23 +00:00
Mythos_Ruler acc229f367 new vase food.treasure. New vase meshes. A brontoburger slab.
This was SVN commit r8596.
2010-11-13 23:49:50 +00:00
WhiteTreePaladin 74ed8cf464 Adjusted size of resource icons
This was SVN commit r8595.
2010-11-13 22:19:17 +00:00
Ykkrosh 8798b7671c Use separate mode when carrying meat.
Fix tests.

This was SVN commit r8594.
2010-11-13 21:39:39 +00:00
historic_bruno f4b0b72aa8 Fixed bug introduced by recent change to input.js: diplomacy is properly read to determine enemy players for attacking
This was SVN commit r8593.
2010-11-13 20:49:58 +00:00
Ykkrosh 58b33af168 Support X mouse buttons on Windows
This was SVN commit r8591.
2010-11-13 19:51:15 +00:00
Ykkrosh 10820ae3f8 Add a map for some resource testing
This was SVN commit r8590.
2010-11-13 19:16:16 +00:00
Ykkrosh 4100a13e0a # Add resource shuttling.
Add resource-carrying animations/props to an actor for testing.
Warn more quietly about invalid cursor names.

This was SVN commit r8589.
2010-11-13 19:15:29 +00:00
Mythos_Ruler 6325a1eafe Adjusting build times.
This was SVN commit r8588.
2010-11-13 06:27:00 +00:00
WhiteTreePaladin 2b70b43086 Based selection groups off of a new tag which must contain a valid template name.
<SelectionGroupName>unit_template_name_b</SelectionGroupName>

This was SVN commit r8587.
2010-11-13 05:35:40 +00:00
Mythos_Ruler af4c2c091d Removed stone_light. Adjusted the footprint of the field entity.
This was SVN commit r8586.
2010-11-13 04:19:09 +00:00
Mythos_Ruler 6c7f9f7b8d #Treasure objects.
This was SVN commit r8585.
2010-11-13 03:44:38 +00:00
Mythos_Ruler 513ff50926 Food treasures.
This was SVN commit r8584.
2010-11-13 02:57:04 +00:00
historic_bruno 3cefbbe253 Modified UnitAI to respect diplomatic status of players, allies can no longer be attacked, and fixed some related bugs in player init
This was SVN commit r8583.
2010-11-13 02:36:53 +00:00
Ykkrosh 25cd781641 Support horizontal scroll wheels for camera rotation
This was SVN commit r8582.
2010-11-13 01:00:54 +00:00
Mythos_Ruler e1aaedcc32 Alternate Persian emblems.
This was SVN commit r8581.
2010-11-13 00:35:18 +00:00
Mythos_Ruler 490574bc03 Emblems
This was SVN commit r8578.
2010-11-12 23:37:56 +00:00
Mythos_Ruler 36d7ef65a6 Treasure/Ruins tweaks and additions.
This was SVN commit r8577.
2010-11-12 22:31:19 +00:00
fcxSanya 245f29b798 Summary screen. Closes #638.
This was SVN commit r8576.
2010-11-12 22:24:49 +00:00
Mythos_Ruler 6c3368886b Bigger Iberian emblem.
This was SVN commit r8575.
2010-11-12 19:05:30 +00:00
WhiteTreePaladin ff3c7b46f4 Added food.treasure, wood.treasure, stone.treasure, wood.ruins, stone.ruins
Added placeholder cursor for ruins
Added entities for testing these types

This was SVN commit r8574.
2010-11-12 18:58:33 +00:00
Mythos_Ruler 52ad8a836d New idle animation for the Greek archers.
Some updated faction emblems.

A new Metal portrait.

This was SVN commit r8573.
2010-11-12 05:33:12 +00:00
Mythos_Ruler 75eb6847af Shield tweaks.
This was SVN commit r8572.
2010-11-12 04:34:46 +00:00
Mythos_Ruler f3c5a2383b #Some cool new treasure objects. Lots of map tweaks as well.
Added treasure gathering for ships. It would be cool to have
food.treasure, wood.treasure, and stone.treasure gathering types in
addition to the current metal.treasure.

This was SVN commit r8571.
2010-11-12 03:08:23 +00:00
Mythos_Ruler 6cb66b7ef1 Moved from Internal
This was SVN commit r8570.
2010-11-12 01:08:53 +00:00
Mythos_Ruler 1a1f7caee1 Moved to Public.
This was SVN commit r8569.
2010-11-12 01:08:17 +00:00
Mythos_Ruler 46bde9969e Made a "poleis" branch emblem sprite.
This was SVN commit r8568.
2010-11-11 19:50:06 +00:00
Mythos_Ruler 4dc5766273 New Celt emblem
This was SVN commit r8567.
2010-11-11 19:39:48 +00:00
WhiteTreePaladin c5f0b5d7be Hide the lower session panel if nothing is selected
This was SVN commit r8566.
2010-11-11 16:00:53 +00:00
Ykkrosh 83285504cb Disable RTTI in test project, for consistency
This was SVN commit r8565.
2010-11-10 15:26:29 +00:00
Mythos_Ruler 8494a5bc4c Moar tweaking.
This was SVN commit r8564.
2010-11-10 02:58:33 +00:00
Mythos_Ruler 0036f1ce9c Map tweaks.
This was SVN commit r8563.
2010-11-10 02:48:33 +00:00
Mythos_Ruler f452c79e46 Fixed civ for Hellenic Buildings. Continued work on Belgian Bog.
This was SVN commit r8562.
2010-11-09 14:44:03 +00:00
WhiteTreePaladin 7d26b8eefd Roman civ sprite
This was SVN commit r8561.
2010-11-08 23:52:44 +00:00
Mythos_Ruler c03c2f0168 Fixed hoplite prop switching (heads) when gathering meat.
Tweaked maps.
New "Bog" map, w.i.p.
Tweaked ship health.

This was SVN commit r8560.
2010-11-08 23:40:45 +00:00
WhiteTreePaladin dde2cd38be Show Population Cost in unit training buttons
Show Population Bonus in unit construction buttons

This was SVN commit r8559.
2010-11-08 23:23:52 +00:00
janwas 6e74c53ee9 fix file/dir mode bits
fixes #648
also fix self-test on ICC 12

This was SVN commit r8558.
2010-11-08 15:02:05 +00:00
WhiteTreePaladin 0517d41275 Removed extraneous cancel button from multiplayer setup dialogs
Adjusted the right side of the bottom panel in the session GUI
Renamed "dev console" to "dev overlay" in the chat message to be more
consistent

This was SVN commit r8557.
2010-11-08 14:49:40 +00:00
janwas 6935a03743 remove no-longer needed GLU dependency; avoids delay-load warning.
This was SVN commit r8555.
2010-11-08 10:42:34 +00:00
janwas 24f1a00190 avoid setting executable bit in files/dirs we create
thanks to fabio for reporting + a suggested fix.
fixes #648

This was SVN commit r8554.
2010-11-08 10:39:52 +00:00
janwas 6b4d5091b3 fixes from work: use ICC bswap intrinsics instead of fallbacks; update UNUSED2 to work with ICC; update mahaf for Win7
This was SVN commit r8553.
2010-11-08 10:01:12 +00:00
Mythos_Ruler 9c53fda749 Misc. art stuff.
This was SVN commit r8552.
2010-11-08 00:36:34 +00:00
Mythos_Ruler 85fc7cae52 Cleaning up the props.
This was SVN commit r8551.
2010-11-08 00:23:06 +00:00
Mythos_Ruler 323cda17c3 cleaning
This was SVN commit r8550.
2010-11-07 23:57:04 +00:00
Mythos_Ruler ffa6c14a24 More cleaning.
This was SVN commit r8549.
2010-11-07 23:51:46 +00:00
Mythos_Ruler a7059092cb cleaning
This was SVN commit r8548.
2010-11-07 23:40:48 +00:00
Mythos_Ruler dafc0e6dbd This was SVN commit r8547. 2010-11-07 23:32:02 +00:00
Ykkrosh e43eb0c18b # Various hotkey fixes and cleanups.
Support ctrl for removing entities from selection.
Move big screenshot hotkey to shift+F2.
Increase mouse wheel rotation speed.
Fix HotkeyIsPressed when a more specific hotkey was matched instead.
Support multiple hotkeys with the same binding.
Use hotkeys instead of raw key events in GUI.
Delete some obsolete hotkey definitions.
Remove unused broken EntitySelection toggle method.

This was SVN commit r8546.
2010-11-07 20:42:52 +00:00
janwas a13836bd68 safely handle zero-sized XMB files ensuing from a crash while loading
fixes #662

This was SVN commit r8545.
2010-11-07 16:14:13 +00:00
Ykkrosh 644b9aedea # Add double-click and triple-click selection modes, based on patch by Christoph and evans.
Fixes #515.

This was SVN commit r8544.
2010-11-07 00:12:55 +00:00
janwas f45c74c368 thread-safety fixes to debug.cpp - most functions were already reentrant, just CAS-ified the assert suppression flags.
(NB: the debug_filter stuff remains non-reentrant because it's usually
only called from main() or at least the main thread)
closes #654

This was SVN commit r8543.
2010-11-06 19:14:16 +00:00
janwas 3407983e98 remove no-longer needed (and non-reentrant) MICROLOG as per today's meeting
This was SVN commit r8542.
2010-11-06 19:11:40 +00:00
Mythos_Ruler b4d6ad9f0b Template fixes and tweaks. Gave ships larger Health bars. Fixed some range things with ranged units.
This was SVN commit r8541.
2010-11-06 18:45:42 +00:00
Mythos_Ruler 43665f09c5 Fixed some template stuff.
This was SVN commit r8540.
2010-11-06 17:52:30 +00:00
WhiteTreePaladin 741477926c Make the minimap fit completely inside the border when in circular mode (to prevent units from sneaking around behind the rim)
This was SVN commit r8539.
2010-11-06 02:13:40 +00:00
WhiteTreePaladin e7b5f9eeb9 Allow up to 24 construction or training buttons
Add tooltip of generic name back to the unit name
Move civ name to player name tooltip
Make player name colored with the player color again

This was SVN commit r8538.
2010-11-06 01:55:29 +00:00
Mythos_Ruler c1daf9a9bc This was SVN commit r8537. 2010-11-05 13:22:06 +00:00
Mythos_Ruler 4f4c19be85 new portraits
This was SVN commit r8536.
2010-11-05 13:17:30 +00:00
Mythos_Ruler c2bafa78cb A bunch of stuff.
This was SVN commit r8535.
2010-11-04 23:51:42 +00:00
historic_bruno dbcd004844 Fix player assignments on map change (number of players may decrease, knocking assigned players out of a slot). Fixes #655
This was SVN commit r8534.
2010-11-04 20:34:29 +00:00
Mythos_Ruler 4a9ae1de17 Touched up Hellenised Egypt and Massacre of Delphi. Overhaul and completion of 'Median Oasis.' -- Check it out!
This was SVN commit r8533.
2010-11-04 20:30:13 +00:00
Mythos_Ruler 31f263d688 This was SVN commit r8532. 2010-11-04 01:07:00 +00:00
Mythos_Ruler b3f2363c2d Altered the "generic name" of the Cretan Archer from "Infantry Archer" to "Mercenary Infantry Archer" to emphasize the reason they cost only Metal.
This was SVN commit r8531.
2010-11-04 01:06:00 +00:00
Mythos_Ruler 3ebbd8a9ce tweaks on these buildings to make them buildable under certain circumstances.
This was SVN commit r8530.
2010-11-04 00:53:15 +00:00
Mythos_Ruler 0b48fc0484 Added costs to these buildings.
This was SVN commit r8529.
2010-11-03 23:42:41 +00:00
Ykkrosh 818ea52c3b Delete obsolete non-working i18n code
This was SVN commit r8527.
2010-11-03 17:52:07 +00:00
Ykkrosh ec5d4a9f9e Attempt to fix build error with intrinsics on 32-bit Linux
This was SVN commit r8526.
2010-11-03 02:06:38 +00:00
Ykkrosh 81f5e0ac5f Allow continuing playing when a client leaves a multiplayer game (fixes #620).
Fix multiplayer autostart.
Make NETTURN_LOG syntax differently ugly.

This was SVN commit r8525.
2010-11-03 00:21:52 +00:00
Mythos_Ruler 786279fb95 New minimap circle.
This was SVN commit r8524.
2010-11-02 17:08:50 +00:00
Mythos_Ruler 2186ac8e76 Tweaked blank giant map in Internal folder. Updated a few Mediterranean terrains. A Creative Commons object. A generic Gaia "field" object. Humpback Whale.
This was SVN commit r8523.
2010-11-02 16:26:06 +00:00
Mythos_Ruler 947ce01f68 Got rid of the whale entities giving an error.
This was SVN commit r8522.
2010-11-02 16:21:51 +00:00
janwas 383cf7b220 cleanup:
use intrinsics for cpu_AtomicAdd and cpu_CAS, get rid of the
corresponding assembly implementations. (wrapper functions are necessary
at work because mere declarations aren't enough to export the functions
from DLL)
also remove no longer needed fminf

This was SVN commit r8521.
2010-11-02 13:38:56 +00:00
Ykkrosh 540925aa32 Add a rubbish experimental FPS camera view
This was SVN commit r8520.
2010-11-01 21:40:29 +00:00
Mythos_Ruler 1b9f198520 Deleted the whale. It is an interesting experiment whose time has not come yet (needs some new attack code for units and possibly unitAI for attacking units).
This was SVN commit r8519.
2010-11-01 16:29:05 +00:00
Mythos_Ruler 6351102705 trying to create a 'whale' object that moves around and must be killed first (probably by warships). Then fishing boats can gather from it. I get an error though when I try to place it in Atlas. Can someone take a look at it for me? <3
This was SVN commit r8518.
2010-11-01 15:22:43 +00:00
janwas 52851faeb6 cleanup - remove old cpu_memcpy and cpu_i64FromDouble that are no longer needed
This was SVN commit r8517.
2010-11-01 11:09:03 +00:00
janwas b27d6d38e3 thread-safe timer monotonicity check. fixes #653
(agree that DBL_EPSILON is an unnecessary hack, since division by
(t+eps)-(t) will yield a number not much more useful than infinity)

This was SVN commit r8516.
2010-11-01 10:19:22 +00:00
janwas 657ec9aa45 WIP timer thread safety:
CAS functions now implemented directly in external asm files (avoids
wrapper functions)
reinstated cpu_CAS64 (checking ARCH_IA32 at every call site is onerous)
(temporarily disable timer monotonicity check)

This was SVN commit r8515.
2010-11-01 09:54:03 +00:00
janwas 2b9774aa05 fix: alt+enter -> resize window -> maximize window failed to generate a resize event
This was SVN commit r8514.
2010-11-01 09:04:55 +00:00
Ykkrosh aefc87f226 Windows fixes
This was SVN commit r8513.
2010-10-31 22:26:41 +00:00
Ykkrosh 602b99c397 Fix water rendering in "reveal map" mode.
This was SVN commit r8512.
2010-10-31 22:07:57 +00:00
Ykkrosh 5d764f1435 Run network server in a separate thread, to minimise latency.
Make some parts of logger and console thread-safe.
Simplify console: remove special commands; remove prefix for script
commands.
Remove LOG_ONCE, to simplify logger.
Change some code to use the new logger interface.
Fix OOS when revealing map.
Clean up some formatting.

This was SVN commit r8511.
2010-10-31 22:00:28 +00:00
Ykkrosh 034504f536 Remove misleading wposix declaration of unimplemented gettimeofday.
This was SVN commit r8510.
2010-10-31 21:58:30 +00:00
Mythos_Ruler 5b1f0b2b19 Tweaked the map description.
This was SVN commit r8509.
2010-10-31 18:47:51 +00:00
Mythos_Ruler 909d9d84cb Work in progress--Acropolis 256 Radius map.
This was SVN commit r8508.
2010-10-31 18:33:02 +00:00
Mythos_Ruler 94a57d141a This was SVN commit r8507. 2010-10-31 15:17:27 +00:00
Mythos_Ruler 491f4592a7 This was SVN commit r8506. 2010-10-31 15:00:28 +00:00
Ykkrosh 62c90b5dc4 Fix tests
This was SVN commit r8504.
2010-10-31 00:29:29 +00:00
feneur a952767f48 Changed the disabled state messages for some menu buttons, they were a bit rough for a public release imho
This was SVN commit r8503.
2010-10-31 00:16:33 +00:00
Ykkrosh 8dc7eca77a Autobuilder fixes
This was SVN commit r8502.
2010-10-30 20:39:23 +00:00
Ykkrosh 1840bb3507 Stop units walking outside the edges of circular maps.
Switch the GUI between square/circular minimap automatically.

This was SVN commit r8500.
2010-10-30 18:25:34 +00:00
historic_bruno 21b0504ca5 Adding the missing player_defaults.json for #590
This was SVN commit r8499.
2010-10-30 18:07:31 +00:00
Ykkrosh 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
Ykkrosh d6bf303740 Clean up line endings
This was SVN commit r8497.
2010-10-30 12:22:18 +00:00
historic_bruno 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
historic_bruno 22672e69d9 Info icons for #590
This was SVN commit r8495.
2010-10-30 04:17:01 +00:00
historic_bruno 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
Mythos_Ruler 0b978d5e26 hacked in the attack for Persian trireme too.
This was SVN commit r8493.
2010-10-29 22:20:20 +00:00
Mythos_Ruler fcf9fbf10d Hacked in some ship ranged attacks to play with.
This was SVN commit r8492.
2010-10-29 22:18:25 +00:00
Ykkrosh 97019c3a5a Fix launching Atlas from the main menu
This was SVN commit r8491.
2010-10-29 21:04:59 +00:00
Mythos_Ruler 4f452eccde This was SVN commit r8490. 2010-10-29 20:14:37 +00:00
Mythos_Ruler 4b8fcaa135 Garrisoning for ships. This is only temporary for play-testing until final garrisoning code is implemented.
This was SVN commit r8489.
2010-10-29 20:14:09 +00:00
Mythos_Ruler 70cfff0f05 started work on Median Oasis. Fixed the fact that the Celtic special building cost zero (!) resources. A "slight" oversight.
This was SVN commit r8488.
2010-10-29 16:55:14 +00:00
Ykkrosh dd5ff36363 Fix Linux build error (fixes #651).
This was SVN commit r8487.
2010-10-29 15:48:46 +00:00
janwas 0c3d69ae29 fixes from work: clarify that cpu_MemoryBarrier has no runtime cost by renaming to COMPILER_FENCE and moving to code_annotation.h; fix 32-bit Parallel Studio 2011 warning.
This was SVN commit r8486.
2010-10-29 12:54:51 +00:00
Mythos_Ruler 8f532b81cd Fixed oasis map AGAIN. Fixed names of some units. Slave template.
This was SVN commit r8485.
2010-10-28 14:22:27 +00:00
janwas 825bbf8f51 parallel studio 2011 warning fixes
This was SVN commit r8484.
2010-10-28 12:22:11 +00:00
Mythos_Ruler af235da6f4 #Updated Greek trading ship with cargo. Split up 3 dozen UI icons into their individual files. Began testing an idea discussed in the irc chat room.
This was SVN commit r8483.
2010-10-28 12:22:04 +00:00
Mythos_Ruler 12bea99ea1 Fixed some purple blobs.
This was SVN commit r8482.
2010-10-28 06:19:50 +00:00
Mythos_Ruler c5b5fa8e6f Fixed the purple blobs.
This was SVN commit r8481.
2010-10-27 20:21:47 +00:00
Mythos_Ruler 6576b64ce0 Cleaning up the field entities.
This was SVN commit r8480.
2010-10-27 11:10:34 +00:00
Mythos_Ruler c6c1b2b549 This was SVN commit r8479. 2010-10-27 10:35:58 +00:00
Mythos_Ruler 93cd028616 Moar portrait stuff. Fixed the Persian Super Cavalry to align with the new Persian civ profile. Moved War Elephant to editor object.
This was SVN commit r8478.
2010-10-27 08:16:26 +00:00
Mythos_Ruler 7120014451 This was SVN commit r8477. 2010-10-27 06:22:29 +00:00
Mythos_Ruler 5db9465b25 A bunch of new portraits. The hero portraits are just temp until they are painted.
This was SVN commit r8476.
2010-10-27 05:49:04 +00:00
Mythos_Ruler 45a99a393d New Greek merchant ship. Model is not final though.
This was SVN commit r8475.
2010-10-27 02:16:45 +00:00
Mythos_Ruler 7d7127a1bb Scaled down the Roman Quinquereme.
This was SVN commit r8474.
2010-10-26 16:21:51 +00:00
Mythos_Ruler 728e03cee2 This was SVN commit r8473. 2010-10-26 11:34:34 +00:00
Mythos_Ruler 64b9824d5a tweaks
This was SVN commit r8472.
2010-10-26 11:31:33 +00:00
Mythos_Ruler f4b27e22b0 A bunch of new portraits. I fixed Waypoint Flag so that it floats on water. Edited Miletus map.
This was SVN commit r8471.
2010-10-26 09:46:05 +00:00
Ykkrosh 02aa8499ed Partial experimental version of circular maps
This was SVN commit r8470.
2010-10-25 21:59:52 +00:00
Mythos_Ruler 09b2a4ade8 #Starting some work on Carthage.
This was SVN commit r8469.
2010-10-25 17:09:23 +00:00
Mythos_Ruler b053bc846b Fixed a stat error.
This was SVN commit r8468.
2010-10-25 12:18:28 +00:00
Mythos_Ruler cb859d15da This was SVN commit r8467. 2010-10-25 12:10:11 +00:00
Mythos_Ruler 6a024a86b9 Rudimentary ship stats.
This was SVN commit r8466.
2010-10-25 11:07:29 +00:00
Mythos_Ruler ecf1e0556e This was SVN commit r8465. 2010-10-25 10:26:58 +00:00
Mythos_Ruler 4deaa14456 added descriptions to maps.
This was SVN commit r8464.
2010-10-25 10:25:55 +00:00
Mythos_Ruler 791c4f52fa Continued unit balancing. Edited actor projectiles animation times, etc.
This was SVN commit r8462.
2010-10-25 10:01:01 +00:00
Mythos_Ruler 504eb3b12b This was SVN commit r8461. 2010-10-25 04:29:15 +00:00
WhiteTreePaladin 7492f458e0 Allow garrisoning of siege weapons in the Fortress
Civil Center can now hold 20 units
Temple can now garrison units (15)

This was SVN commit r8460.
2010-10-25 04:21:18 +00:00
Mythos_Ruler b680e95e25 New epic Greek temple, primarily for eye candy. UV mapped by Amish.
This was SVN commit r8459.
2010-10-25 04:10:25 +00:00
WhiteTreePaladin 6373c2cfcb Made GUI always visible
Adjusted size of icon buttons in the session GUI
Allowed support units to garrison in watch towers

This was SVN commit r8458.
2010-10-24 23:40:09 +00:00
WhiteTreePaladin b100ba5a08 Show a 1 when only a single unit remains garrisoned (re-fixes #610)
This was SVN commit r8457.
2010-10-24 18:01:11 +00:00
Ykkrosh 2b2cac2a8d Fix tests
This was SVN commit r8456.
2010-10-24 12:37:55 +00:00
Mythos_Ruler dcd7211d34 Re-exported Greek Civic Centre to remove some of the vases (seemed cluttered before), and to make player color more prominent. Gave ships farther vision.
This was SVN commit r8455.
2010-10-24 10:05:28 +00:00
WhiteTreePaladin ec27e78e60 Clear out the displayed garrison quantity number if no units are garrisoned
This was SVN commit r8454.
2010-10-24 01:32:35 +00:00
WhiteTreePaladin 3521c8f51e Made garrisoning based on the quantity of units, not the population cost of those units.
This was SVN commit r8453.
2010-10-24 01:14:34 +00:00
WhiteTreePaladin 7f52ca875b Made Celtic heroes inherit from a specific type of hero, instead of a generic hero
This was SVN commit r8452.
2010-10-23 22:53:33 +00:00
WhiteTreePaladin 0aaddf62aa Garrisoning for buildings based on patch by Evans (fixes #610)
This was SVN commit r8451.
2010-10-23 22:43:15 +00:00
Ykkrosh bcc5c87045 Fix bandbox selection of out-of-world entities
This was SVN commit r8450.
2010-10-23 21:48:18 +00:00
Ykkrosh e13196e7a2 Fix serialization of most components
This was SVN commit r8449.
2010-10-23 19:59:40 +00:00
Ykkrosh 73286885d9 Fix race condition when enabling S3TC in Atlas
This was SVN commit r8448.
2010-10-23 19:58:45 +00:00
Mythos_Ruler 6d0e59c0a3 Fixed ownership of some trees.
This was SVN commit r8447.
2010-10-23 08:31:00 +00:00
Mythos_Ruler a6925ded91 Moar animal portraits. Stock or CC where possible.
This was SVN commit r8446.
2010-10-23 07:58:33 +00:00
Mythos_Ruler eb2e2c4244 Some updated portraits.
This was SVN commit r8445.
2010-10-23 07:49:31 +00:00
Ykkrosh 9e499cdec5 # Fix hotkey bugs.
Simplify hotkey system to use strings consistently.
Restrict scope of GUI hotkey bindings to the associated page.
Avoid hard-coding list of hotkeys.
Clean up the code a little bit and fix some bugs.
Remove unused "!" prefix for key negation.
Fixes #567.

This was SVN commit r8444.
2010-10-23 02:37:00 +00:00
Mythos_Ruler f6154b0d89 Temp portraits for public Roman units.
This was SVN commit r8443.
2010-10-23 01:28:35 +00:00
Mythos_Ruler cf2ce4870e This was SVN commit r8442. 2010-10-23 01:13:56 +00:00
Ykkrosh 9de72d1d19 Fix internal icons too
This was SVN commit r8441.
2010-10-22 23:28:57 +00:00
Ykkrosh 24fb9cd313 Split unit icon sheets into individual textures, for easier editing
This was SVN commit r8440.
2010-10-22 23:27:42 +00:00
Mythos_Ruler e8000c7a90 This was SVN commit r8439. 2010-10-22 10:52:35 +00:00
Mythos_Ruler 9227eeb5ec Block wall texture for giant Greek temple.
This was SVN commit r8438.
2010-10-22 10:10:43 +00:00
ShieldBearer 8ddb6f98a4 This was SVN commit r8437. 2010-10-22 10:06:10 +00:00
Mythos_Ruler 4a9292b2e3 This was SVN commit r8436. 2010-10-22 04:27:25 +00:00
Mythos_Ruler c15d777762 #Editing stats for Super Cavalry and special Roman units.
This was SVN commit r8435.
2010-10-22 04:02:48 +00:00
Mythos_Ruler eba84f32f6 Updating Super Infantry templates.
This was SVN commit r8434.
2010-10-22 02:32:03 +00:00
Ykkrosh 3eed24a338 Fix Mesa S3TC-enabling to work in Atlas
This was SVN commit r8433.
2010-10-21 23:44:54 +00:00
Mythos_Ruler 48121bcef6 Icon portraits at 128x128 please.
This was SVN commit r8432.
2010-10-21 23:09:44 +00:00
Ykkrosh eb8ca841cd Add special "colour:r g b a" sprite syntax to GUI. Fixes #616, based on patch from historic_bruno.
This was SVN commit r8431.
2010-10-21 21:22:40 +00:00
Ykkrosh e188683bab Preserve cursor-grabbing across alt-tabs on Windows (probably fixes #508).
This was SVN commit r8430.
2010-10-21 21:09:41 +00:00
Ykkrosh a596323ea6 Avoid bogus GCC warnings about uninitialised values
This was SVN commit r8429.
2010-10-21 20:33:27 +00:00
Ykkrosh c0a7a36f7a Use JSFastNative API in more places, for improved compatibility with future SpiderMonkey versions.
Remove some unnecessary script-exposed functions, and move some more
into the Engine namespace.

This was SVN commit r8428.
2010-10-21 19:54:59 +00:00
ShieldBearer 55741aed44 This was SVN commit r8427. 2010-10-21 15:11:26 +00:00
ShieldBearer 06b3457c5f This was SVN commit r8426. 2010-10-21 10:24:25 +00:00
Mythos_Ruler faacb80004 This was SVN commit r8425. 2010-10-21 10:20:56 +00:00
ShieldBearer c78c16d607 two new portrait icons
This was SVN commit r8424.
2010-10-21 10:12:17 +00:00
Mythos_Ruler d6720e00a4 Tweaked animation speeds for new Roman units.
This was SVN commit r8423.
2010-10-21 09:15:40 +00:00
Mythos_Ruler fdb002a334 This was SVN commit r8422. 2010-10-21 09:04:06 +00:00
Mythos_Ruler aade0de3b4 This was SVN commit r8420. 2010-10-21 09:00:30 +00:00
Mythos_Ruler 5e84f57a04 Moved 3 special Roman units from Internal to Public (hopefully this will quell the calls for more Roman material for a while). Made 2 new Super Unit templates for ease of balancing (more of these later, and more on this later).
This was SVN commit r8419.
2010-10-21 08:56:42 +00:00
Mythos_Ruler 2cd62a04d2 This was SVN commit r8418. 2010-10-21 08:24:00 +00:00
Mythos_Ruler c34aa82c5d This was SVN commit r8417. 2010-10-21 08:23:31 +00:00
Mythos_Ruler a99005976d Messing with stats. Made a roof tile texture for the giant Greek temple that will soon be coming.
This was SVN commit r8416.
2010-10-20 09:07:44 +00:00
Mythos_Ruler ceb5dd1dfd Wood texture looks less like chocolate cake.
This was SVN commit r8415.
2010-10-20 00:26:56 +00:00
Mythos_Ruler 4256055f58 #Brand new Celtic Market. Unit entity tweaks. Starting to re-balance units. New table and bench eyecandy objects.
This was SVN commit r8414.
2010-10-19 10:04:33 +00:00
5546 changed files with 90761 additions and 133782 deletions
+102 -122
View File
@@ -43,9 +43,9 @@ force_s3tc_enable = true
; Specify the render path. This can be one of:
; default Automatically select one of the below, depending on system capabilities
; fixed Only use OpenGL fixed function pipeline
; vertexshader Use vertex shaders for transform and lighting where possible
; shader Use vertex/fragment shaders for transform and lighting where possible
; Using 'fixed' instead of 'default' may work around some graphics-related problems,
; but will reduce performance when a modern graphics card is available.
; but will reduce performance and features when a modern graphics card is available.
renderpath = default
; Adjusts how OpenGL calculates mipmap level of detail. 0.0f is the default (blurry) value.
@@ -53,12 +53,8 @@ renderpath = default
; -1.0 to -1.5 recommended for good results.
lodbias = 0
; Profile selection
profile = default
; Language selection: (currently "english" or "pseudogreek")
language = english
; Opt-in online user reporting system
userreport.url = "http://feedback.wildfiregames.com/report/upload/v1/"
; Font mappings:
@@ -69,9 +65,6 @@ font.misc = verdana16
; Colour of the sky (in "r g b" format)
skycolor = "0 0 0"
; Maximum number of players in a session (default 6).
max_players = 8
; GENERAL PREFERENCES:
sound.mastergain = 0.5
@@ -83,13 +76,13 @@ view.rotate.x.min = 20
view.rotate.x.max = 60
view.rotate.x.default = 30
view.rotate.y.speed = 2.0
view.rotate.y.speed.wheel = 0.1
view.rotate.y.speed.wheel = 0.45
view.rotate.y.default = 0.0
view.drag.speed = 0.5
view.zoom.speed = 256.0
view.zoom.speed.wheel = 32.0
view.zoom.min = 96.0
view.zoom.max = 256.0
view.zoom.max = 512.0
view.zoom.default = 192.0
view.pos.smoothness = 0.1
view.zoom.smoothness = 0.4
@@ -104,127 +97,114 @@ view.rotate.y.smoothness = 0.3
; See keys.txt for the list of key names.
; > SYSTEM SETTINGS
hotkey.exit = "Alt+F4", "Ctrl+Break" ; Exit to desktop.
hotkey.leave = Escape ;End current game or Exit.
hotkey.pause = Pause ; Pause/unpause game.
hotkey.screenshot = F2 ; Take PNG screenshot.
hotkey.bigscreenshot = "Ctrl+Alt+F2" ; Take large BMP screenshot.
hotkey.togglefullscreen = "Alt+Return" ; Toggle fullscreen/windowed mode
hotkey.screenshot.watermark = "K" ; Toggle product/company watermark for official
hotkey.wireframe = "Alt+W" ; Toggle wireframe mode.
hotkey.archive.abort = "Alt+F4" ; Prematurely terminate the archive builder process.
hotkey.exit = "Alt+F4", "Ctrl+Break" ; Exit to desktop
hotkey.leave = Escape ; End current game or Exit
hotkey.pause = Pause ; Pause/unpause game
hotkey.screenshot = F2 ; Take PNG screenshot
hotkey.bigscreenshot = "Shift+F2" ; Take large BMP screenshot
hotkey.togglefullscreen = "Alt+Return" ; Toggle fullscreen/windowed mode
hotkey.screenshot.watermark = "K" ; Toggle product/company watermark for official screenshots
hotkey.wireframe = "Alt+W" ; Toggle wireframe mode
; > CAMERA SETTINGS
hotkey.camera.reset = "H" ; Reset camera rotation to default.
hotkey.camera.follow = "F" ; Follow the first unit in the selection
hotkey.camera.reset.origin = "Ctrl+H" ; Reset camera to origin.
hotkey.camera.zoom.in = Plus, Equals, NumPlus ; Zoom camera in.
hotkey.camera.zoom.out = Minus, NumMinus ; Zoom camera out.
hotkey.camera.zoom.wheel.in = WheelUp ; Zoom camera in (wheel speed).
hotkey.camera.zoom.wheel.out = WheelDown ; Zoom camera out (wheel speed).
hotkey.camera.rotate.wheel.cw = "Shift+WheelUp"
hotkey.camera.rotate.wheel.ccw = "Shift+WheelDown"
hotkey.camera.rotate.cw = "Ctrl+LeftArrow", "Ctrl+A", Q
hotkey.camera.rotate.ccw = "Ctrl+RightArrow", "Ctrl+D", E
hotkey.camera.rotate.up = "Ctrl+UpArrow", "Ctrl+W"
hotkey.camera.rotate.down = "Ctrl+DownArrow", "Ctrl+S"
hotkey.camera.pan = MouseMiddle, ForwardSlash ; Scroll by moving mouse.
hotkey.camera.pan.keyboard = "~Shift+~Ctrl" ; = holding neither Ctrl nor Shift
hotkey.camera.left = A, LeftArrow ; Scroll or rotate left.
hotkey.camera.right = D, RightArrow ; Scroll or rotate right.
hotkey.camera.up = W, UpArrow ; Scroll or rotate up/forwards.
hotkey.camera.down = S, DownArrow ; Scroll or rotate down/backwards.
;camera.cinema.add = "L"
;camera.cinema.delete = "U"
;camera.cinema.delete.all = "R"
;camera.cinema.write = "O"
camera.cinema.queue = "I"
hotkey.camera.reset = "H" ; Reset camera rotation to default.
hotkey.camera.follow = "F" ; Follow the first unit in the selection
hotkey.camera.zoom.in = Plus, Equals, NumPlus ; Zoom camera in (continuous control)
hotkey.camera.zoom.out = Minus, NumMinus ; Zoom camera out (continuous control)
hotkey.camera.zoom.wheel.in = WheelUp ; Zoom camera in (stepped control)
hotkey.camera.zoom.wheel.out = WheelDown ; Zoom camera out (stepped control)
hotkey.camera.rotate.up = "Ctrl+UpArrow", "Ctrl+W" ; Rotate camera to look upwards
hotkey.camera.rotate.down = "Ctrl+DownArrow", "Ctrl+S" ; Rotate camera to look downwards
hotkey.camera.rotate.cw = "Ctrl+LeftArrow", "Ctrl+A", Q ; Rotate camera clockwise around terrain
hotkey.camera.rotate.ccw = "Ctrl+RightArrow", "Ctrl+D", E ; Rotate camera anticlockwise around terrain
hotkey.camera.rotate.wheel.cw = "Shift+WheelUp", MouseX1 ; Rotate camera clockwise around terrain (stepped control)
hotkey.camera.rotate.wheel.ccw = "Shift+WheelDown", MouseX2 ; Rotate camera anticlockwise around terrain (stepped control)
hotkey.camera.pan = MouseMiddle, ForwardSlash ; Enable scrolling by moving mouse
hotkey.camera.left = A, LeftArrow ; Scroll or rotate left
hotkey.camera.right = D, RightArrow ; Scroll or rotate right
hotkey.camera.up = W, UpArrow ; Scroll or rotate up/forwards
hotkey.camera.down = S, DownArrow ; Scroll or rotate down/backwards
; > CONSOLE SETTINGS
hotkey.console.toggle = BackQuote, F9 ; Open/close console.
hotkey.console.copy = "Ctrl+C" ; Copy from console to clipboard.
hotkey.console.paste = Insert, "Ctrl+V" ; Paste clipboard to console.
hotkey.console.toggle = BackQuote, F9 ; Open/close console
; > CLIPBOARD CONTROLS
hotkey.copy = "Ctrl+C" ; Copy to clipboard
hotkey.paste = "Ctrl+V" ; Paste from clipboard
hotkey.cut = "Ctrl+X" ; Cut selected text and copy to the clipboard
; > ENTITY SELECTION
hotkey.selection.add = Shift ; Add units to selection.
hotkey.selection.remove = Ctrl ; Remove units from selection.
hotkey.selection.group.0 = 0
hotkey.selection.group.1 = 1
hotkey.selection.group.2 = 2
hotkey.selection.group.3 = 3
hotkey.selection.group.4 = 4
hotkey.selection.group.5 = 5
hotkey.selection.group.6 = 6
hotkey.selection.group.7 = 7
hotkey.selection.group.8 = 8
hotkey.selection.group.9 = 9
hotkey.selection.group.add = Shift ; +group: Add units to group.
hotkey.selection.group.save = Ctrl ; +group: Save units to group.
hotkey.selection.group.snap = Alt ; +group: Check up on group.
hotkey.selection.snap = Home ; Centre view on selection.
hotkey.highlightall = O ; Show selection circle for all units on screen.
hotkey.killUnit = Delete
hotkey.selection.add = Shift ; Add units to selection
hotkey.selection.remove = Ctrl ; Remove units from selection
hotkey.selection.idle = Period ; Select next idle unit
hotkey.selection.offscreen = Alt ; Include offscreen units in selection
hotkey.selection.group.select.0 = 0
hotkey.selection.group.save.0 = "Ctrl+0"
hotkey.selection.group.add.0 = "Shift+0"
hotkey.selection.group.select.1 = 1
hotkey.selection.group.save.1 = "Ctrl+1"
hotkey.selection.group.add.1 = "Shift+1"
hotkey.selection.group.select.2 = 2
hotkey.selection.group.save.2 = "Ctrl+2"
hotkey.selection.group.add.2 = "Shift+2"
hotkey.selection.group.select.3 = 3
hotkey.selection.group.save.3 = "Ctrl+3"
hotkey.selection.group.add.3 = "Shift+3"
hotkey.selection.group.select.4 = 4
hotkey.selection.group.save.4 = "Ctrl+4"
hotkey.selection.group.add.4 = "Shift+4"
hotkey.selection.group.select.5 = 5
hotkey.selection.group.save.5 = "Ctrl+5"
hotkey.selection.group.add.5 = "Shift+5"
hotkey.selection.group.select.6 = 6
hotkey.selection.group.save.6 = "Ctrl+6"
hotkey.selection.group.add.6 = "Shift+6"
hotkey.selection.group.select.7 = 7
hotkey.selection.group.save.7 = "Ctrl+7"
hotkey.selection.group.add.7 = "Shift+7"
hotkey.selection.group.select.8 = 8
hotkey.selection.group.save.8 = "Ctrl+8"
hotkey.selection.group.add.8 = "Shift+8"
hotkey.selection.group.select.9 = 9
hotkey.selection.group.save.9 = "Ctrl+9"
hotkey.selection.group.add.9 = "Shift+9"
; > CONTEXT CURSOR
hotkey.contextorder.next = LeftBracket ; Cycle right through orders (context cursors).
hotkey.contextorder.previous = RightBracket ; Cycle left through orders (context cursors).
; > TESTING KEYS
hotkey.orbital.toggle = V ; Enable/disable ball arena.
hotkey.orbital.cheat = "LeftCtrl+Backslash" ; Freeze ball.
hotkey.dudemachine.random = "Ctrl+ForwardSlash" ; Create random Dude.
; > SESSION CONTROLS
hotkey.session.kill = Delete ; Destroy selected units
hotkey.session.garrison = Ctrl ; Modifier to garrison when clicking on building
hotkey.session.queue = Shift ; Modifier to queue unit orders instead of replacing
hotkey.session.batchtrain = Shift ; Modifier to train units in batches
hotkey.session.deselectgroup = Ctrl ; Modifier to deselect units when clicking group icon, instead of selecting
hotkey.session.rotate.cw = RightBracket ; Rotate building placement preview clockwise
hotkey.session.rotate.ccw = LeftBracket ; Rotate building placement preview anticlockwise
hotkey.timewarp.fastforward = Space ; If timewarp mode enabled, speed up the game
hotkey.timewarp.rewind = Backspace ; If timewarp mode enabled, go back to earlier point in the game
; > OVERLAY KEYS
hotkey.fps.toggle = "Shift+F" ; Toggle frame counter.
hotkey.session.statuspane.toggle = "Shift+S" ; Toggle Status Orb.
hotkey.session.minimap.toggle = "Shift+M" ; Toggle Map Orb.
hotkey.resourcepool.toggle = "Shift+R" ; Toggle Resource Pool.
hotkey.grouppane.toggle = "Shift+G" ; Toggle Group Pane.
hotkey.teamtray.toggle = "Shift+T" ; Toggle Team Tray.
hotkey.session.ShowPlayersList = "Shift+P" ; Toggle Players List
hotkey.session.devcommands.toggle = "Shift+D"
; > SESSION ORIENTATION KEYS
hotkey.session.gui.flip = "Alt+G" ; Toggle GUI to top/bottom/left/right of screen.
hotkey.session.gui.toggle = "G" ; Toggle visibility of session GUI.
; (TEMPORARY)
hotkey.alwayson.toggle = "Shift+X" ; Toggle always ons (Exit Button, End Game Button).
; > SUBMENU KEYS
hotkey.menu.toggle = "F10" ; Toggle in-game menu.
hotkey.menu.resign = "Alt+X" ; End current game session and return to main menu.
hotkey.fps.toggle = "Shift+F" ; Toggle frame counter
hotkey.session.devcommands.toggle = "Shift+D" ; Toggle developer commands panel
hotkey.session.gui.toggle = "G" ; Toggle visibility of session GUI
hotkey.menu.toggle = "F10" ; Toggle in-game menu
; > HOTKEYS ONLY
hotkey.chat = Return ; Toggle chat window
hotkey.chat = Return ; Toggles chat window
hotkey.onlinehelp = "F1" ; Enable/disable online manual entry for current selection.
hotkey.music.toggle = "M" ; Enable/disable music.
hotkey.audio.toggle = "Ctrl+A" ; Enable/disable sound.
; > GUI TEXTBOX HOTKEYS
hotkey.text.delete.left = "Ctrl+Backspace" ; Delete word to the left of cursor
hotkey.text.delete.right = "Ctrl+Del" ; Delete word to the right of cursor
hotkey.text.move.left = "Ctrl+LeftArrow" ; Move cursor to start of word to the left of cursor
hotkey.text.move.right = "Ctrl+RightArrow" ; Move cursor to start of word to the right of cursor
; > PROFILER
hotkey.profile.toggle = "F11" ; Enable/disable real-time profiler
hotkey.profile.save = "Shift+F11" ; Save current profiler data to "logs/profile.txt"
hotkey.profile.toggle = "F11" ; Enable/disable real-time profiler
hotkey.profile.save = "Shift+F11" ; Save current profiler data to logs/profile.txt
; UNMAPPED KEY/MOUSE REFERENCE:
; LMB ; select unit
; RMB ; issue order to selected units
; LMB-drag ; bandbox units
; LMB-doubleclick ; select all units of this type on screen
; LMB-tripleclick ; select all units of this type on map
; shift+mouse select ; add to selection
; ctrl+mouse select ; remove from selection
; #=(1...0) ; select group #, pressing again centres view
; shift+# ; add group # to selection
; ctrl+# ; save selection as group #
; alt+# (hold down) ; snap view to group # (while alt is held down)
; mouse on map edge ; scroll in this direction
; EXPERIMENTAL: joystick/gamepad settings
joystick.enable = false
joystick.deadzone = 8192
joystick.camera.pan.x = 0
joystick.camera.pan.y = 1
joystick.camera.rotate.x = 3
joystick.camera.rotate.y = 2
joystick.camera.zoom.in = 5
joystick.camera.zoom.out = 4
+2 -2
View File
@@ -126,8 +126,8 @@ Right Alt, RightAlt
Left Alt, LeftAlt
Right Meta
Left Meta
Left Super, LeftWin
Right Super, RightWin
Left Super, LeftWin
Right Super, RightWin
Alt Gr, AltGr
Compose
@@ -2,8 +2,14 @@ function TestScript1A() {}
TestScript1A.prototype.GetX = function() {
// Test that .entity is readonly
delete this.entity;
this.entity = -1;
try {
delete this.entity;
Engine.TS_FAIL("Missed exception");
} catch (e) { }
try {
this.entity = -1;
Engine.TS_FAIL("Missed exception");
} catch (e) { }
// and return the value
return this.entity;
@@ -20,9 +20,9 @@ Engine.RegisterComponentType(IID_Test1, "TestScript1_Init", TestScript1_Init);
function TestScript1_readonly() {}
TestScript1_readonly.prototype.GetX = function() {
this.template = null;
delete this.template;
try { this.template.x += 1000; } catch(e) { }
try { this.template = null; } catch(e) { }
try { delete this.template; } catch(e) { }
try { this.template.x += 1000; } catch(e) { }
try { delete this.template.x; } catch(e) { }
try { this.template.y = 2000; } catch(e) { }
return +(this.template.x || 1) + +(this.template.y || 2);
@@ -19,8 +19,14 @@ function TestScript1_entity() {}
TestScript1_entity.prototype.GetX = function() {
// Test that .entity is readonly
delete this.entity;
this.entity = -1;
try {
delete this.entity;
Engine.TS_FAIL("Missed exception");
} catch (e) { }
try {
this.entity = -1;
Engine.TS_FAIL("Missed exception");
} catch (e) { }
// and return the value
return this.entity;
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity>
<VisualActor>
<SilhouetteDisplay>false</SilhouetteDisplay>
<SilhouetteOccluder>false</SilhouetteOccluder>
</VisualActor>
</Entity>
@@ -2,12 +2,15 @@
<Entity>
<VisualActor>
<Actor>example</Actor>
<SilhouetteDisplay>false</SilhouetteDisplay>
<SilhouetteOccluder>false</SilhouetteOccluder>
</VisualActor>
<Selectable/>
<Position>
<Altitude>0</Altitude>
<Anchor>upright</Anchor>
<Floating>false</Floating>
<TurnRate>6.0</TurnRate>
</Position>
<UnitAI/>
</Entity>
@@ -2,12 +2,15 @@
<Entity>
<VisualActor>
<Actor>example</Actor>
<SilhouetteDisplay>false</SilhouetteDisplay>
<SilhouetteOccluder>false</SilhouetteOccluder>
</VisualActor>
<Selectable/>
<Position>
<Altitude>0</Altitude>
<Anchor>upright</Anchor>
<Floating>false</Floating>
<TurnRate>6.0</TurnRate>
</Position>
<UnitAI/>
<Footprint>
@@ -16,5 +19,12 @@
</Footprint>
<Obstruction>
<Unit radius="4"/>
<Active>true</Active>
<BlockMovement>true</BlockMovement>
<BlockPathfinding>false</BlockPathfinding>
<BlockFoundation>false</BlockFoundation>
<BlockConstruction>true</BlockConstruction>
<DisableBlockMovement>false</DisableBlockMovement>
<DisableBlockPathfinding>false</DisableBlockPathfinding>
</Obstruction>
</Entity>
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Corral Fences">
<mesh>props/kart_corral_fence.dae</mesh>
<texture>props/celt_prop_1.dds</texture>
</variant>
</group>
</actor>
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Corral Mud">
<mesh>props/kart_corral_mud.dae</mesh>
<texture>props/decal_struct_mud_long.dds</texture>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="chinese merchant sail">
<mesh>props/chin_merch_sail.dae</mesh>
<texture>props/chin_sail_dragon.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="chinese trireme sail">
<mesh>props/chin_tri_sail.dae</mesh>
<texture>props/chin_sail_dragon.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/iber_dock_boat.dae</mesh>
<texture>structural/iber_ship.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="mesh">
<mesh>props/iber_fishship_sail.dae</mesh>
<texture>props/iber_sail_b.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,18 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="props-1">
<mesh>props/iber_gate_door_1.dae</mesh>
<mesh>props/iber_gate_door.dae</mesh>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
<group>
<variant>
<texture>props/iber_prop_a.dds</texture>
</variant>
</group>
</actor>
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/iber_wallgate_shields.dae</mesh>
<texture>props/iber_prop_shields.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="mesh">
<mesh>props/iber_merch_sail.dae</mesh>
<texture>props/iber_sail_a.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,23 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="shields-a">
<mesh>props/iber_scout_tower.dae</mesh>
</variant>
<variant frequency="1" name="shields-b">
<mesh>props/iber_scout_tower_b.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>props/iber_prop_shields.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant frequency="100" name="Base">
<mesh>props/pers_tri_mast.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="trireme-sail-stripes">
<texture>props/pers_trireme_sail.dds</texture>
</variant>
<variant frequency="1" name="trireme-sail-eagle">
<texture>props/pers_trireme_sail_b.dds</texture>
</variant>
<variant frequency="1" name="trireme-sail-drako">
<texture>props/pers_trireme_sail_c.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant frequency="100" name="Base">
<mesh>props/rome_qui_mast.dae</mesh>
<texture>props/rome_qui_sail.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>test/balrog.pmd</mesh>
<props>
<prop actor="props/temp/balrogwings.xml" attachpoint="props_main"/>
</props>
<texture>temp/balrog.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>test/balrogwings.pmd</mesh>
<texture>temp/balrogwings.dds</texture>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/breastplate.pmd</mesh>
<props/>
<texture>props/wrld_anvil.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/cape.pmd</mesh>
<props/>
<texture>props/prop_weap_axe.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/car_a.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/car_b.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/car_e.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/cjv_a.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/cjv_b.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/cjv_e.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/csp_a.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/csp_b.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/csp_e.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/csw_a.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/csw_b.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/csw_e.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/fem.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/med.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/hr1.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/hr2.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/hr3.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/iar_a.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/iar_b.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/iar_e.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/ijv_a.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/ijv_b.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/ijv_e.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/isl_a.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/isl_b.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/isl_e.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/isp_a.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/isp_b.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/isp_e.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/isw_a.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/isw_b.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/isw_e.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/su1.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/su2.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/su3.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/trd.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/car_a.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/car_b.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/car_e.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/cjv_a.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/cjv_b.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/cjv_e.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/csp_a.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/csp_b.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/csp_e.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/csw_a.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/csw_b.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/csw_e.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/fem.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/med.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/hr1.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/hr2.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/hr3.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/iar_a.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/iar_b.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/iar_e.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/ijv_a.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/ijv_b.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/ijv_e.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/isl_a.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/isl_b.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/isl_e.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/isp_a.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/isp_b.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/isp_e.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/isw_a.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/isw_b.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/isw_e.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/su1.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/su2.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/su3.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/trd.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/car_a.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_iber.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/car_b.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_iber.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>temp/car_e.pmd</mesh>
<props/>
<texture>temp/ui_portrait_sheet_civ_iber.dds</texture>
</variant>
</group>
</actor>

Some files were not shown because too many files have changed in this diff Show More