Planet

navi

home

PPS

about

screenshots

download

development

forum

Context Navigation

← Previous Change
Next Change →

Changeset 12411 for code/branches/Presentation_FS19/src/modules/weapons

Timestamp:

May 22, 2019, 2:59:08 PM (6 years ago)

Author:

wiesep

Message:

Merged OrxoBlox_FS19

Location:

code/branches/Presentation_FS19

Files:

: 4 edited
: 6 copied

. (modified) (1 prop)
src/modules/weapons/munitions/BallMunition.cc (copied) (copied from code/branches/OrxoBlox_FS19/src/modules/weapons/munitions/BallMunition.cc)
src/modules/weapons/munitions/BallMunition.h (copied) (copied from code/branches/OrxoBlox_FS19/src/modules/weapons/munitions/BallMunition.h)
src/modules/weapons/munitions/CMakeLists.txt (modified) (1 diff)
src/modules/weapons/projectiles/BallProjectile.cc (copied) (copied from code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc)
src/modules/weapons/projectiles/BallProjectile.h (copied) (copied from code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.h)
src/modules/weapons/projectiles/BasicProjectile.cc (modified) (2 diffs)
src/modules/weapons/projectiles/BasicProjectile.h (modified) (1 diff)
src/modules/weapons/weaponmodes/BallGun.cc (copied) (copied from code/branches/OrxoBlox_FS19/src/modules/weapons/weaponmodes/BallGun.cc)
src/modules/weapons/weaponmodes/BallGun.h (copied) (copied from code/branches/OrxoBlox_FS19/src/modules/weapons/weaponmodes/BallGun.h)

Legend:

: Unmodified
: Added
: Removed

code/branches/Presentation_FS19

Property svn:mergeinfo changed

/code/branches/OrxoBlox_FS19 (added)

merged: 12208,12210,12212,12214-12215,12248-12251,12254,12256-12257,12260,12264-12266,12268-12270,12277-12278,12280-12283,12288,12291,12294-12295,12298,12305,12307-12308,12310,12314-12315,12328-12329,12331-12332,12335-12337,12339-12347,12349-12351,12355-12356,12359-12361,12364,12366-12373,12376,12378-12379,12382,12384,12387-12388,12391-12396,12400-12402

code/branches/Presentation_FS19/src/modules/weapons/munitions/CMakeLists.txt

r11108	r12411
9	9	SplitMunition.cc
10	10	MineMunition.cc
	11	BallMunition.cc
11	12	)

code/branches/Presentation_FS19/src/modules/weapons/projectiles/BasicProjectile.cc

r11108	r12411
172	172	void BasicProjectile::destroyCheck(void)
173	173	{
174		if(GameMode::isMaster() && this->bDestroy_)
	174	if(GameMode::isMaster() && this->bDestroy_) {
175	175	this->destroy();
	176	}
176	177	}
177	178
…	…
182	183	void BasicProjectile::destroyObject(void)
183	184	{
184		if(GameMode::isMaster())
	185	if(GameMode::isMaster()) {
185	186	this->destroy();
	187	}
186	188	}
187	189	}

code/branches/Presentation_FS19/src/modules/weapons/projectiles/BasicProjectile.h

r11108	r12411
117	117
118	118	protected:
119		bool processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape* cs);
	119	virtual bool processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape* cs);
120	120	void destroyCheck(void);
121	121	inline void setDestroyAfterCollision(bool destroyAfterCollision)

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

Download in other formats: