Skip to content
Permalink
Browse files

Alpha 2.0.1, the update that made 2.0 usable.

- Added a modified version of ao1edit, press F7 in edit mode
- Colorable lava!
- Gametoken fixes (-_- i'm so bad)
- Added itch app configurations
- Fixed gitignore
- 10% speed boost while holding melee
- Disabled envmaps until I can figure out why the fuck they break everything
- Tweaked jumppad behavior
- Added 'attackspawn' and 'jumpspawn' variables
- Added a splash screen
- Added better mapshots for some maps
- Updated to r5552 (Sauerbraten)
  • Loading branch information
YellowberryHN committed Dec 9, 2019
1 parent f9232a9 commit c867395787864a3dbe23b15a1532cc69c22638c9
Showing with 2,302 additions and 61,673 deletions.
  1. +5 −2 .gitignore
  2. +4 −0 .itch.toml
  3. BIN bin/cardboard_msvc.exp
  4. BIN bin/cardboard_msvc.lib
  5. +0 −22,106 bin/cardboard_msvc.map
  6. BIN bin/cardboard_msvc.pdb
  7. BIN bin64/cardboard_msvc.exp
  8. BIN bin64/cardboard_msvc.ilk
  9. BIN bin64/cardboard_msvc.lib
  10. +0 −39,440 bin64/cardboard_msvc.map
  11. BIN bin64/cardboard_msvc.pdb
  12. +2 −6 config.cfg
  13. +1 −0 data/defaults.cfg
  14. +453 −0 data/extra/ao1edit.cfg
  15. +1 −1 data/keymap.cfg
  16. +28 −20 data/menus.cfg
  17. BIN data/splash.png
  18. BIN packages/base/fz_burn_big.png
  19. BIN packages/base/hr_big.png
  20. BIN packages/base/maze_big.png
  21. BIN packages/base/neo_noir_big.png
  22. BIN packages/hirato/lava.jpg
  23. BIN packages/hirato/lava.old
  24. BIN res/Crimson-Gray.png
  25. +1,603 −0 res/Crimson-itch-template.pdn
  26. BIN res/Crimson-itch-template.png
  27. BIN res/SplashScreen-16-9.pdn
  28. BIN res/SplashScreen-16-9.png
  29. BIN res/fz_burn1.png
  30. BIN res/fz_burn2.png
  31. BIN res/fz_burn3.png
  32. BIN res/fz_burn4.png
  33. BIN res/neo_falls.png
  34. BIN res/new-logo.png
  35. BIN res/reference/{cosmetics → characters}/char_amber.png
  36. BIN res/reference/{cosmetics → characters}/char_ashley.png
  37. BIN res/reference/{cosmetics → characters}/char_ashley_nologo.png
  38. BIN res/reference/{cosmetics → characters}/char_ashley_old.png
  39. BIN res/reference/{cosmetics → characters}/char_ashley_old_nologo.png
  40. BIN res/reference/{cosmetics → characters}/char_bea.png
  41. BIN res/reference/{cosmetics → characters}/char_bea_old.png
  42. BIN res/reference/{cosmetics → characters}/char_emily.png
  43. BIN res/reference/{cosmetics → characters}/char_sarah.png
  44. BIN res/reference/{cosmetics → characters}/char_savannah.png
  45. BIN res/reference/characters/cm3d2/Characters.png
  46. BIN res/reference/{cosmetics → characters/cm3d2}/Emily_3Dmodel_cropped.png
  47. BIN res/reference/{cosmetics → characters}/group_photo_1.pdn
  48. BIN res/reference/{cosmetics → characters}/group_photo_1.png
  49. BIN res/reference/{cosmetics → characters}/group_photo_2.pdn
  50. BIN res/reference/{cosmetics → characters}/group_photo_3.pdn
  51. 0 res/reference/{cosmetics → characters}/group_photo_4.pdn
  52. 0 res/reference/{cosmetics → characters}/group_photo_final.pdn
  53. BIN res/reference/{cosmetics → characters}/group_photo_final.png
  54. +1 −6 restore.cfg
  55. +1 −0 servers.cfg
  56. +1 −1 src/engine/3dgui.cpp
  57. +0 −2 src/engine/command.cpp
  58. +1 −1 src/engine/engine.h
  59. +34 −36 src/engine/main.cpp
  60. +4 −2 src/engine/material.cpp
  61. +2 −0 src/engine/physics.cpp
  62. +1 −0 src/engine/texture.cpp
  63. +3 −3 src/engine/water.cpp
  64. +2 −0 src/engine/world.cpp
  65. +6 −9 src/fpsgame/client.cpp
  66. +21 −1 src/fpsgame/ctf.h
  67. +30 −1 src/fpsgame/discord.cpp
  68. +2 −0 src/fpsgame/entities.cpp
  69. +14 −15 src/fpsgame/fps.cpp
  70. +4 −1 src/fpsgame/game.h
  71. +68 −17 src/fpsgame/scoreboard.cpp
  72. +3 −2 src/fpsgame/server.cpp
  73. +0 −1 src/shared/igame.h
  74. +1 −0 src/vcpp/cardboard.vcxproj
  75. +6 −0 src/vcpp/cardboard.vcxproj.filters
@@ -2,7 +2,8 @@
*.slo
*.lo
*.o
# *.obj # this better not break shit
*.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 = "crimson_msvc.bat"
platform = "windows"
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.5 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.
@@ -47,7 +47,6 @@ connectname ""
connectport 0
conscale 0.275
consize 5
crosshaircolors 1
crosshairfx 1
crosshairsize 15
cursorsize 30
@@ -104,7 +103,7 @@ grassstep 2.0
grasstaper 0.2
gui2d 1
guiautotab 16
guiclicktab 0
guiclicktab 1
guifadein 1
guifollow 1
guipushdist 4
@@ -119,7 +118,6 @@ hudgunsdir ""
hudgunsway 1
invmouse 0
lightthreads 0
maxbarreldebris 10
maxcon 200
maxdebris 25
maxdecaldistance 512
@@ -134,7 +132,6 @@ maxradarscale 1024
maxreflect 2
maxroll 0
maxservpings 10
maxsoundradius 340
maxsoundsatonce 7
maxtexsize 0
maxtrail 500
@@ -179,7 +176,6 @@ screenshotdir ""
screenshotformat 2
searchlan 0
sensitivity 3.0
sensitivityscale 1.0
servpingdecay 15000
servpingrate 5000
shaderdetail 3
@@ -204,7 +200,6 @@ showservinfo 1
showspectators 1
showvel 1
skyboxglare 1
slowmosp 0
smoothdist 32
smoothmove 75
soundpack "default"
@@ -316,6 +311,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 ]]
@@ -173,6 +173,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 c867395

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