diff --git a/common/gfx/hud/scope_256.tga b/common/gfx/hud/scope_256.tga new file mode 100644 index 0000000..3b06285 Binary files /dev/null and b/common/gfx/hud/scope_256.tga differ diff --git a/common/gfx/uwater.png b/common/gfx/uwater.png deleted file mode 100644 index 2e54a7c..0000000 Binary files a/common/gfx/uwater.png and /dev/null differ diff --git a/common/textures/particles/particlefont.tga b/common/textures/particles/particlefont.tga index 31cba17..2c5e057 100644 Binary files a/common/textures/particles/particlefont.tga and b/common/textures/particles/particlefont.tga differ diff --git a/common/textures/r4w/convert_all.py b/common/textures/r4w/convert_all.py deleted file mode 100644 index 75a1e24..0000000 --- a/common/textures/r4w/convert_all.py +++ /dev/null @@ -1,89 +0,0 @@ -import os -import struct - -def findall(): - filelist = os.listdir() - #print(filelist) - try: - os.mkdir('out') - print("Starting conversion, created 'out' directory...") - except: - print("Starting conversion, 'out' directory exists...") - - for filename in filelist: - splits = filename.split('.') - suffix = splits[-1] - cancel = False - if suffix is 'h': - print("- Processing " + filename + "...") - h = open(filename, 'r') - width = -1 - height = -1 - - for line in h: - if line[0] is not '#': - continue - words = line.split() - if words[1][-13:] == 'TEXTURE_WIDTH': - width = int(words[2]) - elif words[1][-14:] == 'TEXTURE_HEIGHT': - height = int(words[2]) - elif words[1][-14:] == 'TEXTURE_FORMAT': - if words[2] != '4': - print("-- Texture format not supported, only accepting GU_PSM_T4 !") - cancel = True - elif words[1][-15:] == 'TEXTURE_SWIZZLE': - if words[2] != '1': - print("-- Non-swizzled textures not recommended!") - #cancel = True - elif words[1][-14:] == 'PALETTE_FORMAT': - if words[2] != '3': - print("-- Palette format not supported, only accepting GU_PSM_8888 !") - cancel = True - - if width == -1 or height == -1: - print("Missing either width or height in header !") - cancel = True - - newfile = open(filename[:-2] + '.r4w', 'wb') - newfile.write(bytes("c4fe", 'utf-8')) - newfile.write(struct.pack('i', width)) - newfile.write(struct.pack('i', height)) - newfile.write(bytes("xxxx", 'utf-8')) - - # the raw file - try: - raw = open(filename[:-2] + '.raw', 'rb') - # (width * height / 2) bytes for 4bpp - newfile.write(raw.read(int((width * height) / 2))) - raw.close() - except Exception as e: - print('-- Couldn\'t read ' + filename[:-2] + '.raw') - print("--- Exception: %s" % e) - cancel = True - - # the rawpal file - try: - rawpal = open(filename[:-2] + '.rawpal', 'rb') - # 4 bytes per color, 16 colors - newfile.write(rawpal.read(4 * 16)) - rawpal.close() - except Exception as e: - print('-- Couldn\'t read ' + filename[:-2] + '.rawpal') - print("--- Exception: %s" % e) - cancel = True - - newfile.close() - if cancel: - os.remove(filename[:-2] + '.r4w') - print('-- ' + filename[:-2] + '.r4w was NOT generated.') - else: - try: - os.rename(filename[:-2] + '.r4w', 'out/' + filename[:-2] + '.r4w') - except: - os.remove('out/' + filename[:-2] + '.r4w') - os.rename(filename[:-2] + '.r4w', 'out/' + filename[:-2] + '.r4w') - print('-- Created ./out/' + filename[:-2] + '.r4w') - - -findall() \ No newline at end of file diff --git a/common/textures/r4w/doorway_met.h b/common/textures/r4w/doorway_met.h deleted file mode 100644 index 2f2878b..0000000 --- a/common/textures/r4w/doorway_met.h +++ /dev/null @@ -1,15 +0,0 @@ -/* File produced with RAWTEX Gimp plugin v1.06 - Written by Franck Charlet. */ - -#define DOORWAY_MET_TEXTURE_WIDTH 32 -#define DOORWAY_MET_TEXTURE_REAL_WIDTH 32 -#define DOORWAY_MET_TEXTURE_HEIGHT 64 -#define DOORWAY_MET_TEXTURE_REAL_HEIGHT 64 -#define DOORWAY_MET_TEXTURE_FORMAT 4 -#define DOORWAY_MET_TEXTURE_MIPMAPS 0 -#define DOORWAY_MET_TEXTURE_SWIZZLE 1 - -#define DOORWAY_MET_PALETTE_FORMAT 3 -#define DOORWAY_MET_PALETTE_COLORS (16 / 8) -#define DOORWAY_MET_PALETTE_MASK 0xf -#define DOORWAY_MET_MIPMAPS_OFFSET0 0 diff --git a/common/textures/r4w/doorway_met.raw b/common/textures/r4w/doorway_met.raw deleted file mode 100644 index be36711..0000000 Binary files a/common/textures/r4w/doorway_met.raw and /dev/null differ diff --git a/common/textures/r4w/doorway_met.rawpal b/common/textures/r4w/doorway_met.rawpal deleted file mode 100644 index 939045a..0000000 --- a/common/textures/r4w/doorway_met.rawpal +++ /dev/null @@ -1 +0,0 @@ -ÿÿ*+)ÿ.-&ÿ32+ÿ131ÿ66/ÿ786ÿ:<9ÿAB@ÿIJHÿRSQÿXZWÿab`ÿkmjÿuwtÿ \ No newline at end of file diff --git a/common/textures/r4w/out/doorway_met.r4w b/common/textures/r4w/out/doorway_met.r4w deleted file mode 100644 index a6a2ed4..0000000 Binary files a/common/textures/r4w/out/doorway_met.r4w and /dev/null differ diff --git a/common/textures/r4w/out/{barbed_wire_V.r4w b/common/textures/r4w/out/{barbed_wire_V.r4w deleted file mode 100644 index 4271529..0000000 Binary files a/common/textures/r4w/out/{barbed_wire_V.r4w and /dev/null differ diff --git a/common/textures/r4w/out/{board_fe.r4w b/common/textures/r4w/out/{board_fe.r4w deleted file mode 100644 index 20eb9a4..0000000 Binary files a/common/textures/r4w/out/{board_fe.r4w and /dev/null differ diff --git a/common/textures/r4w/out/{camo_2.r4w b/common/textures/r4w/out/{camo_2.r4w deleted file mode 100644 index 79eed57..0000000 Binary files a/common/textures/r4w/out/{camo_2.r4w and /dev/null differ diff --git a/common/textures/r4w/out/{clfND.r4w b/common/textures/r4w/out/{clfND.r4w deleted file mode 100644 index 06a3cc0..0000000 Binary files a/common/textures/r4w/out/{clfND.r4w and /dev/null differ diff --git a/common/textures/r4w/out/{metal_rail7.r4w b/common/textures/r4w/out/{metal_rail7.r4w deleted file mode 100644 index 3ba7869..0000000 Binary files a/common/textures/r4w/out/{metal_rail7.r4w and /dev/null differ diff --git a/common/textures/r4w/out/{railling_ndu.r4w b/common/textures/r4w/out/{railling_ndu.r4w deleted file mode 100644 index 67b3b4d..0000000 Binary files a/common/textures/r4w/out/{railling_ndu.r4w and /dev/null differ diff --git a/common/textures/r4w/{barbed_wire_V.h b/common/textures/r4w/{barbed_wire_V.h deleted file mode 100644 index dca8994..0000000 --- a/common/textures/r4w/{barbed_wire_V.h +++ /dev/null @@ -1,15 +0,0 @@ -/* File produced with RAWTEX Gimp plugin v1.06 - Written by Franck Charlet. */ - -#define _BARBED_WIRE_V_TEXTURE_WIDTH 64 -#define _BARBED_WIRE_V_TEXTURE_REAL_WIDTH 64 -#define _BARBED_WIRE_V_TEXTURE_HEIGHT 64 -#define _BARBED_WIRE_V_TEXTURE_REAL_HEIGHT 64 -#define _BARBED_WIRE_V_TEXTURE_FORMAT 4 -#define _BARBED_WIRE_V_TEXTURE_MIPMAPS 0 -#define _BARBED_WIRE_V_TEXTURE_SWIZZLE 1 - -#define _BARBED_WIRE_V_PALETTE_FORMAT 3 -#define _BARBED_WIRE_V_PALETTE_COLORS (7 / 8) -#define _BARBED_WIRE_V_PALETTE_MASK 0xf -#define _BARBED_WIRE_V_MIPMAPS_OFFSET0 0 diff --git a/common/textures/r4w/{barbed_wire_V.raw b/common/textures/r4w/{barbed_wire_V.raw deleted file mode 100644 index baf6585..0000000 Binary files a/common/textures/r4w/{barbed_wire_V.raw and /dev/null differ diff --git a/common/textures/r4w/{barbed_wire_V.rawpal b/common/textures/r4w/{barbed_wire_V.rawpal deleted file mode 100644 index c7b578b..0000000 Binary files a/common/textures/r4w/{barbed_wire_V.rawpal and /dev/null differ diff --git a/common/textures/r4w/{barbed_wire_V.rawpal.bak b/common/textures/r4w/{barbed_wire_V.rawpal.bak deleted file mode 100644 index bad0256..0000000 Binary files a/common/textures/r4w/{barbed_wire_V.rawpal.bak and /dev/null differ diff --git a/common/textures/r4w/{board_fe.h b/common/textures/r4w/{board_fe.h deleted file mode 100644 index 5a66d4d..0000000 --- a/common/textures/r4w/{board_fe.h +++ /dev/null @@ -1,15 +0,0 @@ -/* File produced with RAWTEX Gimp plugin v1.06 - Written by Franck Charlet. */ - -#define _BOARD_FE_TEXTURE_WIDTH 64 -#define _BOARD_FE_TEXTURE_REAL_WIDTH 64 -#define _BOARD_FE_TEXTURE_HEIGHT 64 -#define _BOARD_FE_TEXTURE_REAL_HEIGHT 64 -#define _BOARD_FE_TEXTURE_FORMAT 4 -#define _BOARD_FE_TEXTURE_MIPMAPS 0 -#define _BOARD_FE_TEXTURE_SWIZZLE 1 - -#define _BOARD_FE_PALETTE_FORMAT 3 -#define _BOARD_FE_PALETTE_COLORS (16 / 8) -#define _BOARD_FE_PALETTE_MASK 0xf -#define _BOARD_FE_MIPMAPS_OFFSET0 0 diff --git a/common/textures/r4w/{board_fe.raw b/common/textures/r4w/{board_fe.raw deleted file mode 100644 index 025ed34..0000000 Binary files a/common/textures/r4w/{board_fe.raw and /dev/null differ diff --git a/common/textures/r4w/{board_fe.rawpal b/common/textures/r4w/{board_fe.rawpal deleted file mode 100644 index 1ea3cca..0000000 Binary files a/common/textures/r4w/{board_fe.rawpal and /dev/null differ diff --git a/common/textures/r4w/{board_fe.rawpal.bak b/common/textures/r4w/{board_fe.rawpal.bak deleted file mode 100644 index 088acb6..0000000 Binary files a/common/textures/r4w/{board_fe.rawpal.bak and /dev/null differ diff --git a/common/textures/r4w/{camo_2.h b/common/textures/r4w/{camo_2.h deleted file mode 100644 index 0943c9b..0000000 --- a/common/textures/r4w/{camo_2.h +++ /dev/null @@ -1,15 +0,0 @@ -/* File produced with RAWTEX Gimp plugin v1.06 - Written by Franck Charlet. */ - -#define _CAMO_2_TEXTURE_WIDTH 32 -#define _CAMO_2_TEXTURE_REAL_WIDTH 32 -#define _CAMO_2_TEXTURE_HEIGHT 32 -#define _CAMO_2_TEXTURE_REAL_HEIGHT 32 -#define _CAMO_2_TEXTURE_FORMAT 4 -#define _CAMO_2_TEXTURE_MIPMAPS 0 -#define _CAMO_2_TEXTURE_SWIZZLE 1 - -#define _CAMO_2_PALETTE_FORMAT 3 -#define _CAMO_2_PALETTE_COLORS (10 / 8) -#define _CAMO_2_PALETTE_MASK 0xf -#define _CAMO_2_MIPMAPS_OFFSET0 0 diff --git a/common/textures/r4w/{camo_2.raw b/common/textures/r4w/{camo_2.raw deleted file mode 100644 index 39b2a09..0000000 --- a/common/textures/r4w/{camo_2.raw +++ /dev/null @@ -1 +0,0 @@ -fffUUUUUffVUDUTefffTUTUDfFefEUeefUevUEfDefaUTEUffeVUffUUafHDefffTUaWAEfffUwEdffvuWDeffFDwgVdfffwUUff1UefvefffWeWefAUffvWffVEex‡uQUffQWefAUfaVUUUTeffaEEAufffWUUeff5UfSdfffVUEdfUUUdfQuxffwUWeUEuweffD…XxwwWUeUU…xafffUUwUwWWUUw…ˆfffETUUuwfUUUuˆfafVTefUUfVfV…ˆhVUUeVUffff˜ˆˆxUTUaVeffff‡hfVUEUefEdfaffvwffVUUUgf6dfafVUwffFTUwgffEfUeUUUffUUUffQXUDDTfffUDffQAxUEEAdfaFU4a"Q‡UUQfaWUT!"eWDfavUUffQgffffQUUeffVAUgffffAUWeffUEUUeffffQTEeffUETDEffffUDTTUffVUEDTf \ No newline at end of file diff --git a/common/textures/r4w/{camo_2.rawpal b/common/textures/r4w/{camo_2.rawpal deleted file mode 100644 index 5457999..0000000 Binary files a/common/textures/r4w/{camo_2.rawpal and /dev/null differ diff --git a/common/textures/r4w/{camo_2.rawpal.bak b/common/textures/r4w/{camo_2.rawpal.bak deleted file mode 100644 index b1279d0..0000000 Binary files a/common/textures/r4w/{camo_2.rawpal.bak and /dev/null differ diff --git a/common/textures/r4w/{clfND.h b/common/textures/r4w/{clfND.h deleted file mode 100644 index dfe1563..0000000 --- a/common/textures/r4w/{clfND.h +++ /dev/null @@ -1,15 +0,0 @@ -/* File produced with RAWTEX Gimp plugin v1.06 - Written by Franck Charlet. */ - -#define _CLFND_TEXTURE_WIDTH 32 -#define _CLFND_TEXTURE_REAL_WIDTH 32 -#define _CLFND_TEXTURE_HEIGHT 32 -#define _CLFND_TEXTURE_REAL_HEIGHT 32 -#define _CLFND_TEXTURE_FORMAT 4 -#define _CLFND_TEXTURE_MIPMAPS 0 -#define _CLFND_TEXTURE_SWIZZLE 1 - -#define _CLFND_PALETTE_FORMAT 3 -#define _CLFND_PALETTE_COLORS (7 / 8) -#define _CLFND_PALETTE_MASK 0xf -#define _CLFND_MIPMAPS_OFFSET0 0 diff --git a/common/textures/r4w/{clfND.raw b/common/textures/r4w/{clfND.raw deleted file mode 100644 index 6613b21..0000000 Binary files a/common/textures/r4w/{clfND.raw and /dev/null differ diff --git a/common/textures/r4w/{clfND.rawpal b/common/textures/r4w/{clfND.rawpal deleted file mode 100644 index 3eafb83..0000000 Binary files a/common/textures/r4w/{clfND.rawpal and /dev/null differ diff --git a/common/textures/r4w/{clfND.rawpal.bak b/common/textures/r4w/{clfND.rawpal.bak deleted file mode 100644 index fb82fe5..0000000 Binary files a/common/textures/r4w/{clfND.rawpal.bak and /dev/null differ diff --git a/common/textures/r4w/{metal_rail7.h b/common/textures/r4w/{metal_rail7.h deleted file mode 100644 index 1408ec9..0000000 --- a/common/textures/r4w/{metal_rail7.h +++ /dev/null @@ -1,15 +0,0 @@ -/* File produced with RAWTEX Gimp plugin v1.06 - Written by Franck Charlet. */ - -#define _METAL_RAIL7_TEXTURE_WIDTH 32 -#define _METAL_RAIL7_TEXTURE_REAL_WIDTH 32 -#define _METAL_RAIL7_TEXTURE_HEIGHT 16 -#define _METAL_RAIL7_TEXTURE_REAL_HEIGHT 16 -#define _METAL_RAIL7_TEXTURE_FORMAT 4 -#define _METAL_RAIL7_TEXTURE_MIPMAPS 0 -#define _METAL_RAIL7_TEXTURE_SWIZZLE 1 - -#define _METAL_RAIL7_PALETTE_FORMAT 3 -#define _METAL_RAIL7_PALETTE_COLORS (5 / 8) -#define _METAL_RAIL7_PALETTE_MASK 0xf -#define _METAL_RAIL7_MIPMAPS_OFFSET0 0 diff --git a/common/textures/r4w/{metal_rail7.raw b/common/textures/r4w/{metal_rail7.raw deleted file mode 100644 index a2bae87..0000000 Binary files a/common/textures/r4w/{metal_rail7.raw and /dev/null differ diff --git a/common/textures/r4w/{metal_rail7.rawpal b/common/textures/r4w/{metal_rail7.rawpal deleted file mode 100644 index e975bac..0000000 Binary files a/common/textures/r4w/{metal_rail7.rawpal and /dev/null differ diff --git a/common/textures/r4w/{metal_rail7.rawpal.bak b/common/textures/r4w/{metal_rail7.rawpal.bak deleted file mode 100644 index 8352f54..0000000 Binary files a/common/textures/r4w/{metal_rail7.rawpal.bak and /dev/null differ diff --git a/common/textures/r4w/{railling_ndu.h b/common/textures/r4w/{railling_ndu.h deleted file mode 100644 index 332f3bc..0000000 --- a/common/textures/r4w/{railling_ndu.h +++ /dev/null @@ -1,15 +0,0 @@ -/* File produced with RAWTEX Gimp plugin v1.06 - Written by Franck Charlet. */ - -#define _RAILLING_NDU_TEXTURE_WIDTH 64 -#define _RAILLING_NDU_TEXTURE_REAL_WIDTH 64 -#define _RAILLING_NDU_TEXTURE_HEIGHT 64 -#define _RAILLING_NDU_TEXTURE_REAL_HEIGHT 64 -#define _RAILLING_NDU_TEXTURE_FORMAT 4 -#define _RAILLING_NDU_TEXTURE_MIPMAPS 0 -#define _RAILLING_NDU_TEXTURE_SWIZZLE 1 - -#define _RAILLING_NDU_PALETTE_FORMAT 3 -#define _RAILLING_NDU_PALETTE_COLORS (16 / 8) -#define _RAILLING_NDU_PALETTE_MASK 0xf -#define _RAILLING_NDU_MIPMAPS_OFFSET0 0 diff --git a/common/textures/r4w/{railling_ndu.raw b/common/textures/r4w/{railling_ndu.raw deleted file mode 100644 index abb4561..0000000 Binary files a/common/textures/r4w/{railling_ndu.raw and /dev/null differ diff --git a/common/textures/r4w/{railling_ndu.rawpal b/common/textures/r4w/{railling_ndu.rawpal deleted file mode 100644 index 205e3ba..0000000 Binary files a/common/textures/r4w/{railling_ndu.rawpal and /dev/null differ diff --git a/common/textures/r4w/{railling_ndu.rawpal.bak b/common/textures/r4w/{railling_ndu.rawpal.bak deleted file mode 100644 index d2e820a..0000000 Binary files a/common/textures/r4w/{railling_ndu.rawpal.bak and /dev/null differ