Eidolon
aabf8ae54e
Merge branch 'next' of git.do.srb2.org:STJr/SRB2 into 2214
2024-10-16 17:43:38 -05:00
Lactozilla
e7b4beba20
Update dates in copyright notices of all files modified in 2024
2024-09-21 21:35:01 -03:00
spherallic
be1a9e3f5d
Update asset hashes for 2.2.14
2024-06-25 16:49:00 +02:00
Hanicef
8ea215bf2f
Fix compiler error in clang
2024-03-03 11:36:29 +01:00
Hanicef
853afa30df
Fix missing HUD item for Lua
2024-03-02 18:51:56 +01:00
Lactozilla
0664671c57
Merge branch 'next' into delete-unused-render-code
2024-02-24 14:02:33 -03:00
sphere
29580282b0
Merge branch 'maxskins-255' into 'next'
...
Change MAXSKINS from 256 to 255
See merge request STJr/SRB2!2365
2024-02-24 00:27:14 +00:00
Zwip-Zwap Zapony
56c61a80ff
Change MAXSKINS from 256 to 255
...
A value of -1 is sometimes reserved for "no skin", leaving 255 other values for skin numbers
2024-02-22 12:34:51 +01:00
Alam Ed Arias
8c7fe2ae95
Make tokenizer keep a copy of string in normal memory
2024-02-21 21:41:16 -05:00
Lactozilla
07656de1d2
Delete old and unused rendering-related code
...
- Deleted view border code
- Deleted highcolor code
- Deleted pre-NEWCLIP code
- Deleted ylookup and columnofs
- Deleted the last remnants of con_clipviewtop and dc_hires
2024-02-18 22:11:22 -03:00
Logan Aerl Arias
bf4efe968f
Merge branch 'patch-refactor' into 'next'
...
Patch and texture refactor
See merge request STJr/SRB2!2104
2024-02-12 04:48:36 +00:00
Logan Aerl Arias
a3b79056e9
Merge branch 'translations' into 'next'
...
ZDoom translations
See merge request STJr/SRB2!2190
2024-01-17 03:24:54 +00:00
Lactozilla
72b63a1305
Merge branch 'next' into patch-refactor
2024-01-14 22:16:32 -03:00
Alam Ed Arias
626ac069f2
Merge branch 'master' into next
2024-01-07 14:22:43 -05:00
Alam Ed Arias
5b6c24281d
Fixup DEBUGMODE builds
...
doomdef.h: check if the build system already define our DEBUG code
version.mk: do not fail on our inline functions in DEBUGMODE
features.mk: we do not need the VALGRIND libraies, just the headers
mserv.c: start registered with false in Update_parameters()
2024-01-07 13:07:28 -05:00
Lactozilla
b6e4771085
Merge branch 'next' into translations
2024-01-02 22:06:14 -03:00
Logan Aerl Arias
487b0d22ed
Merge branch 'next' into raise-skin-limit
2024-01-01 16:55:04 -05:00
Lactozilla
244ad5b892
Remove CPUID code
2023-12-03 00:22:58 -03:00
Lactozilla
a3e6b5e0fb
Merge remote-tracking branch 'stjr/next' into raise-skin-limit
2023-11-23 13:48:18 -03:00
Lactozilla
4f873d5f8f
WIP ZDoom translations
2023-10-29 20:33:49 -03:00
Alam Ed Arias
49d9619192
Merge branch 'master' into raise-skin-limit
2023-10-28 18:09:42 -04:00
Lactozilla
e30523264c
Merge remote-tracking branch 'stjr/next' into patch-refactor
2023-09-23 20:28:24 -03:00
LJ Sonic
2a896538d9
Merge branch 'netcode-rerefactor' into 'next'
...
Re-delete netcode
See merge request STJr/SRB2!2083
2023-09-18 16:47:28 +00:00
Lactozilla
649669c217
Merge remote-tracking branch 'stjr/next' into patch-refactor
2023-09-03 12:41:08 -03:00
spherallic
6c416c61b1
Final 2.2.12 skincolor changes:
...
- Replaced Mercury & Pumpkin with Ocean & Tangerine
- Renamed Crystal to Siberite & Meteorite to Moonstone
- Tiny tweaks to color ordering and NiGHTS link colors
2023-08-24 13:33:38 +02:00
Lactozilla
9c758e68e8
Merge remote-tracking branch 'stjr/next' into patch-refactor
2023-08-16 14:22:52 -03:00
Lactozilla
689fa265dd
Remove flats
2023-08-01 17:19:58 -03:00
LJ Sonic
df0c8e0557
Merge remote-tracking branch 'origin/next' into netcode-rerefactor
2023-08-01 19:00:52 +02:00
Sal
26583a9845
Ring Racers CMake + Debug build improvements
2023-08-01 02:29:45 +00:00
LJ Sonic
07bc922273
Delete netcode
...
Just kidding, I just deleted NONET
2023-07-27 15:34:05 +02:00
spherallic
ff7a24df09
Rename Kiwi skincolor to Pear
2023-07-05 12:10:30 +02:00
spherallic
73eb8fc358
A couple more changes:
...
- Swapped invcolors of new character skincolors
- Renamed Stone to Meteorite & changed text color to gray
- Tweaked some colors' invshades
2023-06-20 20:06:43 +02:00
spherallic
1bd593d173
Use extra colors for very high NiGHTS links, plus:
...
- Replaced Mindaro with Goldenrod
- Changed Topaz, and fixed inconsistency with its placement
- Small tweaks to Kiwi, Seafoam, Noble and Sangria
- Changed other NiGHTS link colors a little (& removed old iterations)
2023-06-20 20:06:43 +02:00
spherallic
70b69552f9
Add toggle for invcolor background, plus:
...
- Renamed Amethyst to Crystal
- Moved some of the new colors
- Tweaked a couple of invshades
2023-06-20 20:06:42 +02:00
spherallic
5e6850a7f7
Some more color tweaks:
...
- Added 6 new colors to match Chaos Emeralds
- Changed Taffy & Sapphire (3rd emerald)
- Renamed old Emerald to Shamrock
2023-06-20 20:06:42 +02:00
spherallic
458b474645
Even more skincolor changes:
...
- Changed Bronze
- Added Boulder & Volcanic
- Tweaked Galaxy
2023-06-20 20:03:13 +02:00
spherallic
edbfb92b11
Correct tabs & spacing
2023-06-20 20:03:13 +02:00
spherallic
222e409cde
More skincolor changes:
...
- Tweaked Bubblegum
- Added 8 new colors by Alice
- Added 22 new colors by sphere
2023-06-20 20:03:13 +02:00
Lach
bbe6c12323
Skincolor changes:
...
- Tweaked Orange and Cobalt
- Added Pepper, Jade, Headlight, Master, Mauve, and Taffy
- Fixed Mario mode invincibility color cycle
(Opposite color shades are placeholder for now)
2023-06-20 20:03:13 +02:00
spherallic
2c689bae52
2.2.11
2023-05-16 18:20:15 +02:00
spherallic
9d6456c326
Merge branch 'next' into public_next
2023-04-02 19:33:16 +02:00
spherallic
1470d099e3
Update copyright year & credits
2023-03-31 14:53:31 +02:00
spherallic
4a1e99729b
Merge branch 'next' into public_next
2023-01-31 15:47:11 +01:00
Eidolon
e5dea805fa
Revert "Merge branch 'gamepad-refactor' into next"
...
This reverts commit 696e2ab909
, reversing
changes made to d98d59494f
.
2023-01-26 19:26:28 -06: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
05d232c029
Delete netcode
...
Just kidding, I just deleted NONET
2022-12-30 15:07:57 +01:00
Eidolon
4c72154d4f
Merge remote-tracking branch 'local-SRB2/next' into public_next
2022-12-08 21:26:28 -06:00
Jaime Ita Passos
46f7fa406f
Refactor gamepad code
...
Implements the SDL Game Controller API, haptics, and axis bindings.
2022-11-14 00:37:08 -03:00
James R
3bd3369fdc
Add fopenfile, alternative to fopen that does not ever open directories
2022-10-14 21:56:01 -07:00
MascaraSnake
5fbe5189ce
Merge branch 'udmf-sector-fields' into udmf-full
2022-04-20 21:01:52 +02:00