Skip to content
Permalink
Browse files

Alpha 2.0pre5, the language update

- Added crude translation support
- Started adding French translation
- Added DEVBUILD compile flag to make things a bit easier during development
- Added 'jumpreset' material
- Added programmatic editing commands
- Removed unneeded features
- Changed default conscale from 0.33 to 0.275
- Added 'showversion' command to allow turning on and off the version indicator
- Changed map format slightly, load and resave maps if created with old version to update them.
- Tweaked AI logic
- Tags are now shared with the other clients in a match
- Headshot logic (doesn't do anything yet)
- Tweaked in-game GUI slightly
- Updated Code::Blocks project file
- Added new maps to server rotation
  • Loading branch information
YellowberryHN committed Oct 25, 2019
1 parent b631921 commit 67528fbd2133c7f24978999f83ddc17b4df5d7e2
Showing with 2,802 additions and 1,377 deletions.
  1. BIN bin/cardboard_msvc.pdb
  2. BIN bin64/cardboard_msvc.ilk
  3. BIN bin64/cardboard_msvc.pdb
  4. +10 −14 config.cfg
  5. +0 −19 data/game_fps.cfg
  6. +1 −4 data/glsl.cfg
  7. +49 −0 data/lang.cfg
  8. +34 −37 data/maps.cfg
  9. +214 −293 data/menus.cfg
  10. +6 −19 data/stdedit.cfg
  11. +1 −1 init.cfg
  12. +2 −1 packages/cloward/readme.txt
  13. BIN packages/hud/hbar.png
  14. BIN packages/hud/hud_rpg.png
  15. BIN packages/hud/items.pdn
  16. BIN packages/hud/items.png
  17. BIN packages/hud/items.psd
  18. BIN packages/hud/items0.pdn
  19. BIN packages/hud/items0.png
  20. BIN packages/hud/itemsold.png
  21. BIN packages/hud/itemsolder.png
  22. BIN packages/hud/newitems.psd
  23. +230 −0 packages/lang/en_US.cfg
  24. +214 −0 packages/lang/fr_CA.cfg
  25. +342 −0 packages/lang/ref.txt
  26. +142 −0 packages/lang/ru_RU.cfg
  27. +6 −0 packages/models/projectiles/cgren/obj.cfg
  28. BIN packages/models/projectiles/cgren/skin.png
  29. BIN res/DiscordServer.png
  30. BIN res/DiscordServerCeleb.png
  31. BIN res/OGRS-rating.png
  32. BIN res/placeholder_oct.png
  33. BIN res/reference/cb_800x600.png
  34. +11 −12 restore.cfg
  35. +4 −31 server-init.cfg
  36. +26 −7 src/engine/3dgui.cpp
  37. +3 −1 src/engine/client.cpp
  38. +0 −14 src/engine/lang.cpp
  39. +13 −10 src/engine/main.cpp
  40. +10 −7 src/engine/material.cpp
  41. +34 −5 src/engine/octaedit.cpp
  42. +33 −22 src/engine/physics.cpp
  43. +18 −8 src/engine/rendergl.cpp
  44. +1 −3 src/engine/rendermodel.cpp
  45. +1 −1 src/engine/rendertext.cpp
  46. +64 −0 src/engine/translate.cpp
  47. +5 −0 src/engine/translate.h
  48. +1 −1 src/engine/world.cpp
  49. +3 −3 src/engine/world.h
  50. +28 −26 src/engine/worldio.cpp
  51. +11 −14 src/fpsgame/ai.cpp
  52. +18 −18 src/fpsgame/capture.h
  53. +7 −20 src/fpsgame/client.cpp
  54. +26 −98 src/fpsgame/entities.cpp
  55. +0 −1 src/fpsgame/extinfo.h
  56. +85 −139 src/fpsgame/fps.cpp
  57. +65 −124 src/fpsgame/game.h
  58. +8 −88 src/fpsgame/movable.cpp
  59. +0 −3 src/fpsgame/render.cpp
  60. +18 −124 src/fpsgame/server.cpp
  61. +1 −1 src/fpsgame/waypoint.cpp
  62. +39 −43 src/fpsgame/weapon.cpp
  63. +16 −13 src/fpsgame/weapon.h
  64. +2 −0 src/shared/cube.h
  65. +1 −1 src/shared/ents.h
  66. +6 −6 src/shared/iengine.h
  67. +7 −7 src/shared/zip.cpp
  68. +12 −0 src/vcpp/cardboard.cbp
  69. +855 −0 src/vcpp/cardboard.depend
  70. +100 −100 src/vcpp/cardboard.layout
  71. +4 −29 src/vcpp/cardboard.vcxproj
  72. +15 −9 src/vcpp/cardboard.vcxproj.filters
BIN -2.45 MB (86%) bin/cardboard_msvc.pdb
Binary file not shown.
BIN +1.75 MB (120%) bin64/cardboard_msvc.ilk
Binary file not shown.
BIN +2.95 MB (120%) bin64/cardboard_msvc.pdb
Binary file not shown.
@@ -45,7 +45,7 @@ confade 30
confilter 15615
connectname ""
connectport 0
conscale 0.33
conscale 0.275
consize 5
crosshaircolors 1
crosshairfx 1
@@ -395,11 +395,10 @@ universaldelta = "^n do [delta_@(if $editing [ result edit ] [ result game ])_@
complete capture "packages/base" "cmr"
listcomplete clearents [
light mapmodel playerstart envmap particles sound
smg shells riflerounds bullets rockets grenades
health healthboost greenarmour yellowarmour quaddamage
health ammo
teleport teledest
monster carrot jumppad
base respawnpoint
jumppad
base
spotlight
box barrel platform elevator
flag
@@ -408,15 +407,13 @@ complete collect "packages/base" "cmr"
complete coop "packages/base" "cmr"
complete ctf "packages/base" "cmr"
complete demo "." "dmo"
complete dmsp "packages/base" "cmr"
listcomplete editmat [air water clip glass noclip lava gameclip death alpha]
listcomplete entfind [
light mapmodel playerstart envmap particles sound
smg shells riflerounds bullets rockets grenades
health healthboost greenarmour yellowarmour quaddamage
health ammo
teleport teledest
monster carrot jumppad
base respawnpoint
jumppad
base
spotlight
box barrel platform elevator
flag
@@ -437,11 +434,10 @@ complete lms "packages/base" "cmr"
complete map "packages/base" "cmr"
listcomplete newent [
light mapmodel playerstart envmap particles sound
smg shells riflerounds bullets rockets grenades
health healthboost greenarmour yellowarmour quaddamage
health ammo
teleport teledest
monster carrot jumppad
base respawnpoint
jumppad
base
spotlight
box barrel platform elevator
flag
@@ -15,28 +15,9 @@ loop i (listlen $modenames) [
mapcomplete $mname
]

spmodenames = "sp dmsp"
loop i (listlen $spmodenames) [
mname = (at $spmodenames $i)
alias $mname [ if (mode (- @i 3)) [if (> $numargs 0) [map $arg1] [map]] ]
mapcomplete $mname
]

demo = [ stopdemo; if (mode -1) [if (> $numargs 0) [map $arg1] [map]] ]
complete demo . dmo

speditlock = 1
allowspedit = [ speditlock = 0; onrelease [speditlock = 1] ]

allowedittoggle = [
if (&& (m_sp (getmode)) $speditlock) [
error "you must hold" (prettylist (searchbinds "allowspedit") "or") "to toggle editing in single player modes"
result 0
] [
result 1
]
]

playermodelnum = 1

playermodeldir0 = "prototype"
@@ -1430,10 +1430,7 @@ lazyshader 0 "bw" (fsvs) (fsps [gl_FragColor = vec4(dot(color.xyz, vec3(0.33

lazyshader 0 "test1" (fsvs) (fsps [gl_FragColor = color * color;])
lazyshader 0 "test2" (fsvs) (fsps [gl_FragColor = color + color;])
lazyshader 0 "flip" (fsvs [
//texcoord0 = vec2(texcoord0.s, 1.0 - texcoord0.t);
texcoord0 = a_texcoord.st * vec2(1.0, -1.0);
]) (fsps)
lazyshader 0 "test3" (fsvs) (fsps [gl_FragColor = vec4(color.x-color.y, color.y-color.z, color.z-color.x, 1.0-color.w);])

// lazyshader 0 "flip" (fsvs [vtexcoord0 = vtexcoord0.st * vec2(1.0, -1.0);]) (fsps)

@@ -0,0 +1,49 @@
// this makes translations work, don't mess with it, it's black magic -Y 10/17/19

waitForConfig = [
sleep 0 $arg1
]

unnamedList = [] //For detecting unnamed in other languages

ds = [
_language = $arg1
_string = ""
looplist string $arg2 [
if (=s "" $_string) [
_string = $string
] [
if (=s $_string "lang.name") [
unnamedList = (concatword $unnamedList $string " ")
]
string = (strreplace $string "^^f" "^f")
translate $_language $_string $string
_string = ""
]
]
]


supportedLanguages = ""
__onLanguageReload = []

waitForLanguage = [
__onLanguageReload = [
@__onLanguageReload
@arg1
]
]

initLanguage = [
loopfiles x "packages/lang" "cfg" [
exec (concatword "packages/lang/" $x ".cfg")
supportedLanguages = (concatword $supportedLanguages $x " ")
]
__onLanguageReload
]
waitForConfig initLanguage

changelanguage = [
if (!=s "" $arg1) [ language $arg1; ]
initLanguage
]
@@ -16,76 +16,73 @@ showmapshot = [
guiimage (concatword "packages/base/" (if (> $numargs 0) [result $arg1] [at $guirollovername 0]) ".png") $guirolloveraction 4 1 "data/cardboard.png"
]

custommaps = ""
loopfiles curmap "packages/base" "cmr" [
if (< (indexof $allmaps $curmap) 0) [
custommaps = (concat $custommaps $curmap)
]
]
custommaps = (sortlist $custommaps x y [<=s $x $y])

custommaps1 = ""
custommaps2 = ""
newgui maps [
custommaps = ""
loopfiles curmap "packages/base" "cmr" [
if (< (indexof $allmaps $curmap) 0) [
custommaps = (concat $custommaps $curmap)
]
]
custommaps = (sortlist $custommaps x y [<=s $x $y])

looplist2 map1 map2 $custommaps [
custommaps1 = (concat $custommaps1 $map1)
custommaps2 = (concat $custommaps2 $map2)
]
custommaps1 = ""
custommaps2 = ""

newgui maps [
looplist2 map1 map2 $custommaps [
custommaps1 = (concat $custommaps1 $map1)
custommaps2 = (concat $custommaps2 $map2)
]
guilist [
guistrut 17 1
guilist [ guistrut 15 1; genmapitems $currentmaps ]
guilist [ guistrut 15 1]
showmapshot
]
guitab shadow
guitab "t:gui.map.shadow"
guilist [
guistrut 17 1
guilist [ guistrut 15 1; genmapitems $shadowmaps ]
guilist [ guistrut 15 1]
showmapshot
]
guitab ctf
guitab "t:gui.map.ctf"
guilist [
guistrut 17 1
guilist [ guistrut 15 1; genmapitems $ctfmaps ]
guilist [ guistrut 15 1 ]
showmapshot
]
guitab parkour
guitab "t:gui.map.parkour"
guilist [
guistrut 17 1
guilist [ guistrut 15 1; genmapitems $parkourmaps ]
guilist [ guistrut 15 1 ]
showmapshot
]
guitab custom
guitab "t:gui.map.custom"
guilist [
guistrut 17 1
guilist [ guistrut 15 1; genmapitems $custommaps1 ]
guilist [ guistrut 15 1; genmapitems $custommaps2 ]
showmapshot
]
] "standard"

newgui maps2 [
looplist curmap $custommaps [
guibutton $curmap (concat map $curmap) "map"
]
] "Available maps"
showcustommaps = [
custommaps = ""
loopfiles curmap "packages/base" "cmr" [
if (< (indexof $allmaps $curmap) 0) [
custommaps = (concat $custommaps $curmap)
]
]
custommaps = (sortlist $custommaps x y [<=s $x $y])
showgui maps2
]
] "t:gui.map"

//echo "maps run"
//newgui maps2 [
// looplist curmap $custommaps [
// guibutton $curmap (concat map $curmap) "map"
// ]
//] "Available maps"
//showcustommaps = [
// custommaps = ""
// loopfiles curmap "packages/base" "cmr" [
// if (< (indexof $allmaps $curmap) 0) [
// custommaps = (concat $custommaps $curmap)
// ]
// ]
// custommaps = (sortlist $custommaps x y [<=s $x $y])
// showgui maps2
//]

// prepare yourself for bad -Y 09/12/19

0 comments on commit 67528fb

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