Skip to content
Permalink
Browse files

Alpha 2.1.1, a sticky situation (tar)

- Removed the FBP colored_tiles textures, replaced with placeholders.
- Added microtar library for future use and added test functions
- Made clan tags show only in scoreboard
- Added ability to save map configs alongside map
- Updated 'space_ship' map
- Fixed textures in pk02 pack with incorrect glowmaps
- Updated Makefile and C::B project file
- Added new Cardboard Engine logo by Mocadium (thanks!)
- Updated Cardboard Launcher to version 1.1
- Added Dutch (nl_NL) translation by bailey
  • Loading branch information
YellowberryHN committed Jan 15, 2020
1 parent 7e03e0a commit 6343e3ae218a7d2aea6c715b8988a653349cdef8
Showing with 2,106 additions and 1,042 deletions.
  1. +5 −5 data/default_map_settings.cfg
  2. +2 −1 launcher.json
  3. +19 −0 license/LICENSE.microtar.txt
  4. +0 −2 packages/FBP/LICENSE
  5. BIN packages/FBP/chroms/chrom.png
  6. BIN packages/FBP/chroms/gold.png
  7. +0 −42 packages/FBP/chroms/package.cfg
  8. +0 −106 packages/FBP/colored_tiles/package_chrom.cfg
  9. +0 −143 packages/FBP/colored_tiles/package_glow.cfg
  10. +0 −65 packages/FBP/colored_tiles/package_mat.cfg
  11. +0 −105 packages/FBP/colored_tiles/package_spec.cfg
  12. BIN packages/FBP/colored_tiles/tile_000.png
  13. BIN packages/FBP/colored_tiles/tile_008.png
  14. BIN packages/FBP/colored_tiles/tile_00f.png
  15. BIN packages/FBP/colored_tiles/tile_060.png
  16. BIN packages/FBP/colored_tiles/tile_088.png
  17. BIN packages/FBP/colored_tiles/tile_08f.png
  18. BIN packages/FBP/colored_tiles/tile_0cc.png
  19. BIN packages/FBP/colored_tiles/tile_0cf.png
  20. BIN packages/FBP/colored_tiles/tile_0f0.png
  21. BIN packages/FBP/colored_tiles/tile_0f8.png
  22. BIN packages/FBP/colored_tiles/tile_0ff.png
  23. BIN packages/FBP/colored_tiles/tile_440.png
  24. BIN packages/FBP/colored_tiles/tile_600.png
  25. BIN packages/FBP/colored_tiles/tile_606.png
  26. BIN packages/FBP/colored_tiles/tile_60f.png
  27. BIN packages/FBP/colored_tiles/tile_666.png
  28. BIN packages/FBP/colored_tiles/tile_66f.png
  29. BIN packages/FBP/colored_tiles/tile_880.png
  30. BIN packages/FBP/colored_tiles/tile_888.png
  31. BIN packages/FBP/colored_tiles/tile_88f.png
  32. BIN packages/FBP/colored_tiles/tile_a0f.png
  33. BIN packages/FBP/colored_tiles/tile_aaf.png
  34. BIN packages/FBP/colored_tiles/tile_ccc.png
  35. BIN packages/FBP/colored_tiles/tile_cf0.png
  36. BIN packages/FBP/colored_tiles/tile_cfc.png
  37. BIN packages/FBP/colored_tiles/tile_f00.png
  38. BIN packages/FBP/colored_tiles/tile_f06.png
  39. BIN packages/FBP/colored_tiles/tile_f08.png
  40. BIN packages/FBP/colored_tiles/tile_f0f.png
  41. BIN packages/FBP/colored_tiles/tile_f60.png
  42. BIN packages/FBP/colored_tiles/tile_f66.png
  43. BIN packages/FBP/colored_tiles/tile_f80.png
  44. BIN packages/FBP/colored_tiles/tile_f88.png
  45. BIN packages/FBP/colored_tiles/tile_f8f.png
  46. BIN packages/FBP/colored_tiles/tile_faf.png
  47. BIN packages/FBP/colored_tiles/tile_fc0.png
  48. BIN packages/FBP/colored_tiles/tile_fcc.png
  49. BIN packages/FBP/colored_tiles/tile_ff0.png
  50. BIN packages/FBP/colored_tiles/tile_ff6.png
  51. BIN packages/FBP/colored_tiles/tile_ffc.png
  52. BIN packages/FBP/colored_tiles/tile_fff.png
  53. BIN packages/base/space_ship.cmr
  54. +2 −2 packages/lang/en_US.cfg
  55. +230 −0 packages/lang/nl_NL.cfg
  56. +3 −3 packages/philipk/pk02/packages.cfg
  57. +159 −0 packages/textures/FBP.cfg
  58. +69 −0 res/Cardboard Logo Revisions.svg
  59. BIN res/Final-1024.png
  60. BIN res/Final-128.png
  61. BIN res/Final-16.png
  62. BIN res/Final-32.png
  63. BIN res/Final-512.png
  64. BIN res/Final-64.png
  65. BIN res/Final.ico
  66. BIN res/Final.png
  67. +9 −0 res/Final.svg
  68. +146 −184 res/cardboard.c
  69. +2 −0 src/Makefile
  70. +4 −8 src/engine/client.cpp
  71. +21 −0 src/engine/command.cpp
  72. +2 −0 src/engine/engine.h
  73. +205 −193 src/engine/main.cpp
  74. +9 −1 src/engine/octaedit.cpp
  75. +1 −3 src/engine/renderva.cpp
  76. +11 −0 src/engine/sound.cpp
  77. +17 −0 src/engine/texture.cpp
  78. +10 −5 src/engine/translate.cpp
  79. +118 −3 src/engine/worldio.cpp
  80. +5 −5 src/fpsgame/fps.cpp
  81. +5 −5 src/fpsgame/game.h
  82. +6 −6 src/fpsgame/scoreboard.cpp
  83. +2 −2 src/fpsgame/server.cpp
  84. +3 −3 src/launcher/CardboardLauncher.csproj
  85. +9 −0 src/launcher/CardboardLauncher.csproj.user
  86. +61 −6 src/launcher/GametokenDialog.Designer.cs
  87. +47 −6 src/launcher/GametokenDialog.cs
  88. +189 −52 src/launcher/MainForm.Designer.cs
  89. +147 −38 src/launcher/MainForm.cs
  90. +0 −2 src/launcher/Program.cs
  91. +3 −3 src/launcher/Properties/AssemblyInfo.cs
  92. +20 −0 src/launcher/Properties/Resources.Designer.cs
  93. +15 −5 src/launcher/Properties/Resources.resx
  94. BIN src/launcher/cardboard.ico
  95. +2 −1 src/launcher/launcher.json
  96. BIN src/launcher/res/close.png
  97. BIN src/launcher/res/close_click.png
  98. +5 −10 src/shared/cube.h
  99. +1 −0 src/shared/iengine.h
  100. +376 −0 src/shared/microtar.c
  101. +90 −0 src/shared/microtar.h
  102. +19 −0 src/shared/stream.cpp
  103. +3 −1 src/shared/tools.h
  104. +6 −2 src/vcpp/cardboard.cbp
  105. BIN src/vcpp/cardboard.ico
  106. +32 −20 src/vcpp/cardboard.sln
  107. +3 −0 src/vcpp/cardboard.vcxproj
  108. +9 −0 src/vcpp/cardboard.vcxproj.filters
  109. +4 −4 src/vcpp/cardboard.vcxproj.user
@@ -46,19 +46,19 @@ exec "packages/aard/package.cfg"
exec "packages/cloward/package.cfg"
exec "packages/loopix/package.cfg"
exec "packages/hirato/package.cfg"

// Placeholders, replace
exec "packages/textures/mikee.cfg"

exec "packages/rorschach/package2.cfg"

exec "packages/noctua/package.cfg"

exec "packages/tomek/package.cfg"
exec "packages/trak5/package.cfg"

exec "packages/FBP/colored_tiles/package_chrom.cfg"
exec "packages/FBP/colored_tiles/package_glow.cfg"
exec "packages/FBP/colored_tiles/package_mat.cfg"
exec "packages/FBP/colored_tiles/package_spec.cfg"
exec "packages/FBP/chroms/package.cfg"
// Placeholders, replace (156)
exec "packages/textures/FBP.cfg"

exec "packages/torley/desat/package.cfg"
exec "packages/torley/glass/package.cfg"
@@ -1,5 +1,6 @@
{
"gameToken": "",
"homeDir": "",
"webUrl": "https://harpnetstudios.com/hnid/launcher/"
"webUrl": "https://harpnetstudios.com/hnid/launcher/",
"qConnectServ": "hnss.gq"
}
@@ -0,0 +1,19 @@
Copyright (c) 2017 rxi

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 6343e3a

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