diff --git a/history.txt b/history.txt index d6b9343..dd81861 100644 --- a/history.txt +++ b/history.txt @@ -1,9 +1,4 @@ maps -map zombietest -quit -map zombietest -quit -maps quit map ad_devkit1 maps @@ -25,3 +20,11 @@ quit fog fog 0.1 quit +maps +quit +maps +quit +maps +map zombietest +quit +map test diff --git a/id1/config.cfg b/id1/config.cfg index b199240..717cfe7 100644 --- a/id1/config.cfg +++ b/id1/config.cfg @@ -129,10 +129,10 @@ vid_bpp "24" vid_desktopfullscreen "0" vid_fsaa "0" vid_fullscreen "0" -vid_height "576" +vid_height "1080" vid_refreshrate "60" vid_vsync "0" -vid_width "1024" +vid_width "1920" viewsize "110" volume "0.7" vid_restart diff --git a/id1/maps/test.bsp b/id1/maps/test.bsp new file mode 100644 index 0000000..b309e50 Binary files /dev/null and b/id1/maps/test.bsp differ diff --git a/textures/skips2018/*lavaskip.png b/textures/skips2018/*lavaskip.png new file mode 100644 index 0000000..ced98ee Binary files /dev/null and b/textures/skips2018/*lavaskip.png differ diff --git a/textures/skips2018/*slimeskip.png b/textures/skips2018/*slimeskip.png new file mode 100644 index 0000000..f521cd9 Binary files /dev/null and b/textures/skips2018/*slimeskip.png differ diff --git a/textures/skips2018/*waterskip.png b/textures/skips2018/*waterskip.png new file mode 100644 index 0000000..6854673 Binary files /dev/null and b/textures/skips2018/*waterskip.png differ diff --git a/textures/skips2018/hint.png b/textures/skips2018/hint.png new file mode 100644 index 0000000..7de2d03 Binary files /dev/null and b/textures/skips2018/hint.png differ diff --git a/textures/skips2018/hintskip.png b/textures/skips2018/hintskip.png new file mode 100644 index 0000000..6f16cb5 Binary files /dev/null and b/textures/skips2018/hintskip.png differ diff --git a/textures/skips2018/skip.png b/textures/skips2018/skip.png new file mode 100644 index 0000000..5061f1e Binary files /dev/null and b/textures/skips2018/skip.png differ diff --git a/tools/blender_io_map_wip.blend b/tools/blender_io_map_wip.blend index 83759ed..d6d9e98 100644 Binary files a/tools/blender_io_map_wip.blend and b/tools/blender_io_map_wip.blend differ diff --git a/tools/build_from_blender.sh b/tools/build_from_blender.sh new file mode 100755 index 0000000..8407c28 --- /dev/null +++ b/tools/build_from_blender.sh @@ -0,0 +1,27 @@ +#!/bin/bash +DIR="$( cd -P "$( dirname "$0" )" && pwd )" +ROOT=${DIR}/../ +MAPDIR=${ROOT}/id1/maps/ + +MAPNAME=test +WORKING_DIR=/tmp + +IN=${MAPNAME}.map +OUT=${MAPNAME}.bsp + +TOOLS_DIR=${ROOT}/tools/ericw_tools +QBSP=${TOOLS_DIR}/qbsp +VIS=${TOOLS_DIR}/vis +LIGHT=${TOOLS_DIR}/light + +pushd ${WORKING_DIR} +${QBSP} -bsp2 ${IN} ${OUT} +${VIS} -fast -level 4 -noambient ${OUT} +${LIGHT} -bounce -soft -extra -extra4 -dirt -dirtdepth 128 ${OUT} +cp ${OUT} ${MAPDIR} +popd + +pushd ${ROOT} +#./quakespasm-sdl2 +map ${MAPNAME} + +popd diff --git a/tools/example.map b/tools/example.map new file mode 100644 index 0000000..fd389fd --- /dev/null +++ b/tools/example.map @@ -0,0 +1,38 @@ +// Game: Quake +// Format: Standard +// entity 0 +{ +"classname" "worldspawn" +// brush 0 +{ +( -64 -64 -16 ) ( -64 -63 -16 ) ( -64 -64 -15 ) __TB_empty 0 0 0 1 1 +( -64 -64 -16 ) ( -64 -64 -15 ) ( -63 -64 -16 ) __TB_empty 0 0 0 1 1 +( -64 -64 -16 ) ( -63 -64 -16 ) ( -64 -63 -16 ) __TB_empty 0 0 0 1 1 +( 64 64 16 ) ( 64 65 16 ) ( 65 64 16 ) __TB_empty 0 0 0 1 1 +( 64 64 16 ) ( 65 64 16 ) ( 64 64 17 ) __TB_empty 0 0 0 1 1 +( 64 64 16 ) ( 64 64 17 ) ( 64 65 16 ) __TB_empty 0 0 0 1 1 +} +// brush 1 +{ +( -32 -128 0 ) ( -32 -127 0 ) ( -32 -128 1 ) __TB_empty 0 0 0 1 1 +( -32 -128 0 ) ( -32 -128 1 ) ( -31 -128 0 ) __TB_empty 0 0 0 1 1 +( -32 -128 0 ) ( -31 -128 0 ) ( -32 -127 0 ) __TB_empty 0 0 0 1 1 +( 160 -80 16 ) ( 160 -79 16 ) ( 161 -80 16 ) __TB_empty 0 0 0 1 1 +( 160 -80 16 ) ( 161 -80 16 ) ( 160 -80 17 ) __TB_empty 0 0 0 1 1 +( 160 -80 16 ) ( 160 -80 17 ) ( 160 -79 16 ) __TB_empty 0 0 0 1 1 +} +// brush 2 +{ +( -272 48 -80 ) ( -272 49 -80 ) ( -272 48 -79 ) __TB_empty 0 0 0 1 1 +( -272 48 -80 ) ( -272 48 -79 ) ( -271 48 -80 ) __TB_empty 0 0 0 1 1 +( -272 48 -80 ) ( -271 48 -80 ) ( -272 49 -80 ) __TB_empty 0 0 0 1 1 +( -80 528 -64 ) ( -80 529 -64 ) ( -79 528 -64 ) __TB_empty 0 0 0 1 1 +( -80 528 -64 ) ( -79 528 -64 ) ( -80 528 -63 ) __TB_empty 0 0 0 1 1 +( -80 528 -64 ) ( -80 528 -63 ) ( -80 529 -64 ) __TB_empty 0 0 0 1 1 +} +} +// entity 1 +{ +"classname" "info_player_start" +"origin" "0 -16 40" +} diff --git a/tools/example.txt b/tools/example.txt new file mode 100644 index 0000000..fd389fd --- /dev/null +++ b/tools/example.txt @@ -0,0 +1,38 @@ +// Game: Quake +// Format: Standard +// entity 0 +{ +"classname" "worldspawn" +// brush 0 +{ +( -64 -64 -16 ) ( -64 -63 -16 ) ( -64 -64 -15 ) __TB_empty 0 0 0 1 1 +( -64 -64 -16 ) ( -64 -64 -15 ) ( -63 -64 -16 ) __TB_empty 0 0 0 1 1 +( -64 -64 -16 ) ( -63 -64 -16 ) ( -64 -63 -16 ) __TB_empty 0 0 0 1 1 +( 64 64 16 ) ( 64 65 16 ) ( 65 64 16 ) __TB_empty 0 0 0 1 1 +( 64 64 16 ) ( 65 64 16 ) ( 64 64 17 ) __TB_empty 0 0 0 1 1 +( 64 64 16 ) ( 64 64 17 ) ( 64 65 16 ) __TB_empty 0 0 0 1 1 +} +// brush 1 +{ +( -32 -128 0 ) ( -32 -127 0 ) ( -32 -128 1 ) __TB_empty 0 0 0 1 1 +( -32 -128 0 ) ( -32 -128 1 ) ( -31 -128 0 ) __TB_empty 0 0 0 1 1 +( -32 -128 0 ) ( -31 -128 0 ) ( -32 -127 0 ) __TB_empty 0 0 0 1 1 +( 160 -80 16 ) ( 160 -79 16 ) ( 161 -80 16 ) __TB_empty 0 0 0 1 1 +( 160 -80 16 ) ( 161 -80 16 ) ( 160 -80 17 ) __TB_empty 0 0 0 1 1 +( 160 -80 16 ) ( 160 -80 17 ) ( 160 -79 16 ) __TB_empty 0 0 0 1 1 +} +// brush 2 +{ +( -272 48 -80 ) ( -272 49 -80 ) ( -272 48 -79 ) __TB_empty 0 0 0 1 1 +( -272 48 -80 ) ( -272 48 -79 ) ( -271 48 -80 ) __TB_empty 0 0 0 1 1 +( -272 48 -80 ) ( -271 48 -80 ) ( -272 49 -80 ) __TB_empty 0 0 0 1 1 +( -80 528 -64 ) ( -80 529 -64 ) ( -79 528 -64 ) __TB_empty 0 0 0 1 1 +( -80 528 -64 ) ( -79 528 -64 ) ( -80 528 -63 ) __TB_empty 0 0 0 1 1 +( -80 528 -64 ) ( -80 528 -63 ) ( -80 529 -64 ) __TB_empty 0 0 0 1 1 +} +} +// entity 1 +{ +"classname" "info_player_start" +"origin" "0 -16 40" +}