wowgetoffyourcellphone/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
10,944 Commits 3 Branches 28 Tags 13 GiB
fd400f111c
Commit Graph

3694 Commits

Author SHA1 Message Date
gregory
8300113a3a Fixed some artifacts on the Broch wall. 
This was SVN commit r12473.
 2012-08-19 07:36:48 +00:00
gregory
1b9b7dc390 Added normal mapping to the Broch. 
This was SVN commit r12471.
 2012-08-19 04:13:43 +00:00
danschub
7a32e9d868 Small Badland rocks committed. 
This was SVN commit r12470.
 2012-08-19 02:12:46 +00:00
danschub
689a15d784 Committed Temperate_Small_stonemine. 
This was SVN commit r12469.
 2012-08-19 01:47:57 +00:00
Deiz
9216dc3924 Have toggleChat (enter by default) send a chat message if the input isn't empty. 
This was SVN commit r12468.
 2012-08-19 00:28:46 +00:00
Deiz
c32d3ece44 Remove focus when closing the chat window via the escape key. 
This was SVN commit r12467.
 2012-08-18 21:35:52 +00:00
WhiteTreePaladin
0f94813aa9 Export stop.png in GIMP to fix strange crash 
This was SVN commit r12466.
 2012-08-18 21:07:21 +00:00
Deiz
0dfdf868b2 Set ownership to Gaia when units that remain on death are killed. Refs #1600. 
This was SVN commit r12465.
 2012-08-18 20:33:44 +00:00
Deiz
9519635869 0-population units (e.g. sheep) should never have production blocked. 
This was SVN commit r12463.
 2012-08-18 18:44:20 +00:00
Deiz
77f26c454a Have UnitAI respect the LeaveFoundation order unless in combat. Fixes #1406. 
This was SVN commit r12462.
 2012-08-18 08:13:47 +00:00
ShieldBearer
a08d55e603 Added AO, norm and spec maps for all Iberian buildings except the walls and the dock(couldn't find the AO texture from myconid's git trunk) and to a couple of Carthaginian buildings too. 
This was SVN commit r12461.
 2012-08-18 05:40:23 +00:00
Deiz
bbed3ca69a Made player slot reassignment in the game setup screen swap slot contents instead of leaving the old slot empty. 
This was SVN commit r12457.
 2012-08-17 21:22:07 +00:00
Mythos_Ruler
592478eb67 Another height map demo map and image. 
This was SVN commit r12454.
 2012-08-17 18:26:03 +00:00
Enrique
a6230497ba Committed updated theatron and updated gymnasion for athenians 
This was SVN commit r12453.
 2012-08-17 02:17:38 +00:00
danschub
55dc7cc553 This was SVN commit r12452. 2012-08-17 01:28:26 +00:00
danschub
a18dd1a36d Fixed Spec for the Temperate Rock Formation. Added parallax mapping for terrain's decals. Added missing AO for scandiv rock. 
This was SVN commit r12451.
 2012-08-16 23:18:21 +00:00
gregory
791b6fa741 Partially fixed artifacts on the wood pile on the Roman mill. 
This was SVN commit r12447.
 2012-08-16 03:58:27 +00:00
historic_bruno
065a3e093b Fixes incorrect test for command debugging 
This was SVN commit r12446.
 2012-08-16 02:29:08 +00:00
Deiz
de38f9ef9a Prevent domestic animals from being manually deleted (killed). Patch by yakca. Fixes #1525. 
This was SVN commit r12445.
 2012-08-16 02:08:56 +00:00
Deiz
78e9fecf92 Added support for ungarrisoning units by template name and for ungarrisoning from multiple entities at once. Fixes #910. 
This was SVN commit r12443.
 2012-08-16 01:15:04 +00:00
danschub
b03df364ea Fixed VHQ Parallax for the new rocks. 
This was SVN commit r12442.
 2012-08-16 00:46:43 +00:00
danschub
b54a7486da Added Parallax VHQ for the new rocks 
This was SVN commit r12441.
 2012-08-16 00:31:42 +00:00
quantumstate
3653fe5d3a Added support for putting technologies in folders. Fixes #1462. 
This was SVN commit r12440.
 2012-08-15 22:25:25 +00:00
Kimball
765d02716a Updated Mauryan isw textures. 
This was SVN commit r12439.
 2012-08-15 18:22:28 +00:00
ShieldBearer
ee83c07184 This was SVN commit r12437. 2012-08-15 13:14:37 +00:00
wraitii
8256f691f4 Optimizations, and made qBot-xp destroy walls when Iberians (but not towers). 
This was SVN commit r12436.
 2012-08-15 09:06:45 +00:00
Kimball
3e29520326 Mauryan Swordsman body textures 
This was SVN commit r12435.
 2012-08-15 06:44:58 +00:00
gregory
56c15ae427 Updated Roman normal maps. 
This was SVN commit r12434.
 2012-08-15 03:22:01 +00:00
Deiz
851786b01a Band-aid fix for corpses responding to the stop order. 
This was SVN commit r12433.
 2012-08-15 02:51:48 +00:00
Deiz
aa86664d8f Make sure to initialize the entity collection's cached length before modifying the actual object. Fixes #1535. 
This was SVN commit r12432.
 2012-08-15 01:31:53 +00:00
historic_bruno
af62b5ad8a Adds <Distanceless> flag to a bunch of voice sound groups 
This was SVN commit r12430.
 2012-08-15 01:04:54 +00:00
gregory
e3b8d9c38c Deleted AO textures that didn't get deleted by Gen.Kenobi. 
This was SVN commit r12429.
 2012-08-15 00:49:17 +00:00
historic_bruno
011ba8255e New sound system implementation by stwf, refs #1223, #961. 
Enables audio on OS X, refs #685, #931.
Fixes music not playing after a game, refs #946.

This was SVN commit r12428.
 2012-08-15 00:10:44 +00:00
danschub
2c260660e6 Created AO folder for 
This was SVN commit r12427.
 2012-08-15 00:02:58 +00:00
gregory
a6945413c3 Added AO to rome_temple and rome_temple_mars. 
This was SVN commit r12426.
 2012-08-14 21:11:06 +00:00
Mythos_Ruler
ba253d34d4 Normals and Specs for Persian city tile terrain. 
This was SVN commit r12425.
 2012-08-14 18:01:40 +00:00
Mythos_Ruler
927592aca9 This was SVN commit r12424. 2012-08-14 17:47:13 +00:00
Deiz
0c56dfe272 Forgot to add the new short, medium wall templates. 
This was SVN commit r12423.
 2012-08-14 17:10:55 +00:00
Deiz
e83bebe02e Remove entities from selection groups when they become hidden. Fixes #1373. 
This was SVN commit r12422.
 2012-08-14 14:02:52 +00:00
Deiz
d90e53d0a5 Show cost ranges in the wall construction tooltip, if possible. 
This was SVN commit r12421.
 2012-08-14 07:51:50 +00:00
Deiz
981db4c005 Stone wall segments now have costs dependent on length. Rebalanced gate/tower costs per IRC discussion. 
This was SVN commit r12420.
 2012-08-14 07:46:47 +00:00
gregory
6031b0785f Organized materials XML a bit. 
This was SVN commit r12418.
 2012-08-14 02:31:11 +00:00
danschub
2d505a5015 Added new Pointy_StoneMines_Badlands by Gen.Kenobi. It has AO, normal and SpecMaps. Need to fix AO and Spec and add new shaders to desert_decals. 
This was SVN commit r12417.
 2012-08-14 02:22:37 +00:00
gregory
5366dd8388 Added VHQ (very high-quality) parallax to materials that were missing it. 
This was SVN commit r12416.
 2012-08-14 02:04:59 +00:00
historic_bruno
4138a78c7f Fixes infinite recursion error in UnitAI when hunting an animal with a unit that's standing ground 
This was SVN commit r12415.
 2012-08-14 00:44:36 +00:00
gregory
a71d77b03e Fixed material levels of quality more. 
Added AO to dock prop.

This was SVN commit r12414.
 2012-08-13 21:39:45 +00:00
historic_bruno
7d86fc4c31 Gate conversion now maintains wall HP percentage instead of magically restoring to full health 
This was SVN commit r12413.
 2012-08-13 21:37:40 +00:00
gregory
93a3f77aaa Fixed basic_trans levels of quality. 
This was SVN commit r12412.
 2012-08-13 20:17:29 +00:00
gregory
02f2c082cb This was SVN commit r12409. 2012-08-13 18:00:15 +00:00
gregory
d6792c4e1b This was SVN commit r12408. 2012-08-13 17:54:39 +00:00
gregory
f000fc6bbd This was SVN commit r12407. 2012-08-13 17:50:54 +00:00
gregory
b42708a3f1 This was SVN commit r12406. 2012-08-13 17:45:48 +00:00
gregory
1129c2be0e This was SVN commit r12405. 2012-08-13 17:41:48 +00:00
wraitii
902fc4a541 Show a red overlay over training/construction... icons that cannot be afforded. 
This was SVN commit r12404.
 2012-08-13 16:47:10 +00:00
OmriLahav
9e35243976 This was SVN commit r12402. 2012-08-13 14:25:37 +00:00
wraitii
9e9e1e3b78 Optimize enemy watchers usage. This should avoid massive lag later in the game. 
This was SVN commit r12401.
 2012-08-13 08:06:20 +00:00
gregory
1f17407161 This was SVN commit r12400. 2012-08-13 05:11:12 +00:00
gregory
dac4ae2716 More AO! ...and an updating rome_struct_2_norm.png. 
This was SVN commit r12399.
 2012-08-13 03:09:20 +00:00
Deiz
8c97458de7 Prevent healers from healing themselves. 
This was SVN commit r12398.
 2012-08-13 02:56:51 +00:00
gregory
61cf6a6040 This was SVN commit r12397. 2012-08-13 00:03:18 +00:00
Deiz
cbddd53e47 Avoid an edge case when buildings are destroyed while researching, leaving techs stuck. Refs #1521. 
This was SVN commit r12396.
 2012-08-12 23:40:04 +00:00
quantumstate
b1090d1a12 Use a linear interpolation to find the point where the parallax ray intersects the surface more accurately. 
This was SVN commit r12394.
 2012-08-12 14:50:56 +00:00
fcxSanya
3b704b12a9 Summary screen: separate barter info for each resource 
This was SVN commit r12393.
 2012-08-12 09:12:06 +00:00
Deiz
3acc855a2d Renamed /restrictteam to /team, added /enemy, /msg, /all. Fixes #1583. 
This was SVN commit r12392.
 2012-08-12 06:48:49 +00:00
gregory
6f9a44d220 Removed shaders from Roman wall gate so it won't give errors. 
This was SVN commit r12391.
 2012-08-12 05:36:59 +00:00
gregory
a6909b677a Deleted unused material file. 
This was SVN commit r12390.
 2012-08-12 05:29:41 +00:00
gregory
2534b26b16 Added AO to Roman market. 
This was SVN commit r12389.
 2012-08-12 05:00:59 +00:00
gregory
40886d1b24 This was SVN commit r12388. 2012-08-12 04:51:50 +00:00
gregory
d9531b78f9 This was SVN commit r12387. 2012-08-12 04:49:00 +00:00
gregory
740322c88d Renamed the Roman structure texture normal map. 
This was SVN commit r12386.
 2012-08-12 04:42:59 +00:00
gregory
a02d32a7d1 More AO. 
This was SVN commit r12385.
 2012-08-12 03:49:27 +00:00
danschub
913770347b Resized decals for the new Stonemine 
This was SVN commit r12384.
 2012-08-12 03:04:46 +00:00
danschub
90521c49ff Extended Rock_Scandiv. 
This was SVN commit r12383.
 2012-08-12 02:56:17 +00:00
Mythos_Ruler
6f80824c48 This was SVN commit r12382. 2012-08-12 02:55:50 +00:00
Mythos_Ruler
ab19bc233a Height Map import demo. 
This was SVN commit r12381.
 2012-08-12 02:55:28 +00:00
danschub
b89d23d325 Added Smoothed stone mine :) 
This was SVN commit r12380.
 2012-08-12 02:33:40 +00:00
Mythos_Ruler
e735df4a7f New geo entity. 
This was SVN commit r12378.
 2012-08-12 02:16:50 +00:00
danschub
e4eb394ca8 Fixed GreekFortress. 
This was SVN commit r12377.
 2012-08-12 02:13:22 +00:00
danschub
c4c215d5e1 Added a new StoneMine for Temperate terrains and new terrain decals. 
This was SVN commit r12376.
 2012-08-12 01:56:53 +00:00
Mythos_Ruler
49b734336a Some "tips" text fixes. 
Spec maps for more helmets.

This was SVN commit r12375.
 2012-08-12 01:54:23 +00:00
gregory
ed806b6a9a Added messed up normal maps for the Roman camp so a graphics programmer can look at them. 
This was SVN commit r12374.
 2012-08-12 01:17:32 +00:00
Mythos_Ruler
e403c748f2 More cliff terrain spec and normal mapping. 
More metal mine spec mapping.

This was SVN commit r12373.
 2012-08-12 00:11:46 +00:00
danschub
277b637578 Updated Greek_Fortrees_Up entities and added foundation to the model. 
This was SVN commit r12372.
 2012-08-12 00:08:49 +00:00
Deiz
2eed26df09 Implemented two chat commands, /restrictteam and /me. Refs #1583. 
This was SVN commit r12371.
 2012-08-11 23:59:28 +00:00
gregory
b1657b63b3 This was SVN commit r12370. 2012-08-11 21:10:36 +00:00
Mythos_Ruler
dedd0ca792 Some spec and normal tests for terrain. 
This was SVN commit r12369.
 2012-08-11 19:29:28 +00:00
Mythos_Ruler
dde8f5f57b This was SVN commit r12368. 2012-08-11 17:10:27 +00:00
gregory
7adecfebb3 Updated AO again. 
This was SVN commit r12367.
 2012-08-11 17:08:00 +00:00
gregory
483707f3c8 Darkened AO on three Roman buildings. 
This was SVN commit r12366.
 2012-08-11 16:57:48 +00:00
fcxSanya
7a7d7e5d0a Add trade/barter stats to the summary screen. 
This was SVN commit r12365.
 2012-08-11 16:38:01 +00:00
Mythos_Ruler
9bbfc3f808 Spec map for Savanna metal mine. 
Adjusted spec/ao/norm for Scandinavian rock.

This was SVN commit r12364.
 2012-08-11 16:35:46 +00:00
Mythos_Ruler
06d22af3dc Making all cliffs triplanar. 
Adding spec maps to helmets.

Adjusted the rome_struct_2 spec map a little.

This was SVN commit r12362.
 2012-08-11 16:11:23 +00:00
myconid
9c56092999 Added very high quality parallax; GPU-intensive, defaults to off; enabled through config 
This was SVN commit r12361.
 2012-08-11 15:25:00 +00:00
quantumstate
4890789d58 Added support for team chat in multiplayer. Team chat is default if you are on a team of size >1. Using the prefix g will make the message global. Fixes #1583. 
This was SVN commit r12360.
 2012-08-11 15:12:48 +00:00
wraitii
96534fc5ed Fix a problem with civilizations who didn't have advanced building defined. 
This was SVN commit r12359.
 2012-08-11 12:41:29 +00:00
wraitii
226738d447 Last batch of fix for qBot-xp for the day if all goes well. 
This was SVN commit r12358.
 2012-08-11 10:36:39 +00:00
wraitii
508994e4c8 Fix a typo. 
This was SVN commit r12357.
 2012-08-11 07:59:05 +00:00
wraitii
dc916e7295 Fix bugs related to garrisoning, should fix the pathfinder sometimes choosing a path over water when unneeded. 
This was SVN commit r12356.
 2012-08-11 07:41:23 +00:00
gregory
c5658edfca Improved AO on the Roman farmstead and fortress, and added it to the barracks. 
This was SVN commit r12355.
 2012-08-11 07:20:36 +00:00
gregory
c573f4905c Fixed warning on farmstead model. 
This was SVN commit r12354.
 2012-08-11 06:32:38 +00:00
gregory
9d54763401 Added improved normal mapping, parallax mapping, specular mapping, and AO on the Roman buildings. 
Created folder for AO textures.

This was SVN commit r12353.
 2012-08-11 06:10:29 +00:00
danschub
b926a5ee54 Added Spec and Normal Maps for the Roman Structures by Gen.Kenobi. (rome_struc_2 texture files) - What applies to the Barracks, Corral, Dock, Farmstead, Fortress, Houses, Mill, ScoutTower and Walls. Feature Warning: Alphas not working properly + Gate fails to render material. 
This was SVN commit r12352.
 2012-08-11 02:21:04 +00:00
quantumstate
8cb340ade0 Make roof tile shadowing consistent by flipping UV's 
This was SVN commit r12351.
 2012-08-10 23:58:59 +00:00
myconid
eee04db56b Bugfix- changed GLSL particle shader to use modelview matrix instead of modelviewprojection 
This was SVN commit r12350.
 2012-08-10 21:40:50 +00:00
myconid
d45379cc62 Bugfix- changed GLSL particle shader to look the same as ARB 
This was SVN commit r12349.
 2012-08-10 21:02:22 +00:00
quantumstate
9dc838bed5 Add support for cropped images in the GUI code and update game setup to use cropped map previews. Refs #1343. 
This was SVN commit r12348.
 2012-08-10 19:59:20 +00:00
quantumstate
5d2c0b466f Resize all map previews to be 512x512 by adding a black area of padding. 
This was SVN commit r12347.
 2012-08-10 19:56:58 +00:00
Mythos_Ruler
0f4acf7167 Bigger foundation for Brit fortress. 
This was SVN commit r12346.
 2012-08-10 18:18:14 +00:00
Mythos_Ruler
d7140c4edf Helmet specular stuff. 
This was SVN commit r12345.
 2012-08-10 18:18:04 +00:00
myconid
eb422bc4b3 Bugfix- changed GLSL particle shader to look the same as ARB 
This was SVN commit r12344.
 2012-08-10 18:14:42 +00:00
wraitii
07ea313ad6 Major update for qBot-xp, with slight changes to unitAI (that broke qBot, and fix for that). 
This was SVN commit r12343.
 2012-08-10 16:33:58 +00:00
Deiz
2b503e68f7 Fixed broken chat; improved cheat message handling. 
This was SVN commit r12342.
 2012-08-10 03:35:20 +00:00
OmriLahav
8009c88a81 This was SVN commit r12340. 2012-08-09 21:42:32 +00:00
Pureon
8b365ca96d New Celtic Broch fortress 
This was SVN commit r12339.
 2012-08-09 21:13:21 +00:00
Deiz
613f845095 Improve gate closing behaviour when locked or with no allies nearby. Fixes #1551. 
This was SVN commit r12337.
 2012-08-09 19:06:01 +00:00
myconid
a89d131f2d Added specular mapping for units 
This was SVN commit r12336.
 2012-08-09 18:49:35 +00:00
Mythos_Ruler
8d59192410 A couple more materials. 
Testing spec mapping with Iberian bull statue and Craterus unit.

This was SVN commit r12335.
 2012-08-09 18:30:05 +00:00
wraitii
ef55e60d9b Prevent chickens from spawning in the obstruction area of the civil centre. 
This was SVN commit r12333.
 2012-08-09 15:24:11 +00:00
Deiz
c5ce1b23ae Remove a bit of indirection in UnitAI. 
This was SVN commit r12331.
 2012-08-09 02:32:56 +00:00
danschub
388544abdb Committed AO Scandiv_formation textures & material. 
This was SVN commit r12330.
 2012-08-09 00:55:40 +00:00
gregory
66d026a498 This was SVN commit r12329. 2012-08-09 00:14:58 +00:00
Deiz
87b2346154 Condensed the sanity checks for the Gaia range query, per leper's suggestion. 
This was SVN commit r12328.
 2012-08-08 23:29:30 +00:00
Deiz
14df6cf1a2 Removed triple and trailing newlines from random map descriptions. 
This was SVN commit r12327.
 2012-08-08 23:11:09 +00:00
Deiz
f210008b07 Put a warning about the AI into the description of naval maps. 
This was SVN commit r12326.
 2012-08-08 23:10:21 +00:00
myconid
e046fc0a01 Bugfix- changed some decal materials and fixed decal blending mode 
This was SVN commit r12325.
 2012-08-08 19:08:56 +00:00
gregory
6afe17dbf1 This was SVN commit r12324. 2012-08-08 18:50:20 +00:00
Mythos_Ruler
dcbe7d2e96 This was SVN commit r12323. 2012-08-08 18:30:20 +00:00
Mythos_Ruler
d5f93396b6 Deccan Plateau map. 
This was SVN commit r12322.
 2012-08-08 18:27:47 +00:00
Mythos_Ruler
af9da8e01e Fixed decals on Celt Tavern and Mill. 
This was SVN commit r12321.
 2012-08-08 18:16:50 +00:00
Mythos_Ruler
fb012f14b9 Fixed some corral decals. 
This was SVN commit r12320.
 2012-08-08 17:40:25 +00:00
Deiz
eadd24b64b Added a 'Stop' button to the GUI for immediately halting units. 
This was SVN commit r12318.
 2012-08-08 05:36:42 +00:00
Deiz
1120701351 Substantially rework how Gaia is handled by UnitAI, BuildingAI. Dangerous animals and combat units will be attacked like regular enemies. 
This was SVN commit r12317.
 2012-08-08 05:32:53 +00:00
Deiz
84305155de Seamlessly change a player's entities to be Gaia-owned when resigning. 
This was SVN commit r12316.
 2012-08-08 05:27:59 +00:00
danschub
28333ba92e Committed fixed Normal Maps and materials for the Rock ScandivFormation. Now the bump is much more noticeable, yet realistic. 
This was SVN commit r12314.
 2012-08-08 00:26:08 +00:00
OmriLahav
7666bfcbda This was SVN commit r12312. 2012-08-07 21:32:45 +00:00
OmriLahav
18930375e6 This was SVN commit r12310. 2012-08-07 21:16:25 +00:00
myconid
88ab3f0f5b Terrain/decal materials (includes triplanar/normal/specular/emissive mapping); custom alphamaps 
This was SVN commit r12306.
 2012-08-07 18:21:16 +00:00
Deiz
780970d16a Avoid a rare error when a group has both renamed and deleted entities. 
This was SVN commit r12305.
 2012-08-07 00:41:57 +00:00
myconid
648e68e49c smooth LOS 
This was SVN commit r12304.
 2012-08-06 22:38:42 +00:00
danschub
4b119b9bd1 *Small Greek Fortress Fixes 
*Added Scandinav-Rock formation by Gen.Kenobi (with spec&normal included
as a test)

This was SVN commit r12303.
 2012-08-06 22:34:37 +00:00
Pureon
77346e6914 Adding some missing random map previews 
This was SVN commit r12302.
 2012-08-06 22:08:07 +00:00
myconid
da8c673a0a ao/parallax/normal/specular/emissive mapping; windy trees; time manager; render queries; conditional defines 
This was SVN commit r12300.
 2012-08-06 19:10:47 +00:00
historic_bruno
8fc1fd2478 Fixes default map names, closes #1578 
This was SVN commit r12299.
 2012-08-06 18:09:22 +00:00
danschub
00aa354f8f Updated Greek Fortress by Gen.Kenobi. Finally fixed it. Enjoy! 
This was SVN commit r12297.
 2012-08-06 15:51:16 +00:00
wraitii
0f44c5b3fe Fix some mistakes with class definition for stone/palisade gates and wallsets. 
This was SVN commit r12296.
 2012-08-06 11:43:02 +00:00
danschub
bfdd23997d Added new Rock-set-desert by Gen.Kenobi 
They might need re-scaling.

This was SVN commit r12295.
 2012-08-06 03:07:58 +00:00
Mythos_Ruler
11eb862bdb Map preview for Acropolis 7. 
Made the status bar for trees a little easier to see.

This was SVN commit r12294.
 2012-08-05 19:07:41 +00:00
Deiz
78cc29b591 Added a resign option (deletes all of a player's entities). 
This was SVN commit r12293.
 2012-08-05 18:07:56 +00:00
Deiz
0037bb8230 Slightly ugly fix for 'You has been defeated.' message in singleplayer. 
This was SVN commit r12292.
 2012-08-05 18:05:25 +00:00
Enrique
0a2449bf5f Added small_scaffold actor 
This was SVN commit r12291.
 2012-08-05 16:31:36 +00:00