Context Navigation

pawns

Timestamp:

Dec 11, 2015, 3:26:20 PM (9 years ago)

Author:

maxima

Message:

Merged campaign and presentation. Everything seems to work fine.

Location:

code/branches/presentationHS15

Files:

Property svn:mergeinfo changed

/code/branches/AI_HS15 (added)	merged: 10640,10651-10652,10654-10655,10670,10673,10678-10679,10681-10682,10709,10717-10719,10722,10725,10729,10731,10737,10759,10761-10764,10780,10782,10789,10793,10796-10800,10803,10805,10826-10827,10832
/code/branches/campaignHS15 (added)	merged: 10639,10642,10645,10649,10663,10666-10667,10674,10676,10680,10683-10684,10689-10690,10695-10696,10699,10703,10705,10710-10711,10730,10735,10740-10741,10743,10748-10750,10754,10758,10766-10767,10779,10783,10792,10802,10804,10808-10809,10812,10823-10824,10834,10838-10841,10843-10844,10847-10851,10854-10856,10858-10859,10861,10863-10864,10866-10875,10877,10879-10883,10885-10888,10890-10892,10896,10898,10903-10904,10906-10907,10909-10910,10912-10915,10921,10923-10925,10927,10932,10934-10935,10946,10950,10953-10958

-                      r10962
+                      r10970
             const std::string& getExplosionSound();
+            virtual const WeaponSystem* getWeaponSystem() const
+                { return this->weaponSystem_; }
         protected:
             virtual void preDestroy();

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