Sally Coolatta
7f9ae90f88
Don't compile ACSVM's C API
...
No longer required
2022-12-23 05:26:12 -05:00
Sally Coolatta
8eef5efa95
Fully port the ACS integration to C++
2022-12-23 04:38:05 -05:00
Sally Coolatta
88ffab9f3c
Add ACSVM building to CMake
...
Currently this breaks some parts of the ACS functionality ... before I made a handful of small extensions to ACSVM's slightly-limited C API myself, and I didn't get them into the actual repo yet.
But now that we've moved to actual C++ compiling, I will likely just flat-out rewrite the SRB2 side of the code in C++ so it can use the library directly.
2022-12-22 09:44:38 -05:00
Sally Coolatta
2a790d10da
Merge branch 'master' into acs
2022-12-22 08:24:21 -05:00
Oni
8222b4d52b
Merge branch 'ring-respawn-fuck' into 'master'
...
Make ring respawn a division
See merge request KartKrew/Kart!833
2022-12-22 10:18:28 +00:00
Sally Coolatta
40bc79a9d4
Merge branch 'master' into ring-respawn-fuck
2022-12-22 03:40:11 -05:00
Sal
1662414e0e
Merge branch 'neutral-explosion-hitlag' into 'master'
...
Add half hitlag to invulnerable players if they would normally take damage
Closes #364
See merge request KartKrew/Kart!814
2022-12-22 08:37:47 +00:00
Sally Coolatta
ae8df1b97b
Merge branch 'master' into neutral-explosion-hitlag
2022-12-22 02:45:08 -05:00
Oni
7af133d378
Merge branch 'spring-overflow' into 'master'
...
Fix spring stack overflow
Closes #377
See merge request KartKrew/Kart!831
2022-12-22 07:43:39 +00:00
Sally Coolatta
ba7b2f3fc9
Merge branch 'master' into ring-respawn-fuck
2022-12-22 02:27:39 -05:00
Oni
58c4f6009f
Merge branch 'noclip-isnt-noclipthing' into 'master'
...
Alter MF_NOCLIP behavior
See merge request KartKrew/Kart!829
2022-12-22 07:25:54 +00:00
Sally Coolatta
c804129f3a
Merge branch 'master' into spring-overflow
2022-12-22 02:25:46 -05:00
Oni
580de12d24
Merge branch 'fix-load-savegame' into 'master'
...
Fix netsave loading crash from saving gamedata
Closes #380
See merge request KartKrew/Kart!832
2022-12-22 07:25:15 +00:00
James R
90903e999f
Fix MAXAVAILABILITY loop
2022-12-21 23:17:49 -08:00
James R
18acc54706
Merge branch 'cmake-testers' into 'master'
...
Add TESTERS and HOSTTESTERS builds to CMake options
See merge request KartKrew/Kart!830
2022-12-22 07:02:20 +00:00
Sally Coolatta
9c9d2934c5
Make ring respawn a division
...
Lets it stay very long for 1v1 like we want, but not matter the closer it gets to 8 players. Tired of people spamming rings to compensate for this problem :V
2022-12-22 01:53:50 -05:00
James R
a29d43d3b5
Restore save_p after P_LoadLevel
...
P_LoadLevel calls some functions that save gamedata and
unset save_p.
2022-12-21 22:45:46 -08:00
Sally Coolatta
0d8e13e942
Fix spring stack overflow
...
Closes #377
2022-12-22 01:35:08 -05:00
James R
d496e0f298
Add Tyron's invinc/grow blocked hit sfx
2022-12-21 08:35:26 -08:00
James R
9ddf10c9a5
Broly: detect added hitlag even if damage call didn't deal real damage
2022-12-21 08:35:26 -08:00
James R
ba2a7744d1
Add half hitlag to invincible players if they would've been damaged
2022-12-21 08:35:26 -08:00
James R
b73bbd3712
Add invulnhitlag, timeshit and timeshitprev fields to player_t
2022-12-21 08:08:59 -08:00
toaster
33167078c8
Merge branch 'capsules-improvement' into 'master'
...
Break the Capsules additions
See merge request KartKrew/Kart!793
2022-12-20 21:26:46 +00:00
Oni
62906ebd4e
Merge branch 'unlockables-undefeatable' into 'master'
...
Unlockables Undefeatable
Closes #350 and #324
See merge request KartKrew/Kart!789
2022-12-19 22:21:30 +00:00
toaster
c89fb15399
Use our updated name where appropriate. (text strings only)
2022-12-19 21:48:19 +00:00
toaster
0214f62057
Add descriptions for TESTERS and HOSTTESTERS builds.
2022-12-19 21:47:37 +00:00
toaster
48a43eb9af
Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into cmake-testers
2022-12-19 21:41:25 +00:00
toaster
8edf099f78
Sal's review: Clear levels on gamedata addition by default
...
Instead, if you want an exception - in the *same* MainCfg block, set `doClearLevels = False` (or `0`, or `No`)
2022-12-19 21:26:52 +00:00
toaster
d0cd059c5e
Rework the Level List functions to operate off a provided levelsearch_t pointer.
...
* Prevents the dependency on a `levellist` global that could be corrupted
* Fixes the issue where cups that were not unlocked would not show up on the cup select (because `M_MapLocked` would make `M_CanShowLevelInList` fail).
* Shows both Race and Battle maps in the cup unlock preview.
2022-12-19 21:18:36 +00:00
toaster
8e88a840bb
Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into unlockables-undefeatable
...
# Conflicts:
# src/k_menudraw.c
# src/k_menufunc.c
2022-12-19 20:13:44 +00:00
toaster
f693faeaa3
Merge branch 'cmake-nodynamicbase' into 'master'
...
Remove dynamic base from CMake target link options
See merge request KartKrew/Kart!827
2022-12-19 19:54:10 +00:00
toaster
d106c0a329
Add TESTERS and HOSTTESTERS builds to CMake options
2022-12-19 19:52:53 +00:00
toaster
a62282aa4e
Make Wl,--disable-dynamicbase its own link option seperate from -static
2022-12-19 19:43:31 +00:00
toaster
9c8601ed9e
Merge branch 'fix-soundorg' into 'master'
...
Fix not being able to play sounds from sector->soundorg
See merge request KartKrew/Kart!828
2022-12-19 12:03:44 +00:00
Sally Coolatta
65e6e54e7d
Alter MF_NOCLIP behavior
...
- Things with MF_NOCLIP can still run code when touching things, but won't be blocked by them.
- Things need both (MF_NOCLIP|MF_NOCLIPTHING) to do a single movement step, since MF_NOCLIP can do thing collision now.
2022-12-19 04:39:46 -05:00
Sally Coolatta
e959ff954c
Merge branch 'master' into capsules-improvement
2022-12-19 03:27:13 -05:00
Sally Coolatta
fed08a28a1
Make Gachabom stay still when tossing forward
2022-12-19 01:50:14 -05:00
Sally Coolatta
321c8bf976
Update k_roulette.c
2022-12-19 01:13:44 -05:00
Sally Coolatta
021f829112
Update k_roulette.c
2022-12-19 01:12:18 -05:00
Sally Coolatta
a7ff0afc8b
Merge branch 'master' into capsules-improvement
2022-12-19 01:12:07 -05:00
Sal
3d33b95094
Merge branch 'spring-terrain' into 'master'
...
Spring terrain
Closes #362
See merge request KartKrew/Kart!820
2022-12-19 05:27:40 +00:00
James R
d3b8f295b8
Fix not being able to play sounds from sector->soundorg
2022-12-18 21:10:31 -08:00
James R
eef944bb1b
Play spring TERRAIN sfx from sector
2022-12-18 21:09:29 -08:00
James R
8d39f0e60f
Add springStrength and springStarColor to TERRAIN
2022-12-18 21:09:29 -08:00
James R
4281adc60d
Separate most of P_DoSpring into P_DoSpringEx
2022-12-18 21:09:29 -08:00
Sal
48d5af71fb
Merge branch 'adjust-spdinash-charge' into 'master'
...
Adjust spindash charge time and power
Closes #341
See merge request KartKrew/Kart!825
2022-12-19 04:52:15 +00:00
Sal
a3583f5a9d
Merge branch 'battle-cups' into 'master'
...
Battle Cups + Re-order level select
Closes #372
See merge request KartKrew/Kart!826
2022-12-19 04:43:35 +00:00
toaster
32e53bbd83
Remove dynamic base from CMake target link options
...
Permits functional debugging of crash reports by preventing ASLR
2022-12-18 22:23:30 +00:00
Sal
d504af7b39
Merge branch 'garden-top-tweak' into 'master'
...
Garden top tweaks
Closes #342
See merge request KartKrew/Kart!824
2022-12-18 17:08:20 +00:00
Sal
2a6e33490a
Merge branch 'scripts.pk3' into 'master'
...
Rename patch.pk3 to scripts.pk3
Closes #344
See merge request KartKrew/Kart!823
2022-12-18 17:08:07 +00:00
