1
0
forked from mirrors/0ad

Compare commits

...

424 Commits

Author SHA1 Message Date
Mythos_Ruler c5045ecfa7 This was SVN commit r8413. 2010-10-17 21:27:24 +00:00
WhiteTreePaladin 38e2ebfee7 Give female citizens enough attack to get a chicken in one hit
This was SVN commit r8412.
2010-10-17 20:51:45 +00:00
Mythos_Ruler 0e09f952a0 chickens are now skittish. ;)
This was SVN commit r8411.
2010-10-17 20:36:24 +00:00
Mythos_Ruler a0b1b5c4e1 chicken health reduced.
This was SVN commit r8410.
2010-10-17 20:33:15 +00:00
WhiteTreePaladin add040f7e1 Hide city phase indicator
This was SVN commit r8409.
2010-10-17 20:13:02 +00:00
Mythos_Ruler 2a9cbe9a19 1. Re-exported the Celt fishing ship (was missing mast).
2. Re-exported Celt Wall (it was originally exported off-center). Added
some player color fiddly bits.

3. Fixed wall Foundation Actors.

4. Enabled building of fishing boats from docks
(template_structure_military_dock).

5. Nerfed javelinist and archer attack.

This was SVN commit r8408.
2010-10-17 20:05:04 +00:00
WhiteTreePaladin 937769035a Only show formation icons for units
This was SVN commit r8407.
2010-10-17 20:01:18 +00:00
WhiteTreePaladin 43f2be44ba label
This was SVN commit r8405.
2010-10-17 18:57:51 +00:00
Ykkrosh eca237647e Play victory/defeat music at appropriate times.
Stop ambient sounds when returning to main menu.

This was SVN commit r8404.
2010-10-17 18:30:36 +00:00
Ykkrosh 7b7e98ea7b Delete obsolete version of GUI files
This was SVN commit r8403.
2010-10-17 18:28:53 +00:00
Ykkrosh c486e5cde0 Add victory/defeat music files
This was SVN commit r8402.
2010-10-17 18:28:23 +00:00
Ykkrosh 4b3f1e8aaa Allow camera closer to edge of map when zoomed in
This was SVN commit r8401.
2010-10-17 16:26:02 +00:00
Ykkrosh 6a15b78c98 Increase multiplayer turn length to mask the effects of latency.
This was SVN commit r8400.
2010-10-17 16:07:43 +00:00
janwas d11bc41d9a move support for GL swap control into wsdl (based on patch from wacko)
fixes #523

This was SVN commit r8399.
2010-10-17 08:55:47 +00:00
Mythos_Ruler 7fbc3c42b3 This was SVN commit r8398. 2010-10-17 03:04:02 +00:00
Mythos_Ruler fffece9128 map tweaks.
This was SVN commit r8397.
2010-10-17 02:40:51 +00:00
Mythos_Ruler 0a756380bf This was SVN commit r8396. 2010-10-17 02:37:31 +00:00
WhiteTreePaladin c2918cdf32 Fixes health bar not showing when multiple units that have health are selected
This was SVN commit r8395.
2010-10-17 02:34:07 +00:00
WhiteTreePaladin b5313de1c7 Fixed infinitely tall health bar when selecting multiple trees, rocks, or other things without health
This was SVN commit r8394.
2010-10-17 02:26:20 +00:00
Mythos_Ruler ecdb5740fe Temporarily using the old Celt Market actor until a new market is made.
This was SVN commit r8393.
2010-10-17 02:02:16 +00:00
Mythos_Ruler b22e72d1d8 This was SVN commit r8392. 2010-10-17 01:50:05 +00:00
Mythos_Ruler 5617480db2 Renamed some objects.
This was SVN commit r8391.
2010-10-17 01:47:09 +00:00
Mythos_Ruler 7839fe4c2b Deleted old PMD files for Celt SB. Re-exported Celt SB in Collada, plus some tweaks and props for it. Re-did the Celt Civic Centre. Moved the "old/new" round CC to a special object called a Celtic Homestead.
This was SVN commit r8390.
2010-10-17 01:34:15 +00:00
Mythos_Ruler 9ccff5d5d6 Fishing boats fixed. Edited fishing demo map.
This was SVN commit r8389.
2010-10-17 00:29:52 +00:00
Mythos_Ruler ae7af8ed4d New Greek fishing boat. There seems to be a problem with the entity though.
This was SVN commit r8388.
2010-10-17 00:07:44 +00:00
Mythos_Ruler 46efdbbb45 Made roadway wider on Massacre map. Tweaked forces on Combat_Demo map.
This was SVN commit r8387.
2010-10-16 23:36:47 +00:00
Mythos_Ruler 76e96a83c5 A new Combat Demo iteration. Tweaked Boudicca's hair color. lol
This was SVN commit r8386.
2010-10-16 23:13:51 +00:00
Ykkrosh 556a40ff08 Fix JSON parse error in maps
This was SVN commit r8385.
2010-10-16 23:07:40 +00:00
Ykkrosh 0666dd6074 Uglily initialise player civ assignments to match their starting civ centre
This was SVN commit r8384.
2010-10-16 23:07:20 +00:00
Mythos_Ruler 1e53fa2e27 deleted the Mountain pass map.
This was SVN commit r8383.
2010-10-16 22:31:22 +00:00
WhiteTreePaladin 5ca46883e6 Limit training queue size
(Fixes #613)

This was SVN commit r8382.
2010-10-16 21:53:50 +00:00
Ykkrosh 1f4eb955ee Make fields and fences brown on the minimap
This was SVN commit r8381.
2010-10-16 21:03:58 +00:00
Mythos_Ruler 2188fd6507 Hunting added for females (they needed an attack value). Their hunting and unit behavior will need some work. Maybe for Alpha IV or something. Added treasure gathering to all units, specifically so that Heroes could gather treasures.
This was SVN commit r8380.
2010-10-16 20:59:37 +00:00
Ykkrosh f3afa9c005 Improve obstruction shapes of some wall-related objects
This was SVN commit r8379.
2010-10-16 20:50:51 +00:00
Ykkrosh f4df65d7f1 Change default maps to newer ones
This was SVN commit r8378.
2010-10-16 20:49:29 +00:00
WhiteTreePaladin 468816aaea Show chat message when the developer console is opened or closed. (For SHIFT-D hotkey)
This was SVN commit r8377.
2010-10-16 19:57:26 +00:00
WhiteTreePaladin 86cb0db407 Fix chat input not getting cleared when ESC is pressed
Allow chat messages to be sent internally (bypass chat input box)
Show chat message when the developer console is opened or closed.
(moved dev console back to the right side)

This was SVN commit r8376.
2010-10-16 19:49:48 +00:00
Ykkrosh fe5bd12301 Fix --without-pch build
This was SVN commit r8375.
2010-10-16 17:10:00 +00:00
Mythos_Ruler db2b7ed62b This was SVN commit r8374. 2010-10-16 03:08:27 +00:00
Mythos_Ruler 6ebd688589 Added descriptions to some maps.
This was SVN commit r8373.
2010-10-16 02:28:44 +00:00
Ykkrosh ee55b92667 Avoid wasting address space on currently-broken cache (see #611).
This was SVN commit r8371.
2010-10-15 23:20:28 +00:00
Ykkrosh 094ccc6a98 Fix playing of sound files in archives (by disabling proper streaming).
This was SVN commit r8370.
2010-10-15 23:06:14 +00:00
Ykkrosh ee8d49200a Fix formation movement loop when switching from column
This was SVN commit r8369.
2010-10-15 19:25:17 +00:00
Ykkrosh eec07b3f85 Fix missing main menu music when S3TC warning is displayed, by removing archive builder from GUI startup.
This was SVN commit r8368.
2010-10-15 14:10:36 +00:00
Ykkrosh 835609df20 Change S3TC warning yet again, to point to a web page with more information. Also stop hard-coding the message.
This was SVN commit r8367.
2010-10-15 12:29:20 +00:00
Mythos_Ruler fbe809287c This was SVN commit r8366. 2010-10-15 08:53:00 +00:00
Mythos_Ruler 86f0e0ba32 Re-exported the Gallic Fortress, with new player color tidbits and mesh fixes. Deleted 19 old PMD meshes.
This was SVN commit r8365.
2010-10-15 08:18:31 +00:00
Mythos_Ruler 5efa4ac15a This was SVN commit r8364. 2010-10-15 06:20:26 +00:00
Mythos_Ruler 71108ff458 #New Camel fauna.
This was SVN commit r8363.
2010-10-15 06:19:06 +00:00
Mythos_Ruler 8191e8d1dc This was SVN commit r8362. 2010-10-15 04:38:05 +00:00
Mythos_Ruler c6f50be71b This was SVN commit r8361. 2010-10-15 04:37:42 +00:00
Mythos_Ruler 7bbc19c791 testing making new, better looking pine trees. added a new "farmland" terrain texture. added the FIF tree as a fruit bearing tree. Added a jagged stone mine quarry for the Gold Rush map.
This was SVN commit r8360.
2010-10-15 04:29:08 +00:00
Mythos_Ruler 87782e3242 This was SVN commit r8359. 2010-10-15 03:42:13 +00:00
Mythos_Ruler 659515f89d Cleaning
This was SVN commit r8358.
2010-10-15 03:40:04 +00:00
Mythos_Ruler 5040068948 This was SVN commit r8357. 2010-10-15 01:35:30 +00:00
Ykkrosh a1a7264aec Set force_s3tc_enable automatically for greater chance of compressed texture support on Linux (see #575).
This was SVN commit r8356.
2010-10-15 00:06:48 +00:00
Mythos_Ruler 8edd28c43c Decal for Celt CC. New Celt Temple.
This was SVN commit r8355.
2010-10-14 19:54:08 +00:00
Ykkrosh 3cedddf60d Disable rank icons
This was SVN commit r8354.
2010-10-14 16:25:00 +00:00
janwas 2270961d14 VC2010 fix
This was SVN commit r8353.
2010-10-14 09:39:41 +00:00
Ykkrosh 3d2b17f1bf Fix some warnings on Windows
This was SVN commit r8352.
2010-10-13 21:58:31 +00:00
WhiteTreePaladin 3fce7d86f3 Temporarily re-enable fake formations in GUI
This was SVN commit r8350.
2010-10-13 21:40:56 +00:00
Mythos_Ruler fa9d51cbb1 This was SVN commit r8349. 2010-10-13 21:27:55 +00:00
WhiteTreePaladin 0c61f34db1 Reference group count by name instead of templateName
This was SVN commit r8347.
2010-10-13 20:16:03 +00:00
WhiteTreePaladin bd3ffd2c6a Reworked EntityGroups
Moved selection size check into selection.js

This was SVN commit r8346.
2010-10-13 19:48:13 +00:00
Mythos_Ruler 888afbccb5 Made the war dog 1 pop. Fixed an attack range thing where the dog was unable to attack or hunt.
This was SVN commit r8345.
2010-10-13 19:28:52 +00:00
Ykkrosh 7b59550cc3 Fix #612 (passing a program object to glDeleteShader via pglDeleteObjectARB)
This was SVN commit r8344.
2010-10-13 16:45:27 +00:00
Ykkrosh c1967848d2 # Fix units killing their own farms
This was SVN commit r8343.
2010-10-13 15:14:15 +00:00
Mythos_Ruler 8abfa5ec89 slight color tweak
This was SVN commit r8342.
2010-10-13 07:50:50 +00:00
Mythos_Ruler 2559496fdf A new stoa for the Greeks.
This was SVN commit r8341.
2010-10-13 00:40:25 +00:00
Mythos_Ruler f41434e3f6 This was SVN commit r8340. 2010-10-13 00:39:04 +00:00
Mythos_Ruler 9e71973135 This was SVN commit r8339. 2010-10-12 06:11:19 +00:00
Mythos_Ruler be6aab1f93 Added description to Macedonia map. Completely changed the Gold Rush map. It will be a lot cooler. Will complete it before the weekend.
This was SVN commit r8338.
2010-10-12 05:23:10 +00:00
Mythos_Ruler 78c0312542 edited some Health for animals. (Elephants needed Health boost)
This was SVN commit r8337.
2010-10-12 04:46:48 +00:00
Mythos_Ruler 1013082de6 Footprint and Status bar height tweaks.
This was SVN commit r8336.
2010-10-12 04:41:34 +00:00
Mythos_Ruler c99357c880 Tweaked cavalry footprints/obstruction to be consistent.
This was SVN commit r8335.
2010-10-12 04:11:12 +00:00
Mythos_Ruler d08f6b7c46 This was SVN commit r8334. 2010-10-12 01:52:56 +00:00
Mythos_Ruler e82ed0f7ae Beginning to add new single icons to the game. :)
This was SVN commit r8333.
2010-10-12 01:46:29 +00:00
WhiteTreePaladin 9909675b68 Made EntityGroups more efficient
"Ability to add units to or remove from an already selected group of
units" based on patch by k776 (modified to avoid going over the max
selection size)
(Fixes #602)

This was SVN commit r8332.
2010-10-11 17:24:06 +00:00
Ykkrosh 1cdc8d1726 Warn about some obsolete documentation
This was SVN commit r8331.
2010-10-11 17:03:58 +00:00
Mythos_Ruler 4af13e4ce1 This was SVN commit r8330. 2010-10-11 15:27:39 +00:00
janwas 6f62ef3f3c better ChooseCacheSize: always clamp to 500 MB, remove assertion (refs #611)
This was SVN commit r8329.
2010-10-11 07:03:53 +00:00
Mythos_Ruler a37399b33b Fixed a few stats.
This was SVN commit r8328.
2010-10-10 22:17:49 +00:00
Mythos_Ruler 0b51957faf This was SVN commit r8327. 2010-10-10 21:27:43 +00:00
Ykkrosh ab6702ffaa Fix typo in comment
This was SVN commit r8326.
2010-10-10 19:14:22 +00:00
Mythos_Ruler 0b418f887b This was SVN commit r8325. 2010-10-10 17:40:33 +00:00
ShieldBearer 40eabf0441 This was SVN commit r8324. 2010-10-10 16:07:40 +00:00
ShieldBearer 96162bf2b4 This was SVN commit r8323. 2010-10-10 15:12:44 +00:00
janwas fecac5a7be # add support for streaming sounds, not just loading them entirely into memory (avoids stalls when switching music tracks)
very belated revision/integration of Heron/Kyniker's patch (thanks!)

ogg fixes: ensure file remains open by holding a shared_ptr. avoid
returning 0 (success) when bytesRead==requestedSize.

closes #100

This was SVN commit r8322.
2010-10-10 12:08:51 +00:00
janwas c9cc7d9784 skip populating directories when mounting and scanning archives => reduces startup time by about half a second when archives are present.
also disable archive stats (currently unused) and refactor directory
creation/association logic.

This was SVN commit r8321.
2010-10-10 10:22:11 +00:00
Mythos_Ruler 3b38240d4f Make hoplites gather food from dead animals like other units do (instead of stabbing at them with spears).
This was SVN commit r8320.
2010-10-10 06:06:14 +00:00
janwas 48360edf21 noticed during testing that the file cache is much smaller than our dataset; added logic to choose a decent size. rebuild-workspaces required.
wversion: move into separate component from wutil to allow inclusion
from GameSetup without pulling in windows.h (causes conflicts)

This was SVN commit r8319.
2010-10-09 21:14:08 +00:00
WhiteTreePaladin 2399c283ce Removed unnecessary health component from fish which made fishing impossible
This was SVN commit r8318.
2010-10-09 19:39:20 +00:00
janwas c9ebacaa36 fix assertion under heavy cache usage due to 32-bit overflow (c.f. http://www.wildfiregames.com/forum/index.php?showtopic=13622)
This was SVN commit r8317.
2010-10-09 18:12:11 +00:00
janwas 7f0b055907 warn when VFS directory creation fails due to an existing file of the same name (was seeing a crash due to a Zip file I had created in the cache directory)
This was SVN commit r8316.
2010-10-09 17:53:25 +00:00
Ykkrosh a4e47abf34 Stop suggesting the now-unnecessary libtxc_dxtn when S3TC support is missing
This was SVN commit r8315.
2010-10-09 16:07:41 +00:00
Ykkrosh 184779e00e # Add "[", "]" keys to rotate buildings during placement, based on patch from k776.
Fixes #588.

This was SVN commit r8314.
2010-10-09 13:53:17 +00:00
Ykkrosh 5d1ad60d18 Fix aliasing error in NVTT (fixes #605).
Bump texture cache version number, to invalidate potentially-incorrect
cached textures.

This was SVN commit r8313.
2010-10-08 23:34:55 +00:00
Mythos_Ruler db9a2eecee Adjusted resource value of the Metal Mines.
This was SVN commit r8312.
2010-10-08 21:45:00 +00:00
Ykkrosh b62b316c56 Delete obsolete scripts
This was SVN commit r8311.
2010-10-08 16:58:06 +00:00
Ykkrosh dd3bf54e4c Add translation to desktop file (see #492)
This was SVN commit r8310.
2010-10-08 14:08:54 +00:00
Ykkrosh 7b6775ee9f Fix building with NVTT
This was SVN commit r8309.
2010-10-08 10:42:23 +00:00
Mythos_Ruler 43b110a43b Final 3 waypoint flags.
This was SVN commit r8308.
2010-10-08 04:54:23 +00:00
WhiteTreePaladin 3f7941d5c2 Hide the health bar when a unit containing resources is killed
This was SVN commit r8307.
2010-10-07 22:41:48 +00:00
Ykkrosh 46d5fff269 Use zipped data files and pre-converted textures in release distributions
This was SVN commit r8306.
2010-10-07 19:57:31 +00:00
Ykkrosh 5eedb07297 Fix selection of loading screen textures with pre-converted texture cache
This was SVN commit r8305.
2010-10-07 19:56:13 +00:00
Ykkrosh 8dda4db8d8 Remove obsolete pmdexp tool
This was SVN commit r8303.
2010-10-07 18:50:49 +00:00
Ykkrosh 0436dc4cb9 Fix memory leak
This was SVN commit r8302.
2010-10-07 18:42:35 +00:00
Ykkrosh ff983a7114 Remove obsolete file
This was SVN commit r8301.
2010-10-07 18:40:30 +00:00
Ykkrosh 0c170e2e01 Add test for NVTT bug
This was SVN commit r8300.
2010-10-07 10:56:38 +00:00
Ykkrosh 7ebf258033 Fix tests
This was SVN commit r8299.
2010-10-07 10:35:45 +00:00
Ykkrosh 7b82173bad Avoid potential integer overflow in pathfinder
This was SVN commit r8298.
2010-10-06 23:50:07 +00:00
Ykkrosh de673be78a Fix likely cause of "unexpected PathResult" warnings
This was SVN commit r8297.
2010-10-06 22:17:34 +00:00
Ykkrosh 368b07b04e # Add hunting (animals get killed before gathering meat from them)
This was SVN commit r8296.
2010-10-06 21:37:55 +00:00
WhiteTreePaladin 69b2581ff0 Preparation for garrison code
This was SVN commit r8295.
2010-10-06 18:55:46 +00:00
WhiteTreePaladin 1784c67c8b Changed background icon for total unit count
This was SVN commit r8294.
2010-10-06 05:25:30 +00:00
Mythos_Ruler a4fad2a549 This was SVN commit r8293. 2010-10-06 05:17:12 +00:00
WhiteTreePaladin ca223eeb5b Made multiple unit selection health bar vertical again
Increased unit selection icons to 16
Added total unit count

This was SVN commit r8292.
2010-10-06 04:19:25 +00:00
WhiteTreePaladin ff8477c339 Made unit selection icons the same size as the formation icons
This was SVN commit r8291.
2010-10-05 22:44:32 +00:00
ShieldBearer f05e403ee5 This was SVN commit r8290. 2010-10-05 17:44:51 +00:00
ShieldBearer 22920d34d9 This was SVN commit r8289. 2010-10-05 17:44:14 +00:00
Ykkrosh 9dfa21b558 Fix off-by-one error (glDrawRangeElements expects the *inclusive* upper bound of indexes)
This was SVN commit r8288.
2010-10-05 15:54:04 +00:00
Mythos_Ruler 5e197be0b4 This was SVN commit r8287. 2010-10-05 10:09:16 +00:00
Mythos_Ruler 3092691690 This was SVN commit r8286. 2010-10-05 09:13:40 +00:00
Mythos_Ruler 0baa84f6ab texture for Celt temple
This was SVN commit r8285.
2010-10-05 09:10:37 +00:00
ShieldBearer e9d3bf05a8 This was SVN commit r8284. 2010-10-05 09:08:40 +00:00
Mythos_Ruler 9faedfbc90 Lots of art tweaks. Brand new Celtic Civic Centre.
This was SVN commit r8283.
2010-10-05 08:42:16 +00:00
Mythos_Ruler 759da20346 Some new wood textures.
This was SVN commit r8282.
2010-10-05 06:12:13 +00:00
Mythos_Ruler e2bbdd2448 This was SVN commit r8281. 2010-10-05 05:36:07 +00:00
Mythos_Ruler a399c2af03 Round roof for a Celt building.
This was SVN commit r8280.
2010-10-05 03:13:47 +00:00
Mythos_Ruler adefbc7b23 This was SVN commit r8279. 2010-10-05 02:29:09 +00:00
Ykkrosh 9872cb17b8 Deselect units that disappear into fog-of-war.
Fixes #596.

This was SVN commit r8278.
2010-10-05 00:08:05 +00:00
Ykkrosh f662e069b1 Tighten schema for ranks, to help detect errors
This was SVN commit r8277.
2010-10-05 00:07:15 +00:00
Ykkrosh 19066998c1 Show rank icon on selected units
This was SVN commit r8276.
2010-10-05 00:05:52 +00:00
ShieldBearer bf77f61b0f This was SVN commit r8274. 2010-10-04 17:58:02 +00:00
Ykkrosh f2e96f3f3c Reduce brightness of fogged objects.
This was SVN commit r8273.
2010-10-04 17:35:13 +00:00
Ykkrosh ab77ec40e4 Fix highlighting of obstructed building placement previews.
Prevent building in non-visible areas.
Fixes #594.

This was SVN commit r8272.
2010-10-04 17:34:33 +00:00
Ykkrosh 6b5b35c245 Remove BFD-based debugging code, to avoid the runtime dependency on binutils.
Fixes #581.

This was SVN commit r8271.
2010-10-04 17:21:55 +00:00
Ykkrosh caba7cbe8f Fix #586 (setting sound.mastergain to 0), based on patch from historic_bruno
This was SVN commit r8270.
2010-10-04 12:07:17 +00:00
Ykkrosh d77e70389b Fix #585 (Windows support for font builder), based on patch from historic_bruno
This was SVN commit r8269.
2010-10-04 12:00:22 +00:00
Ykkrosh 795be260be Improve docs
This was SVN commit r8268.
2010-10-04 11:38:43 +00:00
Mythos_Ruler 2959cce0e8 Another "campaign" unit for people to play with in Atlas for Alpha II--The Theban Sacred Band.
This was SVN commit r8267.
2010-10-04 09:27:50 +00:00
Mythos_Ruler ec681ce8a8 This was SVN commit r8266. 2010-10-04 07:00:44 +00:00
Mythos_Ruler e8314783d9 New Celtic Dock. :) New Celtic waypoint banner.
This was SVN commit r8265.
2010-10-04 06:43:20 +00:00
ShieldBearer bd17bc349e This was SVN commit r8264. 2010-10-04 06:36:00 +00:00
Mythos_Ruler f8853fe7b2 Touched up the waypoint textures. Continued work on Arcadia III. Tweak footprints for House and Barracks.
This was SVN commit r8263.
2010-10-04 05:23:19 +00:00
Mythos_Ruler deadd4d31e Footprints.
This was SVN commit r8262.
2010-10-04 02:12:09 +00:00
Mythos_Ruler 50ed028dcb New way-point flag, including a new flag for possible faction-specific implementation. Persian and Greek versions complete so far.
This was SVN commit r8261.
2010-10-04 01:49:28 +00:00
Mythos_Ruler 47c9f8144c This was SVN commit r8260. 2010-10-04 00:11:07 +00:00
Mythos_Ruler c146fe24ba sunset sky
This was SVN commit r8259.
2010-10-04 00:10:24 +00:00
Mythos_Ruler b8bd93d22b Deleted the old 'temp' portrait sheets.
This was SVN commit r8258.
2010-10-03 23:42:02 +00:00
Ykkrosh cc0a680a21 Increase box/column formation switching distance
This was SVN commit r8257.
2010-10-03 23:20:21 +00:00
WhiteTreePaladin eff766d6b9 Made ESC close out open dialogs rather than offer to close the game
Fixed the multiple unit health bar failing to work correctly
Changed multiple selection area to fit layout better.
Organized code

This was SVN commit r8256.
2010-10-03 22:42:15 +00:00
Ykkrosh 2cc6280d70 Fix OOS
This was SVN commit r8255.
2010-10-03 20:12:08 +00:00
Ykkrosh 59c8ecfa3d Use voices for infantry/cavalry units.
Make arrows quieter.
Handle order-related sounds via the GUI instead of simulation, to make
them player-specific and to reduce latency.

This was SVN commit r8254.
2010-10-03 17:58:49 +00:00
Ykkrosh aa32677784 Restore highlighting of units on hover.
Optimise overlay code a bit.

This was SVN commit r8253.
2010-10-03 16:48:52 +00:00
Mythos_Ruler a47227daaa #New Celt Market
This was SVN commit r8252.
2010-10-03 09:24:26 +00:00
Mythos_Ruler 91a644df3c This was SVN commit r8251. 2010-10-03 02:51:36 +00:00
Mythos_Ruler bf177d6a7d Messed with the sizes of the Health bars. See what everyone thinks.
This was SVN commit r8250.
2010-10-03 01:28:38 +00:00
Ykkrosh 9a0db9713e Add resource supply status bars.
Change bar size for buildings.
Only highlight one entity on mouse hover, and only if it's not a unit.
Display status bars on foundations.

This was SVN commit r8249.
2010-10-03 00:30:43 +00:00
Mythos_Ruler 1d32223e1a Tweaked the names of these units.
This was SVN commit r8248.
2010-10-02 23:54:31 +00:00
Mythos_Ruler 21a07af553 Messed with the GUI backgrounds to make them fit better. Starting a new Arcadia III map.
This was SVN commit r8247.
2010-10-02 23:46:09 +00:00
WhiteTreePaladin f9b5bd37ca Removed button background from command icons
This was SVN commit r8246.
2010-10-02 23:24:13 +00:00
Mythos_Ruler cd12571845 This was SVN commit r8245. 2010-10-02 22:32:39 +00:00
Mythos_Ruler 96f417ab3b Control-group icons.
This was SVN commit r8244.
2010-10-02 22:27:51 +00:00
Ykkrosh 7412e5563a Switch to column formation when moving longer distances.
Increase minimum box formation width to 5.

This was SVN commit r8243.
2010-10-02 19:40:30 +00:00
Ykkrosh 7ea522a484 # Add on-screen health bars
This was SVN commit r8241.
2010-10-02 12:41:29 +00:00
Mythos_Ruler 5e9a968bd6 This was SVN commit r8240. 2010-10-02 04:01:25 +00:00
WhiteTreePaladin 4afcd057f6 Made lower panel sprites same scale
Adjusted vertical spacing of player and unit names.

This was SVN commit r8239.
2010-10-02 03:24:12 +00:00
Mythos_Ruler 3eb50d0763 command icons moved to a 32x32 cell grid. :)
This was SVN commit r8238.
2010-10-02 03:15:27 +00:00
WhiteTreePaladin d2f07800ed Fixed bug where resource bar sometimes covered the health bar
This was SVN commit r8237.
2010-10-01 22:29:55 +00:00
WhiteTreePaladin 8a01e11db7 Health bar shows average for multiple selections
Center panel texture shrunk and dark tile texture is tiled over the
panels better
Command icons reference new sheet

This was SVN commit r8236.
2010-10-01 22:18:03 +00:00
Ykkrosh fcedcae052 # Add victory/defeat conditions, based on patch from fcxSanya.
Fixes #565.

This was SVN commit r8234.
2010-10-01 20:51:21 +00:00
Mythos_Ruler 4b3e819b67 Celt scout tower variation.
This was SVN commit r8233.
2010-10-01 09:13:34 +00:00
Mythos_Ruler 3e03a8ae10 #Re-exported Celtic Mill and Farmstead to Collada with some tweaks and additions. Can now delete their *.PMD meshes. Added a Celtic "hut" eye candy building.
This was SVN commit r8232.
2010-10-01 07:34:29 +00:00
Mythos_Ruler 607e176b9b This was SVN commit r8231. 2010-10-01 07:21:15 +00:00
Mythos_Ruler 9d923233ac This was SVN commit r8230. 2010-10-01 07:17:22 +00:00
Mythos_Ruler 138a937f6d This was SVN commit r8229. 2010-10-01 04:43:35 +00:00
Mythos_Ruler 3631c12337 This was SVN commit r8228. 2010-10-01 04:37:16 +00:00
Mythos_Ruler 71b469c115 New Celtic Outpost.
This was SVN commit r8227.
2010-10-01 04:24:39 +00:00
Mythos_Ruler 91c5101e48 This was SVN commit r8226. 2010-10-01 04:23:35 +00:00
Mythos_Ruler 317abe51d4 Tweaked some templates. New 'heal' cursor for Healers (eventually). New 'command' icons for the GUI.
This was SVN commit r8225.
2010-10-01 02:36:08 +00:00
Mythos_Ruler 009f0c035d This was SVN commit r8224. 2010-10-01 01:56:28 +00:00
WhiteTreePaladin 53abdf4717 Fixed the size of the menu and civ icon sprites
This was SVN commit r8223.
2010-10-01 01:13:43 +00:00
Mythos_Ruler f76d3da89a Redone faction emblems for UI ribbon. 64x64 now.
This was SVN commit r8222.
2010-10-01 01:01:11 +00:00
Mythos_Ruler c49489dda5 This was SVN commit r8221. 2010-10-01 00:17:31 +00:00
Mythos_Ruler 20a87d1477 Toned down the yellow color of the gold UI borders.
This was SVN commit r8220.
2010-09-30 23:57:55 +00:00
Mythos_Ruler b9ec3cbce3 This was SVN commit r8219. 2010-09-30 23:41:03 +00:00
Ykkrosh 6bcf4f25c8 Fix CStr parsing to be independent of locale, so that it doesn't break when GTK+ changes the locale.
This was SVN commit r8218.
2010-09-30 23:17:41 +00:00
WhiteTreePaladin 729cf72d2b More GUI fixes. Specifically, making panel textures size appropriately in different resolutions.
Smaller panel image with less dark on the sides.

This was SVN commit r8217.
2010-09-30 23:01:24 +00:00
WhiteTreePaladin 61fa8d29f6 Some more in-game GUI progress. Multiple selections now look more like the mockup, but all the stats icons and bars still reference the first unit. I will fix that part later.
This was SVN commit r8216.
2010-09-30 22:39:45 +00:00
Mythos_Ruler ae2e61f90c This was SVN commit r8215. 2010-09-30 04:01:22 +00:00
Mythos_Ruler 81788eb55d #New Celt Barracks.
This was SVN commit r8214.
2010-09-30 03:16:15 +00:00
WhiteTreePaladin 54142e5ee8 Some more progress towards Michael's GUI design.
This was SVN commit r8213.
2010-09-29 21:55:51 +00:00
Mythos_Ruler 0be4b5858f This was SVN commit r8212. 2010-09-29 11:41:25 +00:00
Mythos_Ruler fadc725c4e Moar eye candy and an update the Arcadia II.
This was SVN commit r8211.
2010-09-29 08:56:09 +00:00
Mythos_Ruler f15ed58ffb #Re-exported the Celtic house meshes to Collada format--added player color fiddly bits and increased their size about 20%. Re-exported the Celtic broch and added some cool stuff (!) to it.
This was SVN commit r8210.
2010-09-29 08:16:27 +00:00
Mythos_Ruler 8f979d3250 New foundation mesh and actor for the Corrals. Tweaked the corral entities for gameplay testing. Tweaked the fauna footprint radius.
This was SVN commit r8209.
2010-09-29 06:20:21 +00:00
Mythos_Ruler c9a2a97c25 Deleted cursor DDS files per Philip.
This was SVN commit r8208.
2010-09-28 21:20:46 +00:00
Mythos_Ruler 8035840fa8 hellenes portrait sheet in PNG
This was SVN commit r8207.
2010-09-28 21:07:11 +00:00
WhiteTreePaladin 41819d3189 Moved notification area to rest on right side of lower panel.
(Hide right panel when not used)

This was SVN commit r8206.
2010-09-28 18:31:40 +00:00
WhiteTreePaladin 4e897394dc Fixed some overlapping issues
Added menu hotkey

This was SVN commit r8205.
2010-09-28 18:15:11 +00:00
WhiteTreePaladin b2278e56a6 Fixed menu graphics
Misc consistency improvements
Added pause hotkey

This was SVN commit r8204.
2010-09-28 17:40:41 +00:00
WhiteTreePaladin ac11a5cf28 Fixed chat dialog graphics
This was SVN commit r8203.
2010-09-28 15:53:20 +00:00
WhiteTreePaladin 93e81319e8 Added civ icon
Fixed Settings Dialog graphics

This was SVN commit r8202.
2010-09-28 14:58:14 +00:00
ShieldBearer 7b419170ad updated the lion mesh
This was SVN commit r8201.
2010-09-28 14:38:59 +00:00
WhiteTreePaladin ea7c2e569c Michael's new GUI layout
(I made some changes to some parts which can always be changed back.
It's still a work in progress.)

This was SVN commit r8200.
2010-09-28 14:19:13 +00:00
Mythos_Ruler e981380f33 This was SVN commit r8199. 2010-09-28 09:59:44 +00:00
Mythos_Ruler abb0e3fcd2 Fixed icon.
This was SVN commit r8198.
2010-09-28 09:22:39 +00:00
Mythos_Ruler ec36a942e1 Fixed some stone mines from Player 1 to Gaia.
This was SVN commit r8197.
2010-09-28 09:04:29 +00:00
Mythos_Ruler ba6d3d3fb7 New cursor. Don't worry, I backed up the old one.
This was SVN commit r8196.
2010-09-28 08:06:27 +00:00
Mythos_Ruler e84c79c066 New GUI art assets. Brian please let me (Michael) know if things need changed or if you need more assets.
This was SVN commit r8195.
2010-09-28 08:02:06 +00:00
Mythos_Ruler 0ef9ec916c Tweaked foundation sizes.
This was SVN commit r8194.
2010-09-27 22:34:38 +00:00
Mythos_Ruler d7801ea211 New Celt kennel and tavern.
This was SVN commit r8193.
2010-09-27 09:05:03 +00:00
Mythos_Ruler d59b9c2298 This was SVN commit r8192. 2010-09-27 04:30:31 +00:00
Mythos_Ruler 85178ae88d I made the selection ring for the field a little bigger. Previously it was covered by the wheat objects.
This was SVN commit r8191.
2010-09-27 02:48:17 +00:00
Ykkrosh 82691683cb Fix #56 (add unit-following camera mode (press 'F')), based on patch from markelov.
Remove obsolete IsNewSimulation function.

This was SVN commit r8190.
2010-09-26 23:05:25 +00:00
Mythos_Ruler 9bdbc3906f A remodeled Greek gate. Changed the name of the Greek cavalry swordsman to the more accurate "Hippeus."
This was SVN commit r8189.
2010-09-26 09:27:16 +00:00
Mythos_Ruler 8c16820d5b Playing with LOS ranged of towers to make them useful to use.
This was SVN commit r8188.
2010-09-26 07:43:06 +00:00
Mythos_Ruler 28fe458c51 This was SVN commit r8187. 2010-09-26 07:04:09 +00:00
Mythos_Ruler a4f7b7e530 Added the Spartan phalangite editor unit for Alpha II. Renamed the Greek temple from "Anaktoron" to "Naos" on the advice of a Greek scholar friend.
This was SVN commit r8186.
2010-09-26 04:59:50 +00:00
Mythos_Ruler d964683536 This was SVN commit r8185. 2010-09-26 01:46:01 +00:00
Mythos_Ruler be92780300 Gave Celtic house a smaller foundation.
This was SVN commit r8184.
2010-09-26 01:20:25 +00:00
Mythos_Ruler 768f0728da Tweaks to some maps and entities. Added Celtic dog kennel for testing.
This was SVN commit r8183.
2010-09-26 01:18:29 +00:00
WhiteTreePaladin 7f3a628e0b Some small aesthetic changes to selection details area
This was SVN commit r8182.
2010-09-25 18:19:06 +00:00
WhiteTreePaladin fa1dc05de2 New GUI layout
Delete confirmation dialog
Resource bar replaces resource quantity/icon
Selected units are grouped by type regardless of rank
Ranked units use the same icon
"Basic" units are now considered to have the rank of "Basic" for
grouping purposes

This was SVN commit r8180.
2010-09-25 15:22:41 +00:00
Mythos_Ruler 0974a06321 #New Celtic Corral and Greek Wall Gate.
This was SVN commit r8179.
2010-09-25 09:54:09 +00:00
Mythos_Ruler 12de784e3f Texture tweaks. Animation tweaks. Building entity tweaks.
This was SVN commit r8178.
2010-09-25 05:24:07 +00:00
Mythos_Ruler 46de88a518 Texture for the Hellenes wall gate.
This was SVN commit r8177.
2010-09-25 05:01:02 +00:00
ShieldBearer 7313601bcb This was SVN commit r8176. 2010-09-25 03:43:38 +00:00
Mythos_Ruler 87b5602910 This was SVN commit r8175. 2010-09-25 01:13:23 +00:00
Mythos_Ruler 75f0fa87c0 Edited some Celtic and Greek unit animations and some entity stats (namely footprints and such). I probably missed some. In fact I am positive I did, so we'll have to keep tweaking these in the coming weeks. I made a new Mediterranean city tile texture too, so check it out.
This was SVN commit r8174.
2010-09-25 00:49:28 +00:00
feneur 3d58ea8816 Amish's lioness added
This was SVN commit r8173.
2010-09-25 00:27:32 +00:00
Ykkrosh 58026a3c6d Fix bug with failing to reset GL state when sometimes necessary
This was SVN commit r8172.
2010-09-24 21:42:41 +00:00
Ykkrosh 6d82bfaabf Disable some profiler calls that are frequent enough to significantly affect performance
This was SVN commit r8171.
2010-09-24 21:33:07 +00:00
Ykkrosh ede71ea791 Inline common vector/matrix operations, for performance.
Remove some redundant vector methods.
Compute skinning for positions and normals simultaneously.
(These changes reduce skinning cost by >50%.)

This was SVN commit r8170.
2010-09-24 16:54:20 +00:00
Ykkrosh 46b79f8a6d Scale minimap LOS texture down, to reduce update/upload costs.
Reduce minimap LOS update frequency.

This was SVN commit r8169.
2010-09-24 16:52:29 +00:00
Mythos_Ruler 7531cab8a6 Added lions to the map.
This was SVN commit r8168.
2010-09-23 23:34:58 +00:00
Ykkrosh 4e065b52c2 Change flora entities to axis-aligned obstruction shapes, to improve pathfinder performance
This was SVN commit r8167.
2010-09-23 23:29:22 +00:00
Mythos_Ruler 1775d7b244 #More eyecandy stuff.
This was SVN commit r8166.
2010-09-23 20:38:16 +00:00
ShieldBearer 94261c036c #New fauna lion
This was SVN commit r8165.
2010-09-23 20:13:04 +00:00
Mythos_Ruler d0d879d3f6 Some new fallen columns eye candy.
This was SVN commit r8164.
2010-09-23 19:17:15 +00:00
Ykkrosh 85deca90e4 Fix projectiles in FoW
This was SVN commit r8163.
2010-09-23 13:09:35 +00:00
Ykkrosh e1082e5adb Fix warnings
This was SVN commit r8162.
2010-09-23 12:54:16 +00:00
Ykkrosh 924d1219a7 # Add fog-of-war.
Move Vision component to C++, for more efficient FoW processing.
Disable FoW on demo maps.

This was SVN commit r8160.
2010-09-23 12:13:13 +00:00
Mythos_Ruler 8886841860 This was SVN commit r8159. 2010-09-22 06:48:14 +00:00
Mythos_Ruler 1caa4e7016 new date palm, wall foundations, map tweaks, and celtic longhouse.
This was SVN commit r8158.
2010-09-22 06:47:29 +00:00
ShieldBearer 45bd668934 This was SVN commit r8156. 2010-09-22 06:22:24 +00:00
Mythos_Ruler 6f69e02490 This was SVN commit r8155. 2010-09-22 03:55:26 +00:00
Mythos_Ruler ac7a170f95 A wide open Savanna map, called 'Serengeti.' A savanna "city tile" terrain.
This was SVN commit r8154.
2010-09-22 03:51:36 +00:00
Mythos_Ruler 9ed1b9b773 A water-worn terrain texture for savanna biome.
This was SVN commit r8153.
2010-09-22 03:30:23 +00:00
Mythos_Ruler c5610cd111 Added a pebbly, rocky decal beneath the Savanna quarries. Tweaked the Mediterranean metal mine textures.
This was SVN commit r8152.
2010-09-22 02:02:34 +00:00
Mythos_Ruler f509de5a45 This was SVN commit r8151. 2010-09-22 00:26:01 +00:00
Mythos_Ruler 024a833721 New: Pegasus, freestanding column, edited the maps a bit, testing out an Aphrodite high-poly statue (it needs a proper texture though).
This was SVN commit r8150.
2010-09-21 23:11:59 +00:00
Mythos_Ruler 97b8db723c A wing texture for Pegasus.
This was SVN commit r8149.
2010-09-21 19:25:04 +00:00
Ykkrosh 000b7250a2 Use slightly higher quality texture compression in archive-builder mode
This was SVN commit r8148.
2010-09-20 16:34:09 +00:00
Mythos_Ruler 5db5aa6ad9 #New giraffe fauna.
This was SVN commit r8147.
2010-09-20 16:24:26 +00:00
Mythos_Ruler 2897b737fd This was SVN commit r8146. 2010-09-20 06:19:50 +00:00
Mythos_Ruler 76c5874a8c New Savanna "metal mine" slab entities and textures.
This was SVN commit r8145.
2010-09-20 04:12:47 +00:00
Mythos_Ruler bc68a32076 Edited Arcadia II; started a new Savanna biome map, called "Sahel Watering Holes."
This was SVN commit r8144.
2010-09-20 04:11:06 +00:00
Mythos_Ruler 643decf96f Moved savanna terrains to Public Mod.
This was SVN commit r8143.
2010-09-20 02:56:16 +00:00
Mythos_Ruler 127a0f3d7d This was SVN commit r8142. 2010-09-20 02:48:29 +00:00
Mythos_Ruler 86b6ccd7e9 Moar savanna terrain stuff
This was SVN commit r8141.
2010-09-20 02:41:47 +00:00
Mythos_Ruler ce44425289 This was SVN commit r8140. 2010-09-20 02:22:23 +00:00
Mythos_Ruler ae5baaadec Updating the Savanna terrains.
This was SVN commit r8139.
2010-09-20 01:58:59 +00:00
Mythos_Ruler ea80667dfc #Organizing and revamping some terrain stuff for Alpha II. ;)
This was SVN commit r8138.
2010-09-20 01:43:03 +00:00
Ykkrosh 3d8d354a18 # Optimise spatial queries.
This was SVN commit r8136.
2010-09-19 18:08:56 +00:00
Mythos_Ruler 6465bd66ff Fixed a couple of things.
This was SVN commit r8135.
2010-09-18 19:35:27 +00:00
Mythos_Ruler 19eec7fde2 Made a new "grape vine" object and added it to Arcadia II.xml
This was SVN commit r8134.
2010-09-18 19:25:47 +00:00
Ykkrosh 84b04f37db Fix more warning.
This was SVN commit r8133.
2010-09-18 18:59:04 +00:00
Ykkrosh b9eb283174 Fix warning.
Set thread name for texture converter.

This was SVN commit r8132.
2010-09-18 18:56:06 +00:00
Ykkrosh 3c35d5e469 Convert broken unloadable .dds file to .png
This was SVN commit r8131.
2010-09-18 18:52:22 +00:00
Ykkrosh 0d172264f8 # Add -archivebuild mode to generate .zip files for releases, with automatic compression of textures.
Fix terrain manager to understand .cached.dds files.
Fix IArchiveWriter so you can pass it absolute paths of files to load,
and different relative paths for storing inside the archive.
Fix fs_util::ForEachFile when called on the VFS root.

This was SVN commit r8130.
2010-09-18 18:21:00 +00:00
Mythos_Ruler 3a47d3b51b Fixed Arcadia. I had previously committed a messed up map.
This was SVN commit r8129.
2010-09-18 15:06:28 +00:00
Mythos_Ruler cccbf39640 This was SVN commit r8128. 2010-09-18 15:02:30 +00:00
Mythos_Ruler b7357380ae This was SVN commit r8127. 2010-09-17 23:12:58 +00:00
Mythos_Ruler 79915a17a5 An additional Grass color variation, plus playing with the city tile feature.
This was SVN commit r8126.
2010-09-17 23:02:39 +00:00
Mythos_Ruler 15da9d9602 Arcadia I and II map tweaks.
This was SVN commit r8125.
2010-09-17 23:01:26 +00:00
Ykkrosh 4c92b7b596 Add primitive tool for generating profile graphs
This was SVN commit r8124.
2010-09-17 21:03:57 +00:00
Ykkrosh 2362d938cd Fix loading maps
This was SVN commit r8123.
2010-09-17 20:47:47 +00:00
Ykkrosh 8a98102195 Fix serialize/deserialize API asymmetry.
Add serialization support to more components.

This was SVN commit r8122.
2010-09-17 17:53:26 +00:00
Ykkrosh a29bb003f2 Fix warning message in replays
This was SVN commit r8121.
2010-09-17 17:50:43 +00:00
Ykkrosh db047e5bee Cache message JS conversions, to make broadcasts faster
This was SVN commit r8120.
2010-09-17 17:49:39 +00:00
Ykkrosh bd38d9d34f Fix log replayer to load terrain properties.
Add profiler to replayer.
Add replay hash verification.

This was SVN commit r8119.
2010-09-17 17:45:50 +00:00
Ykkrosh fd68a95bad Fix map reader to load all necessary simulation data even when graphics are disabled
This was SVN commit r8118.
2010-09-17 17:43:12 +00:00
Ykkrosh 624e8490a2 Increase script memory limit more
This was SVN commit r8117.
2010-09-17 17:40:44 +00:00
Mythos_Ruler 9faaeeebd4 The map seemed to have a problem with it, so I am remaking it.
This was SVN commit r8115.
2010-09-17 06:39:56 +00:00
Mythos_Ruler d000411727 This was SVN commit r8114. 2010-09-13 21:12:32 +00:00
Mythos_Ruler 474b91fabf Added description to map and Stone to the center.
This was SVN commit r8113.
2010-09-13 19:54:46 +00:00
Mythos_Ruler 594cad069f #Arcadia II is done (might tweak it later). Tweaked the FISH entity. Re-ordered the buildings for the Female Citizen.
This was SVN commit r8112.
2010-09-13 19:36:07 +00:00
Mythos_Ruler f5a7e64fda This was SVN commit r8111. 2010-09-13 05:05:19 +00:00
Mythos_Ruler 88307763f6 New "Stoa" object.
This was SVN commit r8110.
2010-09-13 05:04:02 +00:00
Mythos_Ruler e9ec4ba1fa New temple portrait. WIP Arcadia II.
This was SVN commit r8109.
2010-09-13 00:10:05 +00:00
Ykkrosh bd94273801 Stop using sem_init, since it's not supported on OS X.
Avoid calling any GL functions during tests (since GL isn't loaded).

This was SVN commit r8108.
2010-09-12 20:59:18 +00:00
Ykkrosh 1cc4d358d7 Fix #549 (Allow units to be moved by right-clicking on the mini-map), based on patch from Badmadblacksad
This was SVN commit r8107.
2010-09-11 19:49:21 +00:00
Mythos_Ruler 19ba2927d8 adjusted the Greek wall entity and adjusted my working copy of Arcadia II.
This was SVN commit r8106.
2010-09-11 18:01:09 +00:00
Mythos_Ruler 7cba57c2dd PNG of a Greek building texture. You can see the alpha channel was converted to a transparency map for some inexplicable reason.
This was SVN commit r8105.
2010-09-11 16:21:39 +00:00
Ykkrosh f3c9a59d29 Fix layout errors and crash with Atlas terrain previews.
Fix warning.

This was SVN commit r8103.
2010-09-10 21:35:08 +00:00
Ykkrosh c8eaee35cc Add initial texture conversion settings.
Replace button texture with higher-quality PNG.

This was SVN commit r8102.
2010-09-10 21:05:13 +00:00
Ykkrosh 96a8c7bd91 Remove default LOD bias.
Disable GL automatic mipmap generation.

This was SVN commit r8101.
2010-09-10 21:04:02 +00:00
Ykkrosh f12fa90e4b Add data files for texture manager tests.
This was SVN commit r8100.
2010-09-10 21:03:15 +00:00
Ykkrosh 67a94572ec # Add new texture loading system with automatic compression.
Replace almost all texture uses with calls to the new system.
Add some anistropic filtering to terrain textures.
Let Atlas load terrain texture previews partly-asynchronously by
polling.
Fix inefficient texture colour determination for minimap.
Remove unused global g_TerrainModified.
Change GUI texcoord computation to be less efficient but to cope with
dynamic texture changes.
Fix GUI renderer effects leaving bogus colour state.

This was SVN commit r8099.
2010-09-10 21:02:10 +00:00
Ykkrosh b15c5c1c45 Add anisotropic filtering support to ogl_tex.
Shrink some OglTex fields so that it fits in the size limit.
Add function to efficiently read the 1x1 mipmap level's colour.
Add RGB->RGBA and BGR->RGBA transforms.
Fix DXT1a detection logic.
Fix OglTex_validate failing when ogl_max_tex_size == -1 (e.g. before
ogl_Init is called).

This was SVN commit r8097.
2010-09-10 20:37:54 +00:00
Ykkrosh ad02ab726d Expose VFS file priorities.
This was SVN commit r8096.
2010-09-10 20:29:38 +00:00
Ykkrosh 5b7afe3606 Fix zip file detection.
This was SVN commit r8095.
2010-09-10 20:28:48 +00:00
Ykkrosh dee3cb84b5 Fix S3TC decoder bug.
Add S3TC decoder test.
Fix texture codec test to not be a no-op, then disable it since it
fails.
Add DDS mipmap removal transform.

This was SVN commit r8094.
2010-09-10 20:25:23 +00:00
Ykkrosh aadbf53a2a Add nvtt to build system
This was SVN commit r8093.
2010-09-10 20:15:49 +00:00
Mythos_Ruler 933fb2dc9f new Greek Wall
This was SVN commit r8090.
2010-09-08 22:57:46 +00:00
WhiteTreePaladin 9a337d434b Fixes button layout in multiplayer setup based on patch by fcxSanya (Fixes #560)
This was SVN commit r8089.
2010-09-08 21:10:31 +00:00
Ykkrosh a901a2a207 Fix #566 (test failure)
This was SVN commit r8088.
2010-09-07 09:29:23 +00:00
Mythos_Ruler db47fa94b4 #New Greek Wall Tower by Brightgalrs. Continued work on a new map.
This was SVN commit r8087.
2010-09-07 01:56:05 +00:00
Mythos_Ruler fb9ed7d1f9 Removed 50+ pop bonus. Modified the Gold Rush map. Added new Greek map, but it is a work in progress.
This was SVN commit r8086.
2010-09-06 18:34:25 +00:00
Mythos_Ruler 485548e2af This was SVN commit r8085. 2010-09-06 05:32:49 +00:00
Mythos_Ruler 71ba55c3ba This was SVN commit r8084. 2010-09-06 00:11:44 +00:00
Mythos_Ruler c6159c98dd This was SVN commit r8083. 2010-09-06 00:09:33 +00:00
janwas c0c8132dd4 fix VFS real path retrieval for files mounted from multiple directories (e.g. mods)
closes #564
GetRealPath was too simplistic and just asked the directory *most
recently mounted* into the file's VFS directory for its path. the
correct solution is to ask the file's loader for its path. the archiver
IFileLoader new returns the archive's pathname as the real path.
also simplified VfsFile's interface.

This was SVN commit r8082.
2010-09-05 21:41:45 +00:00
WhiteTreePaladin 0864ba4fb4 Fixed main menu parchment buttons (Fixes #561)
Switched placement of load game and cancel buttons

This was SVN commit r8081.
2010-09-05 19:04:55 +00:00
janwas f5f65c23c0 OSX compat: remove cpu_CAS64 wrapper, since intptr_t and i64 apparently aren't compatible types. IA-32 code should call ia32_asm_CAS64 if it wants to CAS 64-bit values.
This was SVN commit r8080.
2010-09-05 15:38:34 +00:00
janwas 2e7436434d warning fixes: mostly size_t vs. specialized API type and other type conversion.
added player_id_t typedef and INVALID_PLAYER, use that instead of -1.
also added sanity checks to cpu.cpp to ensure ARCH_* is correct (see
http://www.wildfiregames.com/forum/index.php?showtopic=13327&hl=)
and further predefined macros to arch.h just to be sure.

This was SVN commit r8079.
2010-09-05 09:38:30 +00:00
WhiteTreePaladin 178d45d0e2 Added regular size cancel / close buttons to several menu areas (Fixes #558 and #560)
Moved main menu buttons to top right

This was SVN commit r8078.
2010-09-04 22:27:24 +00:00
Ykkrosh b1e32f9542 Fix tests
This was SVN commit r8077.
2010-09-04 21:29:27 +00:00
Ykkrosh 6c7830df3f Rename CTextureManager and CTextureEntry since they are only for terrain textures
This was SVN commit r8076.
2010-09-04 21:26:52 +00:00
Ykkrosh 014d504e3a Fix FAT-tolerant timestamp comparison
This was SVN commit r8075.
2010-09-04 16:46:10 +00:00
Mythos_Ruler 5068304a73 This was SVN commit r8074. 2010-09-04 16:41:50 +00:00
Mythos_Ruler b2290a22ba This was SVN commit r8073. 2010-09-04 16:23:44 +00:00
Ykkrosh 1c535b6a8a Fix #544 (Fall back to windowed mode if fullscreen fails), based on patch from oln
This was SVN commit r8072.
2010-09-04 14:49:12 +00:00
Ykkrosh fae4a3da24 Fix #548 (GUI should give feedback when training queue entry is blocked), based on patch from fcxSanya
This was SVN commit r8071.
2010-09-04 13:24:52 +00:00
Ykkrosh 0fa0181f0c Fix #554 (camera should be always inside the terrain), based on patch from markelov
This was SVN commit r8070.
2010-09-04 12:50:27 +00:00
Mythos_Ruler 6ceee8a5ec This was SVN commit r8069. 2010-09-04 04:11:15 +00:00
WhiteTreePaladin 086d522050 Made structures reference new buildings icon sheet
This was SVN commit r8068.
2010-09-04 01:41:10 +00:00
Mythos_Ruler b9e288301b This was SVN commit r8067. 2010-09-04 01:01:17 +00:00
Mythos_Ruler e89c761cce This was SVN commit r8066. 2010-09-04 00:44:04 +00:00
Mythos_Ruler ef752ebd53 This was SVN commit r8065. 2010-09-03 22:04:16 +00:00
WhiteTreePaladin e88760f7c1 Made comment consistent with changes
This was SVN commit r8064.
2010-09-03 20:18:54 +00:00
Ykkrosh 5e15a0279e Print JS stack trace when reporting exceptions.
Increase maximum logger message size.
Fix GC bug.

This was SVN commit r8063.
2010-09-03 20:06:17 +00:00
Ykkrosh 5cc04d44f8 Fix some script errors
This was SVN commit r8062.
2010-09-03 20:04:11 +00:00
WhiteTreePaladin 7f680afd0a Fixed unhandled event 'ResourceGather' in the PASSIVE state
This was SVN commit r8061.
2010-09-03 19:58:15 +00:00
Ykkrosh 1fb90357b2 Fix build error
This was SVN commit r8059.
2010-09-03 10:09:41 +00:00
Ykkrosh 2b57f4f998 # Initial support for formation movement.
Support asynchronous path queries.
Allow escaping when stuck in impassable terrain tiles.
Split Update message in multiple phases, to cope with ordering
requirements.
Support automatic walk/run animation switching.

This was SVN commit r8058.
2010-09-03 09:55:14 +00:00
Ykkrosh ece6b58188 Fix crash in replay mode.
Disable audio properly in replay mode.

This was SVN commit r8057.
2010-09-03 09:50:16 +00:00
Ykkrosh b712efac07 Optimise vertex pathfinder (typically ~6x faster).
This was SVN commit r8056.
2010-09-03 09:44:41 +00:00
Ykkrosh 188a3cab12 Split pathfinder into multiple files, to make it more manageable.
This was SVN commit r8055.
2010-09-03 09:32:12 +00:00
Mythos_Ruler f80ee08f5f This was SVN commit r8054. 2010-09-02 19:21:49 +00:00
Mythos_Ruler 38f29e055c #New Greek Scout Tower and textures.
This was SVN commit r8053.
2010-09-01 21:32:05 +00:00
Mythos_Ruler bf4ea39457 This was SVN commit r8052. 2010-08-31 01:55:14 +00:00
WhiteTreePaladin 90e4672c8d Removed unnecessary null assignment
This was SVN commit r8051.
2010-08-30 14:43:26 +00:00
Mythos_Ruler 1cbd528b94 This was SVN commit r8050. 2010-08-30 01:45:54 +00:00
Mythos_Ruler f5b32e0ff5 This was SVN commit r8049. 2010-08-30 01:03:54 +00:00
Mythos_Ruler 4e3186c8a2 This was SVN commit r8048. 2010-08-30 00:49:14 +00:00
Ykkrosh ae4e03f1e5 Fix config typo
This was SVN commit r8047.
2010-08-29 20:04:39 +00:00
Ykkrosh 1936acc8a8 Fix #557 (Minor improvements to non-fancy water fresnel effect), based on patch from hex539
This was SVN commit r8046.
2010-08-29 14:13:39 +00:00
Ykkrosh 0858b76bed Fix #556 (Minimap camera outline clips incorrectly), based on patch from Jayschwa
This was SVN commit r8045.
2010-08-29 13:31:19 +00:00
Ykkrosh 81f4347c71 Fix #553 (build error when wxUSE_ON_FATAL_EXCEPTION disabled), based on patch from Karlik
This was SVN commit r8044.
2010-08-29 12:51:52 +00:00
Ykkrosh 99d56959aa Fix #552 (compile with new boost (1.44+)), based on patch from Karlik
This was SVN commit r8043.
2010-08-29 12:44:13 +00:00
Mythos_Ruler 660ce1bcb8 This was SVN commit r8042. 2010-08-29 04:25:13 +00:00
Mythos_Ruler 714573c442 Deleting Latium map and will replace with a new one soon.
This was SVN commit r8041.
2010-08-29 01:41:58 +00:00
Mythos_Ruler 5141a0d3bb This was SVN commit r8040. 2010-08-29 01:12:23 +00:00
Mythos_Ruler ed0c6c72c8 added auto-smooth group
This was SVN commit r8039.
2010-08-28 23:50:07 +00:00
Mythos_Ruler 0273df2943 #New texture for Greek military and economic buildings.
This was SVN commit r8038.
2010-08-28 22:15:40 +00:00
WhiteTreePaladin 0a98fbaba2 Cache the Entity States and Templates to increase performance
This was SVN commit r8037.
2010-08-28 21:12:52 +00:00
Mythos_Ruler b0ea2c62be This was SVN commit r8036. 2010-08-28 05:32:36 +00:00
Mythos_Ruler f1c0370e9e This was SVN commit r8035. 2010-08-26 21:57:52 +00:00
Mythos_Ruler 3f5661a90e Adjusted build times for buildings.
This was SVN commit r8034.
2010-08-26 02:51:02 +00:00
Mythos_Ruler f574d32339 #Low-detail 'Gold Rush' map for players who have uncomfortable lag playing other more detailed maps.
This was SVN commit r8033.
2010-08-26 02:21:59 +00:00
Mythos_Ruler e2b55d56a6 Tweaked the tooltips again.
This was SVN commit r8032.
2010-08-26 01:14:14 +00:00
Mythos_Ruler 2c5c4bc292 Re-worded the tooltips a little bit.
This was SVN commit r8031.
2010-08-24 02:34:04 +00:00
Ykkrosh c78dffb19f Fix tests
This was SVN commit r8029.
2010-08-23 17:36:28 +00:00
Ykkrosh 5fbbc27dfd Fix crash when calling JSFastNatives with too few arguments (they don't guarantee to give the number requested in the definition)
This was SVN commit r8028.
2010-08-23 14:30:13 +00:00
Mythos_Ruler b9b5f1461a This was SVN commit r8027. 2010-08-22 19:20:37 +00:00
Ykkrosh ac9340584c Fix building when wxWidgets has TIFF support disabled
This was SVN commit r8026.
2010-08-22 18:06:46 +00:00
Mythos_Ruler 0e2dd1671c This was SVN commit r8025. 2010-08-22 18:03:21 +00:00
Ykkrosh 3abe355b7c Disable implementation of os_cpu_SetThreadAffinityMask on Linux, since it's not necessary and it causes errors.
Should fix #547.

This was SVN commit r8024.
2010-08-22 11:23:50 +00:00
Ykkrosh 28ee4fdb5d Fix template error when creating foundations
This was SVN commit r8023.
2010-08-22 10:09:01 +00:00
Ykkrosh 2cff131a87 Fix #545 (Grab mouse in fullscreen), based on patch from Jayschwa
This was SVN commit r8022.
2010-08-22 10:00:22 +00:00
Ykkrosh dab8365978 Make GUI buttons respond to multiple rapid clicks
This was SVN commit r8021.
2010-08-22 01:00:57 +00:00
Ykkrosh a9b11b780e Fix right clicks passing through GUI objects and triggering unit commands.
Fix cursor displaying unit commands when over a GUI object.

This was SVN commit r8020.
2010-08-21 23:58:08 +00:00
Ykkrosh 674f516f83 Fix #546 (Water continues to flow during pause), based on patch from Jayschwa
This was SVN commit r8019.
2010-08-21 22:50:57 +00:00
Ykkrosh 2529ae2a7b Fix #543 (Replace skybox with black background), based on patch from Jayschwa
This was SVN commit r8018.
2010-08-21 22:43:35 +00:00
Ykkrosh 715a2715c9 Fix #541 (Strange shape of camera view on minimap), based on patch from lubos
This was SVN commit r8017.
2010-08-21 22:06:44 +00:00
Ykkrosh 87cf84fb4c Fix #538 (Atlas has wrong icon in Start menu)
This was SVN commit r8016.
2010-08-21 22:02:07 +00:00
Ykkrosh a41dd1d736 # Add repair command.
Fix #537 (Repair functionality for damaged buildings) based on patch
from evans.
Make some unnecessarily optional template elements required.

This was SVN commit r8015.
2010-08-21 21:53:51 +00:00
Ykkrosh b38e032c7e # Population limits.
Fix #531 (Enforce Population Limit), based on patch from evans.
Empty training queue and refund resources when buildings are destroyed
or captured.
Specify Cost defaults in XML instead of JS, to simplify some code.

This was SVN commit r8014.
2010-08-21 20:43:55 +00:00
Ykkrosh d2f7973c29 Fix system-dependent crash on exiting
This was SVN commit r8013.
2010-08-21 16:26:34 +00:00
Mythos_Ruler 445a300a3a Rebalanced the gather speeds for Advanced and Elite unit levels. Players will need to research econ techs in order to speed up gathering.
This was SVN commit r8012.
2010-08-21 00:55:00 +00:00
Mythos_Ruler 92dfdd64cb #Larger icon sheet for Buildings.
This was SVN commit r8011.
2010-08-20 04:40:09 +00:00
Mythos_Ruler aec91893cd This was SVN commit r8010. 2010-08-20 00:51:28 +00:00
Mythos_Ruler 9a316f21e0 This was SVN commit r8009. 2010-08-20 00:27:38 +00:00
Mythos_Ruler 4bb65aaf45 This was SVN commit r8008. 2010-08-19 23:33:45 +00:00
Ykkrosh fed57d7bee Add primitive .3do (TA/Spring) model conversion tool.
This was SVN commit r8007.
2010-08-19 21:59:08 +00:00
Ykkrosh 9fa5af5fbf Avoid crash when loading texture named "".
Report texture-loading errors.

This was SVN commit r8006.
2010-08-19 21:58:27 +00:00
Ykkrosh 90207a5018 Add barely-tested support for prop points on static meshes (see #243 - needs more testing).
Automatically triangulate meshes.

This was SVN commit r8005.
2010-08-19 21:57:43 +00:00
WhiteTreePaladin aa65eb2008 Fixed empty tooltips from displaying a small, empty square
This was SVN commit r8004.
2010-08-19 14:57:51 +00:00
WhiteTreePaladin dfa155f6b9 Simplified the main selected unit's icon tooltip
This was SVN commit r8003.
2010-08-19 14:09:00 +00:00
Mythos_Ruler 5a745eb1c7 This was SVN commit r8002. 2010-08-19 03:55:45 +00:00
Mythos_Ruler 09a64be42f This was SVN commit r8001. 2010-08-18 02:56:24 +00:00
Mythos_Ruler ad841c3e02 This was SVN commit r8000. 2010-08-18 02:47:38 +00:00
Mythos_Ruler 20b2e744ae This was SVN commit r7999. 2010-08-18 02:22:33 +00:00
Mythos_Ruler be6fe81ad1 This was SVN commit r7998. 2010-08-18 02:19:26 +00:00
Mythos_Ruler 65358cb9fe This was SVN commit r7997. 2010-08-18 02:15:59 +00:00
Mythos_Ruler fe9d2d291e This was SVN commit r7996. 2010-08-18 01:27:03 +00:00
WhiteTreePaladin 5ee7f7b178 Reworked selection details and rank code
Added rank tag to templates to avoid string parsing

This was SVN commit r7995.
2010-08-17 13:37:46 +00:00
Mythos_Ruler e3b6d47b95 This was SVN commit r7994. 2010-08-17 05:43:26 +00:00
Mythos_Ruler 0405ebd7a6 Added a cheeky tooltip to the pyramids.
This was SVN commit r7993.
2010-08-17 02:43:17 +00:00
Mythos_Ruler 7dd4bdb2ed This was SVN commit r7992. 2010-08-17 02:26:37 +00:00
Mythos_Ruler 723653fdbc This was SVN commit r7991. 2010-08-17 02:24:47 +00:00
Mythos_Ruler e44c87543f This was SVN commit r7990. 2010-08-17 01:18:15 +00:00
Mythos_Ruler d9aa52af8e Edited tooltips.
This was SVN commit r7989.
2010-08-17 01:13:29 +00:00
WhiteTreePaladin 7a2fac889f Enabled template tooltips
This was SVN commit r7988.
2010-08-17 00:55:02 +00:00
Mythos_Ruler f64e4c71cf This was SVN commit r7987. 2010-08-17 00:13:18 +00:00
Mythos_Ruler 03cdd1aa9a This was SVN commit r7986. 2010-08-17 00:13:03 +00:00
Mythos_Ruler ae4ce3b097 This was SVN commit r7985. 2010-08-17 00:12:39 +00:00
WhiteTreePaladin ee642bd030 Animal icons by Mario Machado
This was SVN commit r7984.
2010-08-16 15:58:40 +00:00
Ykkrosh 7a8d1f9542 Add files used for https://launchpad.net/~wfg/+archive/0ad
This was SVN commit r7983.
2010-08-16 01:36:22 +00:00
Mythos_Ruler d401e8a401 This was SVN commit r7982. 2010-08-16 01:28:31 +00:00
Mythos_Ruler c7bcca97cf This was SVN commit r7981. 2010-08-16 01:23:17 +00:00
Mythos_Ruler fc68300f58 This was SVN commit r7980. 2010-08-16 00:50:45 +00:00
Mythos_Ruler 2c65a3d5dd #New Egyptian Obelisk eye candy by Brightgalrs.
This was SVN commit r7979.
2010-08-15 23:24:04 +00:00
Mythos_Ruler 1fc3b198ba This was SVN commit r7978. 2010-08-15 23:22:09 +00:00
Mythos_Ruler 0258d6614f This was SVN commit r7977. 2010-08-15 22:15:19 +00:00
Mythos_Ruler 7525aecc17 #Gather food from Apple Trees.
This was SVN commit r7976.
2010-08-15 22:04:19 +00:00
Mythos_Ruler 57584e80ec This was SVN commit r7975. 2010-08-15 21:05:06 +00:00
Mythos_Ruler cd76d5c4b7 Gazelle horns.
This was SVN commit r7974.
2010-08-15 20:27:21 +00:00
Mythos_Ruler 5323ba6299 This was SVN commit r7973. 2010-08-15 19:11:39 +00:00
Mythos_Ruler 85774db1c4 #Egyptian Cliff textures.
This was SVN commit r7972.
2010-08-15 17:14:40 +00:00
Ykkrosh b44636d10f Fix uninstaller to remove link
This was SVN commit r7971.
2010-08-15 16:31:05 +00:00
1637 changed files with 27949 additions and 19257 deletions
+10 -5
View File
@@ -32,10 +32,14 @@ shadows = true
vsync = false
nos3tc = false
noautomipmap = false
noautomipmap = true
novbo = false
noframebufferobject = false
; Linux only: Set the driconf force_s3tc_enable option at startup,
; for compressed texture support
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
@@ -47,7 +51,7 @@ renderpath = default
; Adjusts how OpenGL calculates mipmap level of detail. 0.0f is the default (blurry) value.
; Lower values sharpen/extend, and higher values blur/decrease. Clamped at -3.0 to 3.0.
; -1.0 to -1.5 recommended for good results.
lodbias = -0.5
lodbias = 0
; Profile selection
@@ -62,8 +66,8 @@ font.console = console
font.default = palatino12
font.misc = verdana16
; Colour of the sky (in "r g b" format). (Will be removed once there's proper sky support).
;skycolor = "255 0 0"
; 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
@@ -80,7 +84,7 @@ 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.default 0.0
view.rotate.y.default = 0.0
view.drag.speed = 0.5
view.zoom.speed = 256.0
view.zoom.speed.wheel = 32.0
@@ -113,6 +117,7 @@ hotkey.archive.abort = "Alt+F4" ; Prematurely terminate the archive builder
; > 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.
-4
View File
@@ -1,4 +0,0 @@
@echo off
cd ..\system
set PATH=.
archbuild.exe --bindir=..
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.
@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="quarry temperate">
<mesh>gaia/quarry_a.dae</mesh>
<props>
<prop actor="geology/quarry_temperate_a_base.xml" attachpoint="root"/>
</props>
<texture>gaia/quarry_temperate.dds</texture>
</variant>
</group>
</actor>
@@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant frequency="1" name="quarry base [A]">
<mesh>gaia/quarry_a_base.dae</mesh>
<texture>gaia/decal_quarry_temperate.dds</texture>
</variant>
</group>
</actor>
@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="quarry temperate">
<mesh>gaia/quarry_b.dae</mesh>
<props>
<prop actor="geology/quarry_temperate_b_base.xml" attachpoint="root"/>
</props>
<texture>gaia/quarry_temperate.dds</texture>
</variant>
</group>
</actor>
@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="quarry base [B]">
<mesh>gaia/quarry_b_base.dae</mesh>
<texture>gaia/decal_quarry_temperate.dds</texture>
</variant>
</group>
</actor>
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>temp/pers_tower_test.dae</mesh>
<texture>structural/pers_tower_01.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>
<mesh>test/monitor.dae</mesh>
<texture>temp/256unionmonitor-1.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

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