Skip to content
Permalink
Browse files

Alpha 2.0pre4

- Update to r5491 (Sauerbraten)
- SDL window icon
- Added version command
- Added new skyboxes
- Replaced grenade model with custom one
- Fixed spacepackallowed map flag
- Added spacepack indicator on spacepack enabled maps
- Updated NSIS installer file
- Updated appveyor.yml
- Updated Linux run script
  • Loading branch information
YellowberryHN committed Oct 10, 2019
1 parent 54d08c2 commit 95cacef67b7125b2a4684f992f07b0bff8efb6d7
Showing with 591 additions and 260 deletions.
  1. +23 −18 appveyor.yml
  2. BIN bin64/cardboard_msvc.ilk
  3. BIN bin64/cardboard_msvc.pdb
  4. +13 −13 cardboard_unix
  5. +36 −2 data/menus.cfg
  6. BIN packages/bkg/blue/bkg1_bk.png
  7. BIN packages/bkg/blue/bkg1_dn.png
  8. BIN packages/bkg/blue/bkg1_ft.png
  9. BIN packages/bkg/blue/bkg1_lf.png
  10. BIN packages/bkg/blue/bkg1_rt.png
  11. BIN packages/bkg/blue/bkg1_up.png
  12. BIN packages/bkg/lightblue/bkg1_bk.png
  13. BIN packages/bkg/lightblue/bkg1_dn.png
  14. BIN packages/bkg/lightblue/bkg1_ft.png
  15. BIN packages/bkg/lightblue/bkg1_lf.png
  16. BIN packages/bkg/lightblue/bkg1_rt.png
  17. BIN packages/bkg/lightblue/bkg1_up.png
  18. BIN packages/bkg/red/bkg1_bk.png
  19. BIN packages/bkg/red/bkg1_dn.png
  20. BIN packages/bkg/red/bkg1_ft.png
  21. BIN packages/bkg/red/bkg1_lf.png
  22. BIN packages/bkg/red/bkg1_rt.png
  23. BIN packages/bkg/red/bkg1_up.png
  24. BIN packages/bkg/red/bkg2_bk.png
  25. BIN packages/bkg/red/bkg2_dn.png
  26. BIN packages/bkg/red/bkg2_ft.png
  27. BIN packages/bkg/red/bkg2_lf.png
  28. BIN packages/bkg/red/bkg2_rt.png
  29. BIN packages/bkg/red/bkg2_up.png
  30. BIN packages/bkg/red/bkg3_bk.png
  31. BIN packages/bkg/red/bkg3_dn.png
  32. BIN packages/bkg/red/bkg3_ft.png
  33. BIN packages/bkg/red/bkg3_lf.png
  34. BIN packages/bkg/red/bkg3_rt.png
  35. BIN packages/bkg/red/bkg3_up.png
  36. BIN packages/hud/items.pdn
  37. BIN packages/hud/items.png
  38. +13 −0 packages/kurt/space.txt
  39. BIN packages/kurt/space_bk.png
  40. BIN packages/kurt/space_dn.png
  41. BIN packages/kurt/space_ft.png
  42. BIN packages/kurt/space_lf.png
  43. BIN packages/kurt/space_rt.png
  44. BIN packages/kurt/space_up.png
  45. +0 −100 packages/models/projectiles/contactgrenade/license.txt
  46. BIN packages/models/projectiles/contactgrenade/masks.jpg
  47. +0 −4 packages/models/projectiles/contactgrenade/md3.cfg
  48. BIN packages/models/projectiles/contactgrenade/skin.jpg
  49. BIN packages/models/projectiles/contactgrenade/tris.md3
  50. +6 −98 packages/models/projectiles/grenade/license.txt
  51. BIN packages/models/projectiles/grenade/masks.jpg
  52. BIN packages/models/projectiles/grenade/masks.png
  53. +0 −4 packages/models/projectiles/grenade/md3.cfg
  54. +6 −0 packages/models/projectiles/grenade/obj.cfg
  55. BIN packages/models/projectiles/grenade/skin.jpg
  56. BIN packages/models/projectiles/grenade/skin.png
  57. BIN packages/models/projectiles/grenade/tris.blend
  58. BIN packages/models/projectiles/grenade/tris.md3
  59. BIN packages/models/projectiles/grenade/tris.png
  60. BIN packages/skyboxes/test/cubetable512.dds
  61. BIN packages/skyboxes/test/negative-x.tga
  62. BIN packages/skyboxes/test/negative-y.tga
  63. BIN packages/skyboxes/test/negative-z.tga
  64. BIN packages/skyboxes/test/positive-x.tga
  65. BIN packages/skyboxes/test/positive-y.tga
  66. BIN packages/skyboxes/test/positive-z.tga
  67. +6 −0 packages/skyboxes/test/readme
  68. BIN packages/skyboxes/test/test_bk.png
  69. BIN packages/skyboxes/test/test_dn.png
  70. BIN packages/skyboxes/test/test_ft.png
  71. BIN packages/skyboxes/test/test_lf.png
  72. BIN packages/skyboxes/test/test_rt.png
  73. BIN packages/skyboxes/test/test_up.png
  74. +202 −0 res/cardboard.c
  75. BIN res/cardboard.png
  76. +2 −2 src/engine/animmodel.h
  77. +1 −1 src/engine/blob.cpp
  78. +3 −3 src/engine/lightmap.cpp
  79. +230 −1 src/engine/main.cpp
  80. +15 −3 src/engine/octaedit.cpp
  81. +1 −0 src/engine/rendermodel.cpp
  82. +1 −1 src/engine/serverbrowser.cpp
  83. +23 −5 src/fpsgame/fps.cpp
  84. +3 −3 src/fpsgame/game.h
  85. +1 −0 src/shared/iengine.h
  86. +5 −1 src/shared/tools.h
  87. +1 −1 src/vcpp/cardboard.nsi
@@ -1,21 +1,26 @@
version: 1.0.{build}
image:
- Ubuntu1804
- Visual Studio 2019
configuration:
- Debug
- Release
platform:
- x86
- x64
shallow_clone: true
build:
verbosity: minimal
environment:
verbosity: normal
after_build:
- cmd: '"C:\Program Files (x86)\NSIS\makensis.exe" src\vcpp\cardboard.nsi'
artifacts:
- path: src/vcpp/crimson_alpha_win_setup.exe
name: Install
for:
-
matrix:
- GENERATOR: "Visual Studio 16 2019"
CONFIGURATION: Debug
TOOLSET: v142
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019"
- GENERATOR: "Visual Studio 16 2019 Win64"
CONFIGURATION: Debug
TOOLSET: v142
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019"
- GENERATOR: "Visual Studio 16 2019"
CONFIGURATION: Release
TOOLSET: v142
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019"
- GENERATOR: "Visual Studio 16 2019 Win64"
CONFIGURATION: Release
TOOLSET: v142
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019"
only:
- image: Ubuntu1804

build_script:
- echo Ubuntu build script test
BIN -1.06 MB (91%) bin64/cardboard_msvc.ilk
Binary file not shown.
BIN -848 KB (95%) bin64/cardboard_msvc.pdb
Binary file not shown.
@@ -1,15 +1,15 @@
#!/bin/sh
# SAUER_DATA should refer to the directory in which Sauerbraten data files are placed.
#SAUER_DATA=~/sauerbraten
#SAUER_DATA=/usr/local/sauerbraten
SAUER_DATA=.
# CARD_DATA should refer to the directory in which Project Crimson data files are placed.
#CARD_DATA=~/cardboard
#CARD_DATA=/usr/local/cardboard
CARD_DATA=.

# SAUER_BIN should refer to the directory in which Sauerbraten executable files are placed.
SAUER_BIN=${SAUER_DATA}/bin_unix
# CARD_BIN should refer to the directory in which Project Crimson executable files are placed.
CARD_BIN=${CARD_DATA}/bin_unix

# SAUER_OPTIONS contains any command line options you would like to start Sauerbraten with.
#SAUER_OPTIONS="-f"
SAUER_OPTIONS="-q${HOME}/.cardboard"
# CARD_OPTIONS contains any command line options you would like to start Project Crimson with.
#CARD_OPTIONS="-f"
CARD_OPTIONS="-q${HOME}/.cardboard"

# SYSTEM_NAME should be set to the name of your operating system.
#SYSTEM_NAME=Linux
@@ -44,16 +44,16 @@ x86_64|amd64)
;;
esac

if [ -x ${SAUER_BIN}/native_client ]
if [ -x ${CARD_BIN}/native_client ]
then
SYSTEM_NAME=native_
MACHINE_NAME=
fi

if [ -x ${SAUER_BIN}/${SYSTEM_NAME}${MACHINE_NAME}client ]
if [ -x ${CARD_BIN}/${SYSTEM_NAME}${MACHINE_NAME}client ]
then
cd ${SAUER_DATA}
exec ${SAUER_BIN}/${SYSTEM_NAME}${MACHINE_NAME}client ${SAUER_OPTIONS} "$@"
cd ${CARD_DATA}
exec ${CARD_BIN}/${SYSTEM_NAME}${MACHINE_NAME}client ${CARD_OPTIONS} "$@"
else
echo "Your platform does not have a pre-compiled Cardboard Engine client."
echo "Please follow the following steps to build a native client:"
@@ -537,6 +537,14 @@ newgui skybox [
showskyshot
]
]
guitab 3
guilist [
guistayopen [
guilist [ genskyitems $skies5 ]
guilist [ genskyitems $skies6 ]
showskyshot
]
]
guitab Config
guitext (mapcfgname)
@@ -619,14 +627,40 @@ staffy/staffy
ulukai/redeclipse
ulukai/corona
]
skies5 = [
red/clouds
red/clouds2
red/gradient
red/grey
red/interstellar
red/miramar
red/skyhigh
red/skylump
red/skylump2
red/stars
red/stormydays
red/sunsetflat
red/yellow
loopix/daysky
skorpio/weltraum
kurt/space
skyboxes/test/test
]
skies6 = [
bkg/blue/bkg1
bkg/lightblue/bkg1
bkg/red/bkg1
bkg/red/bkg2
bkg/red/bkg3
]
genskyitems = [
looplist cursky $arg1 [
guibutton $cursky (concat skybox $cursky) //"cube"
guibutton $cursky (concat skybox $cursky)
]
]
alias showskyshot [ guibar; guiimage (concatword "<thumbnail:128>packages/" (if (> $numargs 0) [result $arg1] [result (at $guirollovername 0)]) "_ft.jpg") $guirolloveraction 4 1 "data/cube.png"]
alias showskyshot [ guibar; guiimage (concatword "<thumbnail:128>packages/" (if (> $numargs 0) [result $arg1] [result (at $guirollovername 0)]) "_ft.jpg") $guirolloveraction 4 1 "data/cardboard.png"]
newgui materials [
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file not shown.
BIN -13.1 KB (75%) packages/hud/items.png
Diff not rendered.
@@ -0,0 +1,13 @@
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
Version 2, December 2004

Copyright (C) 2004 Sam Hocevar
14 rue de Plaisance, 75014 Paris, France
Everyone is permitted to copy and distribute verbatim or modified
copies of this license document, and changing it is allowed as long
as the name is changed.

DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

0. You just DO WHAT THE FUCK YOU WANT TO.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.

This file was deleted.

Diff not rendered.

This file was deleted.

Diff not rendered.
Binary file not shown.
@@ -1,100 +1,8 @@
Description

===========

Files in this folder:



by "makkE"

Markus Bekel

e-mail: makk_e@web.de



===================================================================================================

These files have been licensed under a the

"Creative Commons Deed / Attribution Non-commercial Share-Alike ( at-nc-sa )"

===================================================================================================



You are free:



* to copy, distribute, display, and perform the work

* to make derivative works



Under the following conditions:



"by"

-Attribution. You must give the original author credit.

"nc"

-Non-Commercial. You may not use this work for commercial purposes.

"sa"

-Share Alike. If you alter, transform, or build upon this work, you may distribute the resulting work only under a licence identical to this one.



* For any reuse or distribution, you must make clear to others the licence terms of this work.

* Any of these conditions can be waived if you get permission from the copyright holder.



Your fair use and other rights are in no way affected by the above.



This is a human-readable summary of the Legal Code (the full licence).



=====================================================================================================



See:



http://creativecommons.org/licenses/by-nc-sa/2.5/deed.en_GB



for the original "human readable" document.



http://creativecommons.org/licenses/by-nc-sa/2.5/legalcode



for the full legal code.



visit creativecommons.org for general information and translations of the above documents.





Made by Yellowberry
https://yello.ooo
Contact: yellowberry@cocaine.ninja

Licensed under CC0.
Use it for whatever you want, I don't care.

People that use the NC license can eat my ass.
Diff not rendered.
Diff not rendered.

This file was deleted.

@@ -0,0 +1,6 @@
objdir projectiles/grenade
objload tris.obj
objskin * "<dds>skin.png" "<dds>masks.png"
mdlambient 50
mdlspec 150
mdlscale 750
Diff not rendered.
Diff not rendered.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,6 @@
subetable512.dds - it https://ru.wikipedia.org/wiki/DirectDraw_Surface
texture have 6 layers. it cube texture like OpenGL textureCube


In addition, six textures for self-construction of a cubic map file names match the side of the cube

Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.

0 comments on commit 95cacef

Please sign in to comment.
You can’t perform that action at this time.