Merge remote-tracking branch 'bucky/master'

CMakeLists.txt

@@ -33,7 +33,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 
 # Customizable options
-option(BuildPortableVersion "Build portable version (does not read or write files from your user/home directory" ON)
+option(BuildPortableVersion "Build portable version (does not read or write files from your user/home directory" OFF)
 
 option(BuildMPEngine "Whether to create projects for the MP client (eternaljk.exe)" ON)
 option(BuildMPRdVanilla "Whether to create projects for the MP default renderer (rd-eternaljk_x86.dll)" ON)
@@ -192,10 +192,8 @@ if(MSVC)
 	set(SharedDefines ${SharedDefines} "_CRT_NONSTDC_NO_DEPRECATE")
 
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:SSE2")
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
 
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
 
 	# Configure MSVC Runtime
 	include(MSVCRuntime)

assets/japro/models/players/jan/model_default.skin

@@ -0,0 +1,53 @@
+hipsa,models/players/jan/legs.tga
+hipsa_belt,models/players/jan/accesories.tga
+hipsa_chaps,models/players/jan/vest.tga
+r_lega,models/players/jan/legs.tga
+r_lega_cap_hips_off,models/players/stormtrooper/caps.tga
+l_lega,models/players/jan/legs.tga
+l_lega_cap_hips_off,models/players/stormtrooper/caps.tga
+hipsa_augment,models/players/jan/legs.tga
+hipsa_cap_r_leg_off,models/players/stormtrooper/caps.tga
+hipsa_torso,models/players/jan/torso.tga
+hipsa_cap_l_leg_off,models/players/stormtrooper/caps.tga
+torso,models/players/jan/legs.tga
+torsoa,*off
+torsoa_augment,*off
+r_arma,models/players/jan/torso.tga
+r_arma_cap_r_hand_off,models/players/stormtrooper/caps.tga
+r_arma_cap_torso_off,models/players/stormtrooper/caps.tga
+r_handa,models/players/jan/accesories.tga
+r_handa_cap_r_arm_off,models/players/stormtrooper/caps.tga
+l_arma,models/players/jan/torso.tga
+l_arma_cap_l_hand_off,models/players/stormtrooper/caps.tga
+l_arma_cap_torso_off,models/players/stormtrooper/caps.tga
+l_handa,models/players/jan/l_hand.tga
+l_handa_cap_l_arm_off,models/players/stormtrooper/caps.tga
+l_handa_watch,models/players/jan/accesories.tga
+torsoa_comp,models/players/jan/accesories.tga
+torsoa_cap_l_arm_off,models/players/stormtrooper/caps.tga
+torsoa_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_cap_head_off,models/players/stormtrooper/caps.tga
+torsob,models/players/jan/torso.tga
+l_armb,models/players/jan/torso.tga
+l_armb_cap_l_hand_off,models/players/stormtrooper/caps.tga
+l_armb_cap_torso_off,models/players/stormtrooper/caps.tga
+l_handb,models/players/jan/l_hand.tga
+l_handb_cap_l_arm_off,models/players/stormtrooper/caps.tga
+l_handb_watch,models/players/jan/accesories.tga
+r_armb,models/players/jan/torso.tga
+r_armb_cap_r_hand_off,models/players/stormtrooper/caps.tga
+r_armb_cap_torso_off,models/players/stormtrooper/caps.tga
+r_handb,models/players/jan/accesories.tga
+r_handb_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torsob_comp,*off
+torsob_vest,models/players/jan/vest.tga
+torsob_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torsob_cap_l_arm_off,models/players/stormtrooper/caps.tga
+head,models/players/jan/torso.tga
+heada,models/players/jan/head.tga
+heada_face,models/players/jan/face.tga
+heada_goggles,models/players/jan/accesories.tga
+heada_eyes_mouth,models/players/kyle/mouth_eyes.tga
+head_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_cap_torso_off,models/players/stormtrooper/caps.tga

assets/japro/models/players/reborn/model_acrobat.skin

@@ -0,0 +1,35 @@
+hips,models/players/reborn/acro_legs.tga
+hips_torso,models/players/reborn/acro_torso.tga
+torso,models/players/reborn/acro_torso.tga
+torso_l_shoulder,models/players/reborn/acro_torso.tga
+torso_r_shoulder,models/players/reborn/acro_torso.tga
+r_arm,models/players/reborn/acro_torso.tga
+r_hand,models/players/reborn/acro_hand.tga
+r_hand_wrist,models/players/reborn/acro_torso.tga
+r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga
+r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga
+r_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+l_arm,models/players/reborn/acro_torso.tga
+l_hand,models/players/reborn/acro_hand.tga
+l_hand_wrist,models/players/reborn/acro_torso.tga
+l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga
+l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga
+l_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+torso_cap_head_off,models/players/stormtrooper/caps.tga
+torso_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_cap_l_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_r_arm_off,models/players/stormtrooper/caps.tga
+head,models/players/reborn/acro_hood.tga
+head_face,models/players/reborn/acro_face.tga
+head_eyes_mouth,models/players/reborn/mouth_eyes.tga
+head_cap_torso_off,models/players/stormtrooper/caps.tga
+head_eyes_mouth_off,models/players/kyle/mouth_eyes.tga
+torso_cowelbase,models/players/reborn/acro_hood.tga
+hips_cap_l_leg_off,models/players/stormtrooper/caps.tga
+hips_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_cap_r_leg_off,models/players/stormtrooper/caps.tga
+l_leg,models/players/reborn/acro_boots_hips.tga
+l_leg_cap_hips_off,models/players/stormtrooper/caps.tga
+r_leg,models/players/reborn/acro_boots_hips.tga
+r_leg_cap_hips_off,models/players/stormtrooper/caps.tga
+hips_flaps,models/players/reborn/acro_flap.tga

assets/japro/models/players/reborn/model_fencer.skin

@@ -0,0 +1,35 @@
+hips,models/players/reborn/fenc_legs.tga
+hips_torso,models/players/reborn/fenc_torso.tga
+torso,models/players/reborn/fenc_torso.tga
+torso_l_shoulder,models/players/reborn/fenc_torso.tga
+torso_r_shoulder,models/players/reborn/fenc_torso.tga
+r_arm,models/players/reborn/fenc_torso.tga
+r_hand,models/players/reborn/fenc_hand.tga
+r_hand_wrist,models/players/reborn/fenc_torso.tga
+r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga
+r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga
+r_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+l_arm,models/players/reborn/fenc_torso.tga
+l_hand,models/players/reborn/fenc_hand.tga
+l_hand_wrist,models/players/reborn/fenc_torso.tga
+l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga
+l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga
+l_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+torso_cap_head_off,models/players/stormtrooper/caps.tga
+torso_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_cap_l_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_r_arm_off,models/players/stormtrooper/caps.tga
+head,models/players/reborn/fenc_hood.tga
+head_face,models/players/reborn/fenc_face.tga
+head_eyes_mouth,models/players/reborn/mouth_eyes.tga
+head_cap_torso_off,models/players/stormtrooper/caps.tga
+head_eyes_mouth_off,models/players/kyle/mouth_eyes.tga
+torso_cowelbase,models/players/reborn/fenc_hood.tga
+hips_cap_l_leg_off,models/players/stormtrooper/caps.tga
+hips_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_cap_r_leg_off,models/players/stormtrooper/caps.tga
+l_leg,models/players/reborn/fenc_boots_hips.tga
+l_leg_cap_hips_off,models/players/stormtrooper/caps.tga
+r_leg,models/players/reborn/fenc_boots_hips.tga
+r_leg_cap_hips_off,models/players/stormtrooper/caps.tga
+hips_flaps,models/players/reborn/fenc_flap.tga

assets/japro/models/players/reborn/model_forceuser.skin

@@ -0,0 +1,35 @@
+hips,models/players/reborn/reborn_legs.tga
+hips_torso,models/players/reborn/reborn_torso.tga
+torso,models/players/reborn/reborn_torso.tga
+torso_l_shoulder,models/players/reborn/reborn_torso.tga
+torso_r_shoulder,models/players/reborn/reborn_torso.tga
+r_arm,models/players/reborn/reborn_torso.tga
+r_hand,models/players/reborn/basic_hand.tga
+r_hand_wrist,models/players/reborn/reborn_torso.tga
+r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga
+r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga
+r_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+l_arm,models/players/reborn/reborn_torso.tga
+l_hand,models/players/reborn/basic_hand.tga
+l_hand_wrist,models/players/reborn/reborn_torso.tga
+l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga
+l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga
+l_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+torso_cap_head_off,models/players/stormtrooper/caps.tga
+torso_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_cap_l_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_r_arm_off,models/players/stormtrooper/caps.tga
+head,models/players/reborn/hood.tga
+head_face,models/players/reborn/face.tga
+head_eyes_mouth,models/players/reborn/mouth_eyes.tga
+head_cap_torso_off,models/players/stormtrooper/caps.tga
+head_eyes_mouth_off,models/players/kyle/mouth_eyes.tga
+torso_cowelbase,models/players/reborn/hood.tga
+hips_cap_l_leg_off,models/players/stormtrooper/caps.tga
+hips_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_cap_r_leg_off,models/players/stormtrooper/caps.tga
+l_leg,models/players/reborn/boots_hips.tga
+l_leg_cap_hips_off,models/players/stormtrooper/caps.tga
+r_leg,models/players/reborn/boots_hips.tga
+r_leg_cap_hips_off,models/players/stormtrooper/caps.tga
+hips_flaps,models/players/reborn/flap.tga

assets/japro/shaders/japro.shader

@@ -10,12 +10,12 @@ bloodExplosion		// spurt of blood at point of impact
 }
 
 bloodTrail
-{
+{		
 	nopicmip			// make sure a border remains
 	entityMergable		// allow all the sprites to be merged together
 	{
 		//clampmap gfx/misc/blood.tga
-			clampmap gfx/damage/blood_spurt.tga
+		clampmap gfx/damage/blood_spurt.tga
 		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
 		rgbGen		vertex
 		alphaGen	vertex
@@ -37,6 +37,7 @@ bloodMark
 gfx/effects/sabers/RGBGlow
 {	
 	nopicmip
+	notc
 	cull	twosided
 	{
 		map gfx/effects/sabers/RGBGlow
@@ -50,6 +51,7 @@ gfx/effects/sabers/RGBGlow
 gfx/effects/sabers/RGBCore
 {
 	nopicmip
+	notc
 	cull	twosided
 	{
 		map gfx/effects/sabers/RGBCore
@@ -63,17 +65,17 @@ gfx/2d/numbers/zero
 {
 	nopicmip
 	{
-	  	map gfx/2d/numbers/zero
-	blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		map gfx/2d/numbers/zero
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
 	}
 }
 
 gfx/2d/numbers/one
 {
 	nopicmip
 	{
-	 	map gfx/2d/numbers/one
-	blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		map gfx/2d/numbers/one
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
 	}
 }
 
@@ -118,7 +120,7 @@ gfx/2d/numbers/six
 {
 	nopicmip
 	{
-	  	map gfx/2d/numbers/six
+		map gfx/2d/numbers/six
 		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
 	}
 }