sphere
261e2d4347
bruh
...
# Conflicts:
# src/doomstat.h
2024-03-04 14:23:45 +00:00
Alam Ed Arias
703ee972e6
Clean up stringop-truncation warnings
2024-02-20 16:30:15 -05:00
spherallic
8f2f70aeec
Merge branch 'next' into maretimers
2024-02-04 22:39:25 +01:00
Lactozilla
a3e6b5e0fb
Merge remote-tracking branch 'stjr/next' into raise-skin-limit
2023-11-23 13:48:18 -03:00
Alam Ed Arias
49d9619192
Merge branch 'master' into raise-skin-limit
2023-10-28 18:09:42 -04:00
LJ Sonic
8608ded317
Add deprecation TODOs
2023-10-28 15:19:35 +02:00
spherallic
48a8043c1d
Allow per-mare timers in NiGHTS via level header
2023-09-06 14:19:23 +02:00
LJ Sonic
0b17e3c418
Move netcode files to a new folder
2023-07-27 15:38:42 +02:00
Sally Coolatta
7c2a241042
Remove the need for setting rotation axis in spriteinfo for models
...
Now it just does it like Software
2023-07-24 04:40:15 -04:00
sphere
62bdb7174b
Merge branch 'lua-optimized-constants' into 'next'
...
Hannu's "LUA_EnumLib optimizations for constant value access" with fixed merge conflict
See merge request STJr/SRB2!2017
2023-06-12 23:03:51 +00:00
katsy
ca11180976
Merge remote-tracking branch 'stjr/next' into lua-optimized-constants
2023-06-11 12:36:08 -05:00
Sally Coolatta
303d636f8e
Individual emblems mode
2023-06-02 16:06:43 -04:00
Sally Coolatta
49fa46d80e
Online emblems
...
Currently, emblems share with everyone. Will add an option to toggle this.
2023-06-02 16:06:43 -04:00
MascaraSnake
55d96daa28
Merge branch 'refresh-spr2' into 'next'
...
[SUGOI] Refresh Sprite2s
See merge request STJr/SRB2!1750
2023-05-24 05:04:31 +00:00
MascaraSnake
e4933b3e94
Merge branch 'allow-modified-saving' into 'next'
...
[SUGOI] Allow saving in modified games.
See merge request STJr/SRB2!1749
2023-05-24 05:04:26 +00:00
spherallic
1470d099e3
Update copyright year & credits
2023-03-31 14:53:31 +02:00
LJ Sonic
379cc4207a
Revert "Merge branch 'netcode-refactor' into merging"
...
This reverts merge request !1920
2023-01-15 17:57:23 +00:00
LJ Sonic
41fb0c8943
Merge branch 'netcode-refactor' into merging
2023-01-15 17:45:06 +01:00
Arthur
636e6d8c14
MSVC project file works again! Supports Visual Studio 2022.
...
Also fixed issues with the d_netcmd.c file/folder adding logic.
2022-12-31 19:35:07 -05:00
LJ Sonic
717e0d5a17
Move netcode files to a new folder
2022-12-31 14:10:19 +01:00
MascaraSnake
193a592d46
Merge branch 'dyn-alloc-action-name' into 'next'
...
Dynamically allocate space for a state's action field
See merge request STJr/SRB2!1478
2022-12-31 09:35:15 +00:00
Sally Coolatta
4a520e63c6
Don't allow a gamedata named the same as the default time attack folder
...
That'd be kinda scary!
2022-11-16 11:14:30 -05:00
sphere
27f2b04109
Merge branch 'readhuditem-parse-fix' into 'next'
...
readhuditem parse fixes
Closes #887
See merge request STJr/SRB2!1816
2022-09-28 21:04:44 +00:00
SteelT
fe8be242d0
readhuditem parse fixes
...
Fix readhuditem not parsing flags correctly
Fix unknown word warning erroneously describing the HUD item as a level header
2022-09-26 02:31:50 -04:00
spherallic
508536e3d7
Fix map number checks when reading unlockable conditions.
2022-09-05 20:41:09 +02:00
Sally Coolatta
c0a2d31a22
Merge remote-tracking branch 'upstream/2210-release' into refresh-spr2
2022-03-07 13:09:06 -05:00
spherallic
14295ac7de
2022
2022-03-03 20:24:46 +01:00
Sally Coolatta
f7b166da07
Refresh sprite2s
...
Allows for custom characters to be loaded first, then a wad that adds a custom sprite2, and the custom character's sprite2s won't be discarded.
2022-02-27 07:56:45 -05:00
Hannu Hanhi
3bff9011d8
LUA_EnumLib optimizations for constant value access
...
- constants are stored into _G after first use
- made LUA_EvalMath's dedicated Lua state permanent so it can also benefit from these optimizations
2022-01-23 20:11:10 +02:00
Jaime Ita Passos
1a84f1bcba
Minor changes and fixes
2021-08-10 15:17:22 -03:00
Jaime Ita Passos
2aa9bb59ef
Memory management fixes
...
Date: Mon Aug 9 15:57:07 2021 -0300
2021-08-09 15:57:35 -03:00
lachablock
f9723a567c
Merge remote-tracking branch 'origin/next' into raise-skin-limit
2021-08-09 14:19:09 +10:00
SteelT
a72d6bba22
Merge branch 'skin-unlocks-sanity' into 'next'
...
[SUGOI] Remove skin->availability, add SECRET_SKIN
See merge request STJr/SRB2!1474
2021-05-28 21:30:16 -04:00
sphere
186ef0479d
Merge branch 'death-of-musicslots2' into 'next'
...
Remove music slot compatibility
See merge request STJr/SRB2!1321
2021-05-19 05:27:31 -04:00
Steel Titanium
a2667f4dc9
Merge branch 'master' into next
2021-05-11 20:08:44 -04:00
Sally Coolatta
5d93f86499
Merge branch 'next' into skin-unlocks-sanity
2021-05-08 12:55:46 -04:00
Monster Iestyn
a98b0834a6
Merge branch 'deh-buffer-unclog' into 'next'
...
Fix a series of buffer overflows in SOC (primarily Character section) loading
See merge request STJr/SRB2!1457
2021-05-07 18:47:51 -04:00
LJ Sonic
d325c7e6d3
The year is 2021
2021-05-07 17:45:56 +02:00
GoldenTails
691b17a88e
Dynamically allocate space for a state's action field
...
It was previously restricted arbitrarily to 32 cells (31 usable characters) due to someone else's laziness
2021-04-27 17:28:49 -05:00
Sally Coolatta
92107f28d5
Add string variable for unlockables and emblems
...
Skin unlockables / skin emblems are now checked at runtime to see if there's any matches.
2021-04-25 17:54:47 -04:00
Sally Coolatta
8278e621fb
Removed skin->availability
...
Locked skins now are a specific unlockable type, instead of being tied to the skin's properties.
This has plagued custom gamedata since 2.2 launch. It's extremely obnoxious having to set aside random numbers as dummy unlockables just to ensure that Amy Fang & Metal are unlocked from the start in a custom map pack.
Other changes made to accommodate this:
- R_GetSkinAvailabilities is now created from the list of unlockables set to skin type. (1st skin unlockable defined is (1), 2nd skin unlockable defined is (1 << 1), etc...)
- The "Added skin x" print shows up when loading addons but not at all for the base game, because the previous behavior of hiding based on if the skin was locked would now require iterating unlockables, which felt wrong to do during that stage of the loading process
- I noticed in my test wad that Sonic&Tails would give you Sonic&Sonic out if Tails was locked. I fixed that by making both skins required to show the character select option.
Mods that reserved empty dummy unlockables for Amy Fang and Metal won't have to do anything. Mods that wanted to re-lock them behind different requirements will have to update, but in the future they will not have to be in specific slots. Additionally, now Sonic Tails and Knuckles can also be locked for mods.
2021-04-25 07:18:32 -04:00
Sally Coolatta
ce3c5e081e
Missed a few lines in the prev commit
2021-04-20 22:19:56 -04:00
Sally Coolatta
8f01e85ade
Allow spaces in captions defined in SOC
2021-04-20 22:10:11 -04:00
Jaime Ita Passos
f93b1b8d7b
Raise the skin limit to 256.
2021-04-19 04:01:49 -03:00
X.organic
f0f3b33d71
Edit note_size alias to get rid of warnings
2021-04-12 19:09:21 +02:00
X.organic
701c6c8968
Fix myhashfgets-related buffer overflows in deh_soc.c
2021-04-12 19:09:12 +02:00
Steel Titanium
83e80eef9b
Add deprecation warning when using the level header parameter
2020-12-12 18:54:47 -05:00
Steel Titanium
ab156e1709
Remove music slot compatibility
2020-12-11 23:11:15 -05:00
GoldenTails
8fef61aa29
Split dehacked.c into multiple files.
2020-11-23 21:42:26 -06:00
