Context Navigation

HUDRadar.cc

Timestamp:

Dec 25, 2009, 1:18:03 PM (16 years ago)

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

Property svn:mergeinfo changed

/code/branches/console (added)	merged: 5941,5945,5968-5975,5983,5985-5986,5991-5992,5994-5996,5998,6000,6004-6007,6010-6017,6034,6037,6041,6043-6044,6089,6103-6104
/code/branches/core5	merged: 6009
/code/branches/ingamemenu (added)	merged: 6003,6018-6020,6022-6023
/code/branches/menu (added)	merged: 5941,5944,5952,6024,6032,6036,6047-6049,6051,6145-6146,6148
/code/branches/particles2 (added)	merged: 6050,6059,6065-6068,6076,6078-6082,6086-6087,6098-6099,6101,6109
/code/branches/presentation2 (added)	merged: 6106-6108,6110-6124,6127-6141,6143-6144,6147,6149-6162,6164-6197,6199,6201-6210,6212-6219,6222-6224,6226-6228,6230-6239,6241,6243-6245,6247-6248,6250-6252,6254-6262,6265-6266,6268-6273,6276-6287,6289-6293,6295,6298-6303,6305-6307,6310-6316,6318-6329,6332,6334-6336,6338-6389,6391-6404,6406-6411
/code/branches/sound3 (added)	merged: 5941,5943,5946,5954,5956-5957,5962,5982,6031,6046,6069-6072,6074,6088,6093,6097,6100,6102
/code/branches/steering (added)	merged: 5979,5981,5984,5993,6001,6033,6045,6052,6055,6058,6091
/code/trunk	merged: 5951,5958,5960-5961,5963-5967,5976,5978,5980,5988-5989,6021,6026,6028,6035,6054,6056-6057,6061,6064,6073,6075,6083-6085,6105

r5781	r6412
126	126	panel = *itRadarDots_;
127	127	++itRadarDots_;
128		~~std::string~~ materialName = TextureGenerator::getMaterialName(
	128	const std::string& materialName = TextureGenerator::getMaterialName(
129	129	shapeMaterials_[object->getRadarObjectShape()], object->getRadarObjectColour());
130	130	if (materialName != panel->getMaterialName())

Note: See TracChangeset for help on using the changeset viewer.