Skip to content
Permalink
Browse files

Fixing branch disparity

  • Loading branch information
YellowberryHN committed Jan 15, 2020
2 parents 5322fd5 + 6343e3a commit d79a43ee84d3dbf7eae3ed1320ceb71afadfda53
Showing with 159,263 additions and 63,267 deletions.
  1. +4 −1 .gitignore
  2. +4 −0 .itch.toml
  3. BIN Newtonsoft.Json.dll
  4. +1 −1 appveyor.yml
  5. BIN bin/cardboard_msvc.exp
  6. BIN bin/cardboard_msvc.lib
  7. +0 −22,500 bin/cardboard_msvc.map
  8. BIN bin/cardboard_msvc.pdb
  9. BIN bin64/cardboard_msvc.exp
  10. BIN bin64/cardboard_msvc.ilk
  11. BIN bin64/cardboard_msvc.lib
  12. +0 −39,293 bin64/cardboard_msvc.map
  13. BIN bin64/cardboard_msvc.pdb
  14. +3 −9 config.cfg
  15. +5 −5 data/default_map_settings.cfg
  16. +1 −2 data/defaults.cfg
  17. +453 −0 data/extra/ao1edit.cfg
  18. +1 −1 data/keymap.cfg
  19. +0 −313 data/menu.trans.txt
  20. +19 −79 data/menus.cfg
  21. BIN data/splash.png
  22. +0 −20 data/translatetest.txt
  23. +2 −1 docs/editref.html
  24. +6 −3 docs/index.html
  25. +6 −0 launcher.json
  26. +19 −0 license/LICENSE.microtar.txt
  27. +0 −2 packages/FBP/LICENSE
  28. BIN packages/FBP/chroms/chrom.png
  29. BIN packages/FBP/chroms/gold.png
  30. +0 −42 packages/FBP/chroms/package.cfg
  31. +0 −106 packages/FBP/colored_tiles/package_chrom.cfg
  32. +0 −143 packages/FBP/colored_tiles/package_glow.cfg
  33. +0 −65 packages/FBP/colored_tiles/package_mat.cfg
  34. +0 −105 packages/FBP/colored_tiles/package_spec.cfg
  35. BIN packages/FBP/colored_tiles/tile_000.png
  36. BIN packages/FBP/colored_tiles/tile_008.png
  37. BIN packages/FBP/colored_tiles/tile_00f.png
  38. BIN packages/FBP/colored_tiles/tile_060.png
  39. BIN packages/FBP/colored_tiles/tile_088.png
  40. BIN packages/FBP/colored_tiles/tile_08f.png
  41. BIN packages/FBP/colored_tiles/tile_0cc.png
  42. BIN packages/FBP/colored_tiles/tile_0cf.png
  43. BIN packages/FBP/colored_tiles/tile_0f0.png
  44. BIN packages/FBP/colored_tiles/tile_0f8.png
  45. BIN packages/FBP/colored_tiles/tile_0ff.png
  46. BIN packages/FBP/colored_tiles/tile_440.png
  47. BIN packages/FBP/colored_tiles/tile_600.png
  48. BIN packages/FBP/colored_tiles/tile_606.png
  49. BIN packages/FBP/colored_tiles/tile_60f.png
  50. BIN packages/FBP/colored_tiles/tile_666.png
  51. BIN packages/FBP/colored_tiles/tile_66f.png
  52. BIN packages/FBP/colored_tiles/tile_880.png
  53. BIN packages/FBP/colored_tiles/tile_888.png
  54. BIN packages/FBP/colored_tiles/tile_88f.png
  55. BIN packages/FBP/colored_tiles/tile_a0f.png
  56. BIN packages/FBP/colored_tiles/tile_aaf.png
  57. BIN packages/FBP/colored_tiles/tile_ccc.png
  58. BIN packages/FBP/colored_tiles/tile_cf0.png
  59. BIN packages/FBP/colored_tiles/tile_cfc.png
  60. BIN packages/FBP/colored_tiles/tile_f00.png
  61. BIN packages/FBP/colored_tiles/tile_f06.png
  62. BIN packages/FBP/colored_tiles/tile_f08.png
  63. BIN packages/FBP/colored_tiles/tile_f0f.png
  64. BIN packages/FBP/colored_tiles/tile_f60.png
  65. BIN packages/FBP/colored_tiles/tile_f66.png
  66. BIN packages/FBP/colored_tiles/tile_f80.png
  67. BIN packages/FBP/colored_tiles/tile_f88.png
  68. BIN packages/FBP/colored_tiles/tile_f8f.png
  69. BIN packages/FBP/colored_tiles/tile_faf.png
  70. BIN packages/FBP/colored_tiles/tile_fc0.png
  71. BIN packages/FBP/colored_tiles/tile_fcc.png
  72. BIN packages/FBP/colored_tiles/tile_ff0.png
  73. BIN packages/FBP/colored_tiles/tile_ff6.png
  74. BIN packages/FBP/colored_tiles/tile_ffc.png
  75. BIN packages/FBP/colored_tiles/tile_fff.png
  76. BIN packages/base/blah/space_ship
  77. +4 −0 packages/base/blah/space_ship.cfg
  78. BIN packages/base/blah/space_ship.cmr.gz
  79. BIN packages/base/blah/space_ship.cmz
  80. BIN packages/base/blah/space_ship.tar
  81. BIN packages/base/blah/space_ship.wpt
  82. BIN packages/base/duabo.cmr
  83. BIN packages/base/duabo.png
  84. BIN packages/base/duabo.wpt
  85. BIN packages/base/duabo_big.png
  86. BIN packages/base/flux.cmr
  87. BIN packages/base/fz_burn.cmr
  88. BIN packages/base/fz_burn_big.png
  89. BIN packages/base/hr_big.png
  90. BIN packages/base/illusion.cmr
  91. BIN packages/base/maze_big.png
  92. BIN packages/base/neo_falls.cmr
  93. BIN packages/base/neo_noir.cmr
  94. BIN packages/base/neo_noir_big.png
  95. BIN packages/base/retrograde.cmr
  96. BIN packages/base/ruins.cmr
  97. +4 −0 packages/base/space_ship.cfg
  98. BIN packages/base/space_ship.cmr
  99. BIN packages/base/space_ship.wpt
  100. BIN packages/base/zigguraut.png
  101. BIN packages/hirato/lava.jpg
  102. BIN packages/hirato/lava.old
  103. +2 −2 packages/lang/en_US.cfg
  104. +230 −0 packages/lang/nl_NL.cfg
  105. +102 −0 packages/models/flags/tris.obj
  106. +2 −2 packages/models/nn/obj.cfg
  107. +2,202 −0 packages/models/nn/tris.obj
  108. +20,349 −0 packages/models/nobiax/hedge/arch/HedgeArch.obj
  109. +4,962 −0 packages/models/nobiax/hedge/long/HedgeLong.obj
  110. +5,166 −0 packages/models/nobiax/hedge/longround/HedgeLongRound.obj
  111. +2,577 −0 packages/models/nobiax/hedge/small/HedgeSmall.obj
  112. +2,674 −0 packages/models/nobiax/hedge/smallround/HedgeSmallRound.obj
  113. +2,139 −0 packages/models/nobiax/pipes/l/L.obj
  114. +905 −0 packages/models/nobiax/pipes/o/O.obj
  115. +3,353 −0 packages/models/nobiax/pipes/t/T.obj
  116. +128 −0 packages/models/nobiax/pipes/u/U.obj
  117. +1,304 −0 packages/models/nobiax/pipes/y/Y.obj
  118. +2,364 −0 packages/models/nobiax/rock3/rocks_03.obj
  119. +1,550 −0 packages/models/para/rock/c1/rock_c_01.obj
  120. +1,078 −0 packages/models/para/rock/d1/rock_d_01.obj
  121. +1,078 −0 packages/models/para/rock/d2/rock_d_02.obj
  122. +1,078 −0 packages/models/para/rock/d3/rock_d_03.obj
  123. +1,078 −0 packages/models/para/rock/d5/rock_d_05.obj
  124. +1,078 −0 packages/models/para/rock/d6/rock_d_06.obj
  125. +420 −0 packages/models/projectiles/grenade/tris.obj
  126. +855 −0 packages/models/projectiles/rocket/tris.md3.obj
  127. +2,667 −0 packages/models/ulf/pumpkin/pumpkin.obj
  128. +1 −1 packages/music/adwh/soundtrack.cfg
  129. BIN packages/music/pcv/1.ogg
  130. BIN packages/music/pcv/2.ogg
  131. BIN packages/music/pcv/3.ogg
  132. BIN packages/music/pcv/4.ogg
  133. BIN packages/music/pcv/5.ogg
  134. BIN packages/music/pcv/6.ogg
  135. BIN packages/music/pcv/7.ogg
  136. BIN packages/music/pcv/8.ogg
  137. BIN packages/music/pcv/9.ogg
  138. +7 −0 packages/music/pcv/soundtrack.cfg
  139. +3 −3 packages/philipk/pk02/packages.cfg
  140. BIN packages/soundpacks/default/sam/heartbeat.ogg
  141. +159 −0 packages/textures/FBP.cfg
  142. +69 −0 res/Cardboard Logo Revisions.svg
  143. BIN res/Crimson-Gray.png
  144. +1,603 −0 res/Crimson-itch-template.pdn
  145. BIN res/Crimson-itch-template.png
  146. BIN res/CrimsonLogo-Black.png
  147. BIN res/CrimsonLogo.png
  148. BIN res/Final-1024.png
  149. BIN res/Final-128.png
  150. BIN res/Final-16.png
  151. BIN res/Final-32.png
  152. BIN res/Final-512.png
  153. BIN res/Final-64.png
  154. BIN res/Final.ico
  155. BIN res/Final.png
  156. +9 −0 res/Final.svg
  157. BIN res/SplashScreen-16-9.pdn
  158. BIN res/SplashScreen-16-9.png
  159. +146 −184 res/cardboard.c
  160. BIN res/duabo.png
  161. BIN res/fz_burn1.png
  162. BIN res/fz_burn2.png
  163. BIN res/fz_burn3.png
  164. BIN res/fz_burn4.png
  165. BIN res/neo_falls.png
  166. BIN res/reference/{cosmetics → characters}/char_amber.png
  167. BIN res/reference/{cosmetics → characters}/char_ashley.png
  168. BIN res/reference/{cosmetics → characters}/char_ashley_nologo.png
  169. BIN res/reference/{cosmetics → characters}/char_ashley_old.png
  170. BIN res/reference/{cosmetics → characters}/char_ashley_old_nologo.png
  171. BIN res/reference/{cosmetics → characters}/char_bea.png
  172. BIN res/reference/{cosmetics → characters}/char_bea_old.png
  173. BIN res/reference/{cosmetics → characters}/char_emily.png
  174. BIN res/reference/{cosmetics → characters}/char_sarah.png
  175. BIN res/reference/{cosmetics → characters}/char_savannah.png
  176. BIN res/reference/characters/cm3d2/Characters.png
  177. BIN res/reference/{cosmetics → characters/cm3d2}/Emily_3Dmodel_cropped.png
  178. BIN res/reference/{cosmetics → characters}/group_photo_1.pdn
  179. BIN res/reference/{cosmetics → characters}/group_photo_1.png
  180. BIN res/reference/{cosmetics → characters}/group_photo_2.pdn
  181. BIN res/reference/{cosmetics → characters}/group_photo_3.pdn
  182. 0 res/reference/{cosmetics → characters}/group_photo_4.pdn
  183. 0 res/reference/{cosmetics → characters}/group_photo_final.pdn
  184. BIN res/reference/{cosmetics → characters}/group_photo_final.png
  185. +1 −9 restore.cfg
  186. +1 −0 servers.cfg
  187. +3 −1 src/Makefile
  188. +1 −1 src/engine/3dgui.cpp
  189. +4 −8 src/engine/client.cpp
  190. +21 −2 src/engine/command.cpp
  191. +3 −1 src/engine/engine.h
  192. +250 −242 src/engine/main.cpp
  193. +4 −2 src/engine/material.cpp
  194. +9 −1 src/engine/octaedit.cpp
  195. +5 −3 src/engine/physics.cpp
  196. +1 −0 src/engine/rendergl.cpp
  197. +1 −3 src/engine/renderva.cpp
  198. +11 −0 src/engine/sound.cpp
  199. +18 −0 src/engine/texture.cpp
  200. +10 −5 src/engine/translate.cpp
  201. +3 −3 src/engine/water.cpp
  202. +2 −0 src/engine/world.cpp
  203. +118 −3 src/engine/worldio.cpp
  204. +7 −14 src/fpsgame/client.cpp
  205. +21 −1 src/fpsgame/ctf.h
  206. +30 −1 src/fpsgame/discord.cpp
  207. +2 −0 src/fpsgame/entities.cpp
  208. +34 −26 src/fpsgame/fps.cpp
  209. +9 −6 src/fpsgame/game.h
  210. +71 −20 src/fpsgame/scoreboard.cpp
  211. +11 −9 src/fpsgame/server.cpp
  212. +0 −1 src/fpsgame/weapon.cpp
  213. +1 −1 src/fpsgame/weapon.h
  214. +4 −0 src/launcher/.gitignore
  215. +105 −0 src/launcher/CardboardLauncher.csproj
  216. +9 −0 src/launcher/CardboardLauncher.csproj.user
  217. +152 −0 src/launcher/GametokenDialog.Designer.cs
  218. +72 −0 src/launcher/GametokenDialog.cs
  219. +437 −0 src/launcher/GametokenDialog.resx
  220. +414 −0 src/launcher/MainForm.Designer.cs
  221. +308 −0 src/launcher/MainForm.cs
  222. +443 −0 src/launcher/MainForm.resx
  223. +19 −0 src/launcher/Program.cs
  224. +36 −0 src/launcher/Properties/AssemblyInfo.cs
  225. +83 −0 src/launcher/Properties/Resources.Designer.cs
  226. +127 −0 src/launcher/Properties/Resources.resx
  227. +26 −0 src/launcher/Properties/Settings.Designer.cs
  228. +7 −0 src/launcher/Properties/Settings.settings
  229. +3 −0 src/launcher/app.config
  230. BIN src/launcher/cardboard.ico
  231. +6 −0 src/launcher/launcher.json
  232. +4 −0 src/launcher/packages.config
  233. BIN src/launcher/res/close.png
  234. BIN src/launcher/res/close_click.png
  235. BIN src/lib/libdiscord-rpc.a
  236. BIN src/lib64/libdiscord-rpc.a
  237. +5 −10 src/shared/cube.h
  238. +1 −0 src/shared/iengine.h
  239. +0 −1 src/shared/igame.h
  240. +376 −0 src/shared/microtar.c
  241. +90 −0 src/shared/microtar.h
  242. +19 −0 src/shared/stream.cpp
  243. +5 −1 src/shared/tools.h
  244. +6 −2 src/vcpp/cardboard.cbp
  245. BIN src/vcpp/cardboard.ico
  246. +1 −1 src/vcpp/cardboard.nsi
  247. +40 −2 src/vcpp/cardboard.sln
  248. +11 −0 src/vcpp/cardboard.vcxproj
  249. +37 −0 src/vcpp/cardboard.vcxproj.filters
  250. +4 −4 src/vcpp/cardboard.vcxproj.user
  251. BIN src/vcpp/packages/Newtonsoft.Json.12.0.3/.signature.p7s
  252. +20 −0 src/vcpp/packages/Newtonsoft.Json.12.0.3/LICENSE.md
  253. BIN src/vcpp/packages/Newtonsoft.Json.12.0.3/Newtonsoft.Json.12.0.3.nupkg
  254. BIN src/vcpp/packages/Newtonsoft.Json.12.0.3/lib/net20/Newtonsoft.Json.dll
  255. +10,298 −0 src/vcpp/packages/Newtonsoft.Json.12.0.3/lib/net20/Newtonsoft.Json.xml
  256. BIN src/vcpp/packages/Newtonsoft.Json.12.0.3/lib/net35/Newtonsoft.Json.dll
  257. +9,446 −0 src/vcpp/packages/Newtonsoft.Json.12.0.3/lib/net35/Newtonsoft.Json.xml
  258. BIN src/vcpp/packages/Newtonsoft.Json.12.0.3/lib/net40/Newtonsoft.Json.dll
  259. +9,646 −0 src/vcpp/packages/Newtonsoft.Json.12.0.3/lib/net40/Newtonsoft.Json.xml
  260. BIN src/vcpp/packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.dll
  261. +11,262 −0 src/vcpp/packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.xml
  262. BIN src/vcpp/packages/Newtonsoft.Json.12.0.3/lib/netstandard1.0/Newtonsoft.Json.dll
  263. +10,950 −0 src/vcpp/packages/Newtonsoft.Json.12.0.3/lib/netstandard1.0/Newtonsoft.Json.xml
  264. BIN src/vcpp/packages/Newtonsoft.Json.12.0.3/lib/netstandard1.3/Newtonsoft.Json.dll
  265. +11,072 −0 src/vcpp/packages/Newtonsoft.Json.12.0.3/lib/netstandard1.3/Newtonsoft.Json.xml
  266. BIN src/vcpp/packages/Newtonsoft.Json.12.0.3/lib/netstandard2.0/Newtonsoft.Json.dll
  267. +11,237 −0 src/vcpp/packages/Newtonsoft.Json.12.0.3/lib/netstandard2.0/Newtonsoft.Json.xml
  268. BIN src/vcpp/packages/Newtonsoft.Json.12.0.3/lib/portable-net40+sl5+win8+wp8+wpa81/Newtonsoft.Json.dll
  269. +9,010 −0 src/vcpp/packages/Newtonsoft.Json.12.0.3/lib/portable-net40+sl5+win8+wp8+wpa81/Newtonsoft.Json.xml
  270. BIN src/vcpp/packages/Newtonsoft.Json.12.0.3/lib/portable-net45+win8+wp8+wpa81/Newtonsoft.Json.dll
  271. +10,950 −0 src/vcpp/packages/Newtonsoft.Json.12.0.3/lib/portable-net45+win8+wp8+wpa81/Newtonsoft.Json.xml
  272. BIN src/vcpp/packages/Newtonsoft.Json.12.0.3/packageIcon.png
@@ -3,6 +3,7 @@
*.lo
*.o
*.obj
!/packages/

# Executables
*.exe
@@ -22,4 +23,6 @@
# Visual Studio trash
*.map
*.ilk
*.exp
*.exp

*msvc.lib
@@ -0,0 +1,4 @@
[[actions]]
name = "play"
path = "launcher.exe"
platform = "windows"
BIN +561 KB Newtonsoft.Json.dll
Binary file not shown.
@@ -16,7 +16,7 @@ for:
- image: Visual Studio 2019
# shit ain't working, fix later.

# APPVEYOR_REPO_TAG: true
APPVEYOR_REPO_TAG: true

after_build:
- cmd: >-
BIN -11.2 KB bin/cardboard_msvc.exp
Binary file not shown.
BIN -19.6 KB bin/cardboard_msvc.lib
Binary file not shown.

This file was deleted.

BIN -14.8 MB bin/cardboard_msvc.pdb
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
@@ -4,7 +4,6 @@

name "CardboardPlayer"

__gametoken ""
ammohud 1
aniso 0
applydialog 1
@@ -47,7 +46,6 @@ connectname ""
connectport 0
conscale 0.275
consize 5
crosshaircolors 1
crosshairfx 1
crosshairsize 15
cursorsize 30
@@ -104,7 +102,7 @@ grassstep 2.0
grasstaper 0.2
gui2d 1
guiautotab 16
guiclicktab 0
guiclicktab 1
guifadein 1
guifollow 1
guipushdist 4
@@ -119,7 +117,6 @@ hudgunsdir ""
hudgunsway 1
invmouse 0
lightthreads 0
maxbarreldebris 10
maxcon 200
maxdebris 25
maxdecaldistance 512
@@ -134,7 +131,6 @@ maxradarscale 1024
maxreflect 2
maxroll 0
maxservpings 10
maxsoundradius 340
maxsoundsatonce 7
maxtexsize 0
maxtrail 500
@@ -179,7 +175,6 @@ screenshotdir ""
screenshotformat 2
searchlan 0
sensitivity 3.0
sensitivityscale 1.0
servpingdecay 15000
servpingrate 5000
shaderdetail 3
@@ -204,7 +199,6 @@ showservinfo 1
showspectators 1
showvel 1
skyboxglare 1
slowmosp 0
smoothdist 32
smoothmove 75
soundpack "default"
@@ -273,16 +267,15 @@ bind "I" [taunt]
bind "INSERT" [addbot]
bind "KP_MINUS" [conskip 5]
bind "KP_PLUS" [conskip -1000]
bind "LCTRL" [allowspedit]
bind "LEFT" [left]
bind "MOUSE1" [attack]
bind "MOUSE2" [togglezoom]
bind "MOUSE3" [weapon]
bind "MOUSE4" [cycleweapon 6 5 4 3 2 1 0]
bind "MOUSE5" [cycleweapon 0 1 2 3 4 5 6]
bind "PAUSE" [paused (= $paused 0)]
bind "Q" [weapon]
bind "R" [dropflag]
bind "RCTRL" [allowspedit]
bind "RIGHT" [right]
bind "S" [backward]
bind "SLASH" [saycommand /]
@@ -316,6 +309,7 @@ editbind "F3" [if (cleargui 1) [] [showentgui]]
editbind "F4" [if (cleargui 1) [] [showgui mapmodels]]
editbind "F5" [savemap]
editbind "F6" [notepad (mapcfgname)]
editbind "F7" [ao1edit]
editbind "F9" [echo (getseltex) : (gettexname (getseltex))]
editbind "G" [domodifier 1]
editbind "H" [if $hmapedit [ editface 1 -1 ] [ hmapedit 1 ]]
@@ -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"
@@ -79,8 +79,6 @@ bind SLASH "saycommand /"
bind I taunt
bind RALT edittoggle
bind LCTRL "allowspedit"
bind RCTRL "allowspedit"
bind KP_MINUS "conskip 5"
bind KP_PLUS "conskip -1000"
@@ -173,6 +171,7 @@ editbind F3 [if (cleargui 1) [] [showentgui]]
editbind F4 [if (cleargui 1) [] [showgui mapmodels]]
editbind F5 savemap
editbind F6 [ notepad (mapcfgname) ]
editbind F7 [ao1edit]
editbind F9 [echo (getseltex) : (gettexname (getseltex))] // echo texture info
// commands below are used with scroll wheel (and universaldelta).

0 comments on commit d79a43e

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