z64555 17a6896e1d Merge branch 'master' into cleanup/fred ...

Conflicts:
	fred2/fred.cpp
	fred2/fredrender.cpp

2016-08-04 19:18:16 -05:00

..

collidedebrisship.cpp

Merge pull request #195 from Echelon9/fix/sort-uniq-includes

2015-08-19 00:05:02 -04:00

collidedebrisweapon.cpp

Add a new particle effect system

2016-08-04 11:08:39 +02:00

collideshipship.cpp

Move build system to CMake

2016-07-22 12:07:19 +02:00

collideshipweapon.cpp

Add a new particle effect system

2016-08-04 11:08:39 +02:00

collideweaponweapon.cpp

Merge pull request #680 from asarium/cmake_/pr

2016-07-27 15:23:16 +02:00

deadobjectdock.cpp

Simplify duplicative object/ includes.

2015-06-22 20:24:31 +10:00

deadobjectdock.h

Simplify duplicative object/ includes.

2015-06-22 20:24:31 +10:00

objcollide.cpp

Add new memory tracking subsystem

2016-07-29 11:02:45 +02:00

objcollide.h

Fix: object/collideshipweapon.cpp:67:185: warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]

2015-07-06 23:45:38 +10:00

object.cpp

Move build system to CMake

2016-07-22 12:07:19 +02:00

object.h

Add a new particle effect system

2016-08-04 11:08:39 +02:00

objectdock.cpp

Simplify duplicative object/ includes.

2015-06-22 20:24:31 +10:00

objectdock.h

Simplify duplicative object/ includes.

2015-06-22 20:24:31 +10:00

objectshield.cpp

Added a $Max Shield Recharge ship table entry for limiting how full the shields may recharge.

2015-06-04 15:35:41 +03:00

objectshield.h

Merged model point shields from zookeeper branch.

2013-11-25 19:29:36 +10:00

objectsnd.cpp

Renaming vm_vec_dotprod to vm_vec_dot

2015-12-01 20:35:47 +01:00

objectsnd.h

ship_subsys is now a class

2013-11-10 18:28:58 +10:00

objectsort.cpp

Cleanup of fred.h and fred.cpp

2016-08-02 04:21:22 -05:00

parseobjectdock.cpp

Scripted sort and uniq on (internal) project includes. Improves search time and as a by product removed a number of duplicative includes.

2015-06-22 20:24:30 +10:00

parseobjectdock.h

change p_dock_function_info to a class as well

2013-11-17 20:24:42 +10:00

waypoint.cpp

Merge pull request #195 from Echelon9/fix/sort-uniq-includes

2015-08-19 00:05:02 -04:00

waypoint.h

use an index rather than an iterator into the waypoint list so that ai_info is again a plain old data object

2013-09-26 18:51:35 +10:00