diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 8158d7e6..e7f97792 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -107,7 +107,7 @@ jobs: path: ./${{env.FOLDER_NAME}}/libs/cl_dlls/client.so macOS_libs: - runs-on: macos-latest + runs-on: macos-13 steps: - uses: actions/checkout@v4 diff --git a/workspace/models/hd/v_dual_chaingun/v_dual_chaingun.qc b/workspace/models/hd/v_dual_chaingun/v_dual_chaingun.qc index 667b27a1..b5ca8d42 100644 --- a/workspace/models/hd/v_dual_chaingun/v_dual_chaingun.qc +++ b/workspace/models/hd/v_dual_chaingun/v_dual_chaingun.qc @@ -77,6 +77,8 @@ $texturegroup ice // attachment(s) $attachment 0 "Bip01 R Arm2" 0.000000 1.920000 25.049999 $attachment 1 "Bip01 L Arm2" 0.000000 1.920000 25.049999 +// aim +$attachment 2 "Bip01 R Arm2" 8.0 2.0 6.0 // hit box(es) $hbox 0 "Bip01 L Arm2" 0.000000 -2.800000 -1.730000 11.680000 3.020000 4.000000 diff --git a/workspace/models/hd/v_dual_handgun/v_dual_handgun.qc b/workspace/models/hd/v_dual_handgun/v_dual_handgun.qc index d40c58ea..4d967ffa 100644 --- a/workspace/models/hd/v_dual_handgun/v_dual_handgun.qc +++ b/workspace/models/hd/v_dual_handgun/v_dual_handgun.qc @@ -144,6 +144,9 @@ $texturegroup ice // attachment(s) $attachment 0 "muzzleflash" 0.000000 0.000000 0.000000 +$attachment 1 "muzzleflash" 0.000000 0.000000 0.000000 +// aim +$attachment 2 "muzzleflash" 0.0 2.0 8.0 // hit box(es) $hbox 0 "Hands biped R Forearm" -0.390000 -2.110000 -2.020000 11.430000 2.590000 1.120000 diff --git a/workspace/models/v_dual_chaingun/v_dual_chaingun.qc b/workspace/models/v_dual_chaingun/v_dual_chaingun.qc index 3d95c1a8..5ec2fd8d 100644 --- a/workspace/models/v_dual_chaingun/v_dual_chaingun.qc +++ b/workspace/models/v_dual_chaingun/v_dual_chaingun.qc @@ -92,6 +92,8 @@ $texturegroup ice // attachment(s) $attachment 0 "Hands biped R Hand" 45.000000 -7.500000 10.000000 $attachment 1 "Hands biped L Hand" 45.000000 -7.500000 -10.000000 +// aim +$attachment 2 "Hands biped R Hand" 8.0 2.0 6.0 // hit box(es) $hbox 0 "Hands biped R Hand" 0.000000 -1.427086 0.000000 1.069065 0.000000 6.472652 diff --git a/workspace/models/v_dual_handgun/v_dual_handgun.qc b/workspace/models/v_dual_handgun/v_dual_handgun.qc index f250f60f..94eb9c75 100644 --- a/workspace/models/v_dual_handgun/v_dual_handgun.qc +++ b/workspace/models/v_dual_handgun/v_dual_handgun.qc @@ -144,6 +144,9 @@ $texturegroup ice // attachment(s) $attachment 0 "muzzleflash" 0.000000 0.000000 0.000000 +$attachment 1 "muzzleflash" 0.000000 0.000000 0.000000 +// aim +$attachment 2 "muzzleflash" 0.0 2.0 8.0 // hit box(es) $hbox 0 "Hands biped R Forearm" -0.390000 -2.110000 -2.020000 11.430000 2.590000 1.120000 diff --git a/workspace/plan/beta4-buglist.md b/workspace/plan/beta4-buglist.md index d9f583dd..3357169c 100644 --- a/workspace/plan/beta4-buglist.md +++ b/workspace/plan/beta4-buglist.md @@ -20,8 +20,8 @@ nuke? ## Janurary 2024 GSS #109 -[ ] fix server side crossbow zoom -[ ] no time limit in gamegun +[x] fix server side crossbow zoom +[x] no time limit in gamegun [x] reset models after gamemode [x] pushy and snowballs [x] Slow bullets still stuck @@ -70,7 +70,6 @@ nuke? [ ] increase slowbullets dmg [ ] release hook on player damage [ ] refix chillworks -[ ] chumtoad slipped away in vote [ ] crowbar replace drift, weird spawn thing [ ] chumtoad throw animation [ ] grenade mutator and sniper scope @@ -81,12 +80,13 @@ nuke? [ ] spawn point at end of hill in canyon needs fixing [ ] fire in observer? [ ] normal hp for chumtoad holder in 999 mutator -[ ] disable lifebar when fragged? [ ] replace weapons with ammo in gungame? [ ] Make "chaos" in vote menu caps -[ ] gibbed sanic should disappear? [ ] bot should throw chumtoad if taking damage [ ] 3 - 4 second on chumtoad, then higher chance of dropping +[x] gibbed sanic should disappear? +[x] chumtoad slipped away in vote +[x] disable lifebar when fragged? [x] boxes not explosive in frozen_bunker [x] egon beam broken [x] 00:00 from 1v1 to gungame - shut off during intermission? diff --git a/workspace/plan/beta5-buglist.md b/workspace/plan/beta5-buglist.md index c29c53b9..f53397d4 100644 --- a/workspace/plan/beta5-buglist.md +++ b/workspace/plan/beta5-buglist.md @@ -2,15 +2,15 @@ ## Sept 2024 GSS #143 -[ ] glock and chaingun ironsight disabled [ ] Interrupt taunts without health credit [ ] Lose invinicibily on attack --- [ ] Idea - Broken mouse mutator -[x] Bird to fix canyon? [ ] ASMR weapon from UT? [ ] Recoil mutator? --- +[x] Bird to fix canyon? +[x] glock and chaingun ironsight disabled [x] Make messages reliable [x] Invisible mutator not working? [x] Mutator perm after map diff --git a/workspace/plan/roadmap.md b/workspace/plan/roadmap.md index 6b26e055..3fae8abd 100644 --- a/workspace/plan/roadmap.md +++ b/workspace/plan/roadmap.md @@ -90,6 +90,8 @@ To faithfully recreate the Cold Ice 1.75 experience that works in Half-Life Gold ### Beta 5 1. New Weapons + 1. [ ] replace zapper with cir blaster + 1. [ ] vice weapon 1. [x] Pointing, Hand gun, makes people confused, like in jabroni 1. [x] Dual Hivehands 1. [x] Dual Chainguns @@ -102,17 +104,16 @@ To faithfully recreate the Cold Ice 1.75 experience that works in Half-Life Gold 1. [x] Third Fire Options through Reload 1. [x] Sniper on Knife 1. Game Mechanics - 1. [ ] Respawn bar or counter on HUD after death like roblox 1. [ ] Position next to objective? + 1. [x] Respawn bar or counter on HUD after death like roblox 1. [x] [func_vehicle](https://gitlab.com/hlrally/src) and (https://github.com/bacontsu/halflife-car) 1. [x] "[Force grip](https://twitter.com/DokuGamesLTD/status/1802028387826811369)" / [Steal / Throw Weapon](https://twitter.com/DokuGamesLTD/status/1802337752450543945), [nano wire](https://twitter.com/DokuGamesLTD/status/1797776517088325993) mechanism? - 1. [ ] Force grab toward charger heals? 1. [x] Auto melee when close to player - may help lead the way to pistol whip for all 1. [x] Auto taunt after a frag 1. Bots 1. [x] Custom waypoint files for all maps 1. Mutators - 1. [ ] Fire Bullets + 1. [x] Fire Bullets 1. [x] half-life - cl_icemodels 0 1. [x] cowboy (dual cannons + [hat](https://gamebanana.com/mods/380978)) 1. [x] busters (give egon) @@ -134,30 +135,22 @@ To faithfully recreate the Cold Ice 1.75 experience that works in Half-Life Gold 1. [x] [Leeroy Jenkins] mode (start with vest) 1. [x] bigfoot (sv_stepsize 192) 1. Game Modes - 1. [ ] coldspot - retro fit it to existing hldm maps like ctf, select two entities like with ctf to be controlling areas. make a large mdl model, that's outlined and semi transparent walls so player goes in it to start control, on the gameloop check if team member is in a radius loop of the containing player. Same unit size as the mdl - 1. [ ] lms with team support + 1. [x] coldspot - retro fit it to existing hldm maps like ctf, select two entities like with ctf to be controlling areas. make a large mdl model, that's outlined and semi transparent walls so player goes in it to start control, on the gameloop check if team member is in a radius loop of the containing player. Same unit size as the mdl 1. [x] [Busting makes me feel good](https://github.com/ValveSoftware/halflife/blob/def1e48342df280c58593fe5ba88ed709c429f94/dlls/gamerules.h#L363), [rules explained](https://twitter.com/brokenphilip/status/1728360893132812320). 1. [x] [Prop Hunt](https://www.youtube.com/watch?v=97FpmBDhWlE) with Half-Life items - 1. [ ] [Waiting music](https://www.youtube.com/watch?v=JRPXRHS4XNQ) for seekers 1. [x] Head Hunter - [A trophy-collecting gamemode](https://jabronibrawl.com/gamemodes). Players drop a skull on death along with any other skulls they were carrying. Whoever is holding the most skulls at the end of the round, will win! To avoid a massive spam of skulls everywhere, the skulls do group under different tiers worth different amounts. 1. [x] CTF mode, spawn two spots if no support? 1. Improvements 1. [x] timer above if mp_timelimit set 1. [x] score/wins on scoreboard - 1. [ ] If single skeleton is fraged on start of chilldemic, survivors win - 1. [ ] Or, everyone starts as survivors, one person is selected as skeleton in real time - 1. [ ] Skeleton appears the moment fragged from suvivor 1. [x] Only appear chumtoad if there is more than two players 1. [x] [Shidden](https://www.youtube.com/watch?v=tyqLoOMnvUI) - 1. [ ] Stomp on head 1. [x] Fart flying 1. [x] Fart mechanism 1. [x] Sprite of player model 1. [x] Game loop 1. [x] Teamplay logic 1. [x] Lite version of [Base Defense](https://www.moddb.com/mods/b-def) horde mode - 1. [ ] Amount of emenies increase from 5 to 10 - 1. [ ] Basic task based on kills for upgrade 1. [x] Add Alan's [panthereye code](https://discord.com/channels/607900335633334272/1040794595157618728/1268209470345969717) to the monster list 1. [x] Their health keep going up 1. [x] ID bar @@ -193,8 +186,6 @@ To faithfully recreate the Cold Ice 1.75 experience that works in Half-Life Gold 1. [x] Import rest of player models, replace skeleton and holo with gina 1. Fixes 1. [x] spectator angle, disconnected bots are available in spectator view? - 1. [ ] Angled dead arms - 1. [ ] Change solid type of barrel after throw 1. [x] Gungame - more feedback 1. [x] dont los levels on death 1. [x] you skip that many weapons as the killed players with the nuke in snowcross @@ -202,8 +193,6 @@ To faithfully recreate the Cold Ice 1.75 experience that works in Half-Life Gold 1. [x] dual railguns still drop? 1. [x] mutators are intefering with the gungame, off by default? 1. [x] vest? No death count? - 1. [ ] sildenafil - make weapons - 1. [ ] maxpack - drop all 1. [x] Nuke to kill monsters 1. [x] scoreboard is not ordered right in deathmatch 1. [x] Cancel taunt if switching weapon @@ -219,6 +208,16 @@ To faithfully recreate the Cold Ice 1.75 experience that works in Half-Life Gold 1. [ ] New Life Launcher program? 1. [ ] [Inno Setup](https://github.com/N7P0L3ON/Flatline-Arena-Master/commit/5158ce7977d7a0a5ba5ff9bc2d6dcce5350b1697) install script 1. Game Modes + 1. [ ] Horde mode improvements + 1. [ ] Amount of emenies increase from 5 to 10 + 1. [ ] Basic task based on kills for upgrade + 1. [ ] Prophunt [Waiting music](https://www.youtube.com/watch?v=JRPXRHS4XNQ) for seekers + 1. [ ] Chilldemic improvements + 1. [ ] If single skeleton is fraged on start of chilldemic, survivors win + 1. [ ] Or, everyone starts as survivors, one person is selected as skeleton in real time + 1. [ ] Skeleton appears the moment fragged from suvivor + 1. [ ] Shidden, Stomp on head + 1. [ ] lms with team support 1. [ ] Fix busters - if you're the buster and somehow suiside... you'll still trigger the message "Youyrname killed the buster yourname" 1. [ ] Fix first blood achievement - no teamplay frag, and reset on round start [Napoleon] 1. [ ] Gungame - more feedback @@ -431,6 +430,7 @@ To faithfully recreate the Cold Ice 1.75 experience that works in Half-Life Gold 1. [ ] Bot support for hook 1. [ ] Bot support for macOS 1. Game Mechanics + 1. [ ] Force grab toward charger heals? 1. [ ] Spree awards for players - rewards like ammo, weapons and items for it... [Napoleon] 1. [ ] Dying [player fades](https://twitter.com/KrispyKhristian/status/1782644111620862002) out instead of death animation. 1. [x] Small sound like Jabroni when inflicting damage? @@ -552,6 +552,11 @@ To faithfully recreate the Cold Ice 1.75 experience that works in Half-Life Gold 1. [ ] Russian translations (berry from moddb) 1. [ ] Small radius device that delivers [continious damage](https://discord.com/channels/849001008645668874/900139554185547776/1035274797569015931) 1. [ ] what about instead of a jet pack, you have the “go away boost” where you mele range with a “rocket” (slap a rocket on another player) and they take off like a rocket from a rocket crowbar? (AudioCraZ) +1. Fixes + 1. [ ] Angled dead arms + 1. [ ] Change solid type of barrel after throw + 1. [ ] sildenafil - make weapons + 1. [ ] maxpack - drop all ### Beta 4 diff --git a/workspace/redist/readme.txt b/workspace/redist/readme.txt index ff48ab11..f7a3588a 100644 --- a/workspace/redist/readme.txt +++ b/workspace/redist/readme.txt @@ -123,6 +123,7 @@ Beta 5 Features: - Reduced freezegun speed and power - Improved rocketcrowbar rocket launching - Fix hornetgun velocity while running + - Sniper rifle smooth zoom reverted - Soundtrack - Includes 14 new tracks, each map plays a set track - Map Changes @@ -171,6 +172,7 @@ Beta 5 Features: - Combined selected items to global model file - Added "sv_botsmelee" to toggle bots close combat - Changed "mp_grapplesky" to "mp_grabsky", now supports portals + - Improved first frag award, reset on rounds - Gameplay - Provide frag credit to drivable train - Telefrags fixed with maps containing these entities @@ -208,6 +210,7 @@ Beta 5 Features: - Disabled grappling hook in spectator mode - Remove rune from all spectators - Fix crash involving monster projectiles + - Fixed sys_timescale in latest engine, including linux Beta 4 Features: @@ -939,6 +942,8 @@ Server: - "botpause [0|1]" - Bots stay in place - "mp_allowrunes [0|1]" - Allow powerup runes on server - "mp_allowvoiceovers [0|1]" - Allow public voiceovers +- "mp_coldspotspawn" - name of entity where the spot will spawn +- "mp_coldspottime" - time in seconds of when spot move - "mp_ctcsecondsforpoint" - amount of second holding chumtoad for a point - "mp_ctfspawn1" - name of entity where blue base will spawn in map - "mp_ctfspawn2" - name of entity where red base will spawn in map diff --git a/workspace/redist/resource/ice_beta5_english.txt b/workspace/redist/resource/ice_beta5_english.txt index 8885e82a..be9da6e2 100644 Binary files a/workspace/redist/resource/ice_beta5_english.txt and b/workspace/redist/resource/ice_beta5_english.txt differ diff --git a/workspace/redist/settings.scr b/workspace/redist/settings.scr index 3954c31f..52a20a91 100644 --- a/workspace/redist/settings.scr +++ b/workspace/redist/settings.scr @@ -509,4 +509,18 @@ DESCRIPTION SERVER_OPTIONS { BOOL } { "1" } } + + "mp_coldspotspawn" + { + "#Ice_ColdSpotSpawn" + { STRING } + { "info_player_deathmatch" } + } + + "mp_ctfspawn2" + { + "#Ice_ColdSpotTime" + { NUMBER 0.000000 -1.000000 } + { "30" } + } } diff --git a/workspace/src b/workspace/src index 84d34374..28888298 160000 --- a/workspace/src +++ b/workspace/src @@ -1 +1 @@ -Subproject commit 84d3437499e5e52e25736983527daca0b0b5a775 +Subproject commit 28888298aa1af874f6296f9dcd7eeb0786abe152