Context Navigation

← Previous Change
Next Change →

collisionshapes

Timestamp:

Aug 11, 2010, 8:55:13 AM (14 years ago)

Author:

dafrick

Message:

Merged presentation3 branch into trunk.

Location:

code/trunk

Files:

: 5 edited

. (modified) (1 prop)
src/modules/objects/collisionshapes/BoxCollisionShape.h (modified) (2 diffs)
src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) (2 diffs)
src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified) (2 diffs)
src/modules/objects/collisionshapes/SphereCollisionShape.h (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

code/trunk

Property svn:mergeinfo changed

/code/branches/ai (added)	merged: 6592,6601,6640,6683,6695-6696,6782,6795,6832-6833,6847,6850,6854,6888,6891,6918-6919,6958,6978,6986,6991,6997,7029,7033
/code/branches/chat (added)	merged: 6527,6565,6577,6596-6597,6605,6633-6637,6644,6649,6652,6682,6688,6690,6693,6698-6699,6776-6777,6788,6791,6793,6797
/code/branches/chat2 (added)	merged: 6836-6837,6846,6870,6876,6879,6885,6890,6910
/code/branches/dynamicmatch (added)	merged: 6584,6586,6603,6686,6692,6697,6812,6848,6921,6954-6955,6959,6987
/code/branches/fps (added)	merged: 6591,6639,6819-6826,6866-6867,6872,6882-6883,6908,7052-7053,7055,7057,7059,7070
/code/branches/hudelements (added)	merged: 6599-6600,6602,6606,6614-6615,6631,6715-6717,6727,6796,6849,6865,6868,6873-6875,6880,6886,6897-6899,6907,6913-6914,6917,6922-6924,6941
/code/branches/lod (added)	merged: 6691,6724,6786-6787,6794,6828-6829,6838-6839,6843,6852,6877,6881,6909,6911
/code/branches/network2 (added)	merged: 6448-6450,6455-6458,6462,6464-6465
/code/branches/ppspickups3 (added)	merged: 6869,6884,6887,6892-6896,6980,6985
/code/branches/ppspickups4 (added)	merged: 7067-7068
/code/branches/presentation3 (added)	merged: 6920,6926-6928,6932-6935,6937-6940,6942,6944-6947,6951,6953,6957,6960-6961,6964-6965,6971,6977,6981-6982,6984,6990,6994,6996,6998-7000,7003-7010,7012-7025,7027-7028,7030-7032,7034-7051,7054,7056,7058,7060-7066,7069,7072-7073,7075-7099,7101-7113,7118-7123,7125-7143,7147-7162
/code/branches/rocket (added)	merged: 6778-6781,6783-6785,6803,6809-6811,6813-6818,6827,6834,6863,6878,6900,6902-6905,6943,6948-6950
/code/branches/rocket2 (added)	merged: 6956,6966,6969-6970
/code/branches/skybox2 (added)	merged: 6559,6616,6619,6673,6771-6772,6804,6806,6858,6861,6936,6972-6974,6988-6989

code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.h

-                      r5781
+                      r7163
             virtual ~BoxCollisionShape();
-            void registerVariables();
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 …
         private:
+            void registerVariables();
             btCollisionShape* createNewShape() const;

code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h

-                      r5781
+                      r7163
             virtual ~ConeCollisionShape();
-            void registerVariables();
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 …
         private:
+            void registerVariables();
             btCollisionShape* createNewShape() const;

code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.h

-                      r5781
+                      r7163
             virtual ~PlaneCollisionShape();
-            void registerVariables();
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 …
         private:
+            void registerVariables();
             btCollisionShape* createNewShape()const;

code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.h

-                      r5781
+                      r7163
             virtual ~SphereCollisionShape();
-            void registerVariables();
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 …
         private:
+            void registerVariables();
             btCollisionShape* createNewShape() const;

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

Context Navigation

Changeset 7163 for code/trunk/src/modules/objects/collisionshapes

Legend:

code/trunk

code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.h

code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h

code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.h

code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.h

Download in other formats: