Merge branch 'master' of ssh://git.xonotic.org/xonotic

Docs/htmlfiles/weaponimg/weapon-images.map

@@ -1,84 +0,0 @@
-{
-"classname" "worldspawn"
-{
-( 1536 1024 1024 ) ( 1536 -1024 1024 ) ( -1024 1024 1024 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( 1536 1024 256 ) ( -1024 1024 256 ) ( 1536 1024 0 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( 1024 1024 256 ) ( 1024 1024 0 ) ( 1024 -1024 256 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( -1024 -1024 0 ) ( -1024 -1024 256 ) ( 1536 -1024 0 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( -1024 -1024 0 ) ( -1024 1024 0 ) ( -1024 -1024 256 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( -1024 1024 768 ) ( 1536 -1024 768 ) ( 1536 1024 768 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-}
-{
-( 1536 1024 1024 ) ( 1536 -1024 1024 ) ( -1024 1024 1024 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( 1536 1024 256 ) ( -1024 1024 256 ) ( 1536 1024 0 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( 1024 1024 256 ) ( 1024 1024 0 ) ( 1024 -1024 256 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( -1024 -1024 -1024 ) ( 1536 -1024 -1024 ) ( -1024 1024 -1024 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( -1024 -1024 0 ) ( -1024 1024 0 ) ( -1024 -1024 256 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( 1536 768 0 ) ( -1024 768 256 ) ( 1536 768 256 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-}
-{
-( 1536 1024 1024 ) ( 1536 -1024 1024 ) ( -1024 1024 1024 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( 1536 1024 256 ) ( -1024 1024 256 ) ( 1536 1024 0 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( 1024 1024 256 ) ( 1024 1024 0 ) ( 1024 -1024 256 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( -1024 -1024 -1024 ) ( 1536 -1024 -1024 ) ( -1024 1024 -1024 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( -1024 -1024 0 ) ( -1024 -1024 256 ) ( 1536 -1024 0 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( 768 -1024 256 ) ( 768 1024 0 ) ( 768 1024 256 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-}
-{
-( 1536 1024 256 ) ( -1024 1024 256 ) ( 1536 1024 0 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( 1024 1024 256 ) ( 1024 1024 0 ) ( 1024 -1024 256 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( -1024 -1024 -1024 ) ( 1536 -1024 -1024 ) ( -1024 1024 -1024 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( -1024 -1024 0 ) ( -1024 -1024 256 ) ( 1536 -1024 0 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( -1024 -1024 0 ) ( -1024 1024 0 ) ( -1024 -1024 256 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( -1024 1024 -768 ) ( 1536 -1024 -768 ) ( -1024 -1024 -768 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-}
-{
-( 1536 1024 1024 ) ( 1536 -1024 1024 ) ( -1024 1024 1024 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( 1024 1024 256 ) ( 1024 1024 0 ) ( 1024 -1024 256 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( -1024 -1024 -1024 ) ( 1536 -1024 -1024 ) ( -1024 1024 -1024 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( -1024 -1024 0 ) ( -1024 -1024 256 ) ( 1536 -1024 0 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( -1024 -1024 0 ) ( -1024 1024 0 ) ( -1024 -1024 256 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( 1536 -768 0 ) ( -1024 -768 256 ) ( -1024 -768 0 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-}
-{
-( 1536 1024 1024 ) ( 1536 -1024 1024 ) ( -1024 1024 1024 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( 1536 1024 256 ) ( -1024 1024 256 ) ( 1536 1024 0 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( -1024 -1024 -1024 ) ( 1536 -1024 -1024 ) ( -1024 1024 -1024 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( -1024 -1024 0 ) ( -1024 -1024 256 ) ( 1536 -1024 0 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( -1024 -1024 0 ) ( -1024 1024 0 ) ( -1024 -1024 256 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-( -768 -1024 256 ) ( -768 1024 0 ) ( -768 -1024 0 ) colorkey/pink 0 0 0 0.5 0.5 0 0 0
-}
-}
-{
-"classname" "info_player_deathmatch"
-"origin" "-96.000000 96.000000 -744.000000"
-"angle" "-70.000000"
-}
-{
-"classname" "misc_gamemodel"
-"origin" "-32.000000 0.000000 -744.000000"
-"model" "models/player/marine.zym"
-"frame" "11"
-"angle" "190"
-"colormap" "1"
-}
-{
-"classname" "misc_gamemodel"
-"origin" "0 0 0"
-"model" "models/weapons/v_laser.md3"
-"tag_entity" "32"
-"tag_index" "22"
-"colormap" "1"
-}
-{
-"classname" "light"
-"origin" "128.000000 128.000000 -640.000000"
-"light" "2000"
-}
-{
-"classname" "misc_gamemodel"
-"origin" "32.000000 0.000000 -768.000000"
-"effects" "8388608"
-"model" "models/weapons/g_laser.md3"
-"colormap" "1"
-}

Docs/htmlfiles/weaponimg/weapon-images.txt

@@ -1,14 +0,0 @@
-Made using the included map file (edited to contain the name of the current gun) at fov 90, 1280x768, normal settings except gl_picmip 0.
-
-Partial image cropped out, then edited using ImageMagick with the parameters
-
--level -3%,70%,1 -geometry 209x240
-
-respective
-
--level -3%,70%,1 -geometry 162x80
-
-The crop regions were:
-
-firstperson = bottom 627x310 pixels (later scaled down to 240 height)
-thirdperson = 288x331 pixels, anchored at the right foot of marine (bottom left corner on the image)