Commit graph

15072 commits

Author SHA1 Message Date
Lactozilla
7a38d65137 Check if the conversation icon is a valid patch 2024-01-17 22:43:05 -03:00
Lactozilla
043383fe5f Remove texture name detection for conversation icons 2024-01-17 22:33:38 -03:00
Lactozilla
d77e346bd6 Run this block of code earlier 2024-01-13 23:53:20 -03:00
Lactozilla
d6ae1fcd31 Changes:
Added support for using textures as conversation icons
Implemented V_DrawTexture
Misc. cleanup
2024-01-13 23:46:50 -03:00
Lactozilla
474f94ef25 Fix escaping of '{' 2024-01-13 19:45:45 -03:00
Lactozilla
2f56d1ee3f Fix a typo 2024-01-13 19:38:37 -03:00
Lactozilla
fb4a4920ea Move this macro 2024-01-13 19:38:14 -03:00
Lactozilla
47b1bdf7c2 Reorganize code 2024-01-13 19:37:34 -03:00
Lactozilla
fbcc1d445c Changes:
Split code out of m_misc.c into m_writebuffer.c
Turned text buffer variables into a struct
Use F_DrawDialogText for speaker name and choices strings
Support multiline strings and color commands in page 'name' and choices 'text'
2024-01-13 19:35:09 -03:00
Lactozilla
a1bc2257cc Add 'COLOR' command 2024-01-13 18:25:22 -03:00
Lactozilla
8f99dad260 Make DIALOGUE parser show the line numbers where errors happen 2024-01-13 18:07:12 -03:00
Lactozilla
7b42e53aff Improve command parser and make case-insensitive 2024-01-13 17:41:37 -03:00
Lactozilla
3585e6ad42 Add 'NEXTPAGE' control code 2024-01-13 04:39:06 -03:00
Lactozilla
9eb8098157 Minor optimization and fix 2024-01-13 03:37:01 -03:00
Lactozilla
604a2637e6 Split p_dialog.c into p_dialogscript.c and usdf.c 2024-01-13 03:22:02 -03:00
Lactozilla
888df2a2d5 Handle parse errors more gracefully 2024-01-13 02:51:28 -03:00
Lactozilla
7c5d7882c2 Changes:
Make Tokenizer_Read capture quotation marks as individual tokens
Make DIALOGUE parser more strict about capturing strings
Make DIALOGUE parser treat identifiers and keywords as case-insensitive
Support multi-line page dialogs
2024-01-12 20:37:33 -03:00
Lactozilla
6c6efd9fb6 Change semantics of text speed
Now text speed 0 is used to type text immediately.
Text speed >= 1 works as it did before, but offset by one.
2024-01-12 18:18:13 -03:00
Lactozilla
5c4717e896 Rename 'PAUSE' to 'DELAY' and implement new 'PAUSE' command 2024-01-12 17:31:48 -03:00
Lactozilla
834c325740 Add 'CHARNAME' and 'PLAYERNAME' control codes 2024-01-12 16:06:51 -03:00
Lactozilla
e8b96f6dba Add 'NAME' and 'ICON' control codes 2024-01-12 14:51:14 -03:00
Lactozilla
1b9bd6d275 Implement new control codes for dialog text 2024-01-12 04:30:38 -03:00
Lactozilla
5f77d32385 Support escape characters in text prompt dialog 2024-01-12 00:25:08 -03:00
Lactozilla
28a7689521 No longer accept non-game controls as valid inputs for prompt choices 2024-01-11 23:29:17 -03:00
Lactozilla
ed2c4c8ee3 Changes:
Add G_IsGameControl as a shortcut to check if either gamecontrol is down
Support GC_FORWARD and GC_BACKWARD as up/down in text prompt choices
Improve splitscreen support
2024-01-11 23:26:59 -03:00
Lactozilla
82b1c9afcf Add USDF-SRB2 specification document 2024-01-11 22:43:12 -03:00
Lactozilla
4c438667a0 Rename choice 'executelinedefsbytag' to 'executelinedef'
Add 'executelinedef' to pages
2024-01-11 22:35:40 -03:00
Lactozilla
a48a476c07 Add P_StartTextPrompt and P_EndTextPrompt to Lua
Ignore conversations if they lack pages
2024-01-11 22:19:47 -03:00
Lactozilla
fc81853b5f Implement USDF-SRB2 parser 2024-01-11 21:44:58 -03:00
Lactozilla
17d0dd832b Refactor tokenizer 2024-01-11 14:04:17 -03:00
Lactozilla
944290618a Implement text prompt choices
Increase MAX_PROMPT_PICS
2024-01-11 13:59:21 -03:00
Lactozilla
30e49f032c Refactor text prompt system
Code reorganization
Implement multiplayer support
Implement support for global text prompts
Implement support for talk sounds
2024-01-10 17:29:17 -03:00
sphere
c938d7757b Merge branch 'fix-3dfloor-scaling' into 'next'
Fix 3D floor side texture scale when there are multiple on the same line

See merge request STJr/SRB2!2262
2024-01-10 14:41:34 +00:00
Lactozilla
3e34c96165 Fix 3D floor sides not using the correct set of line flags 2024-01-09 14:14:49 -03:00
Lactozilla
28c30a9294 Optimize for when wall_scalex == 1.0 2024-01-08 22:08:50 -03:00
Lactozilla
159307c552 Fix 3D floor side texture scale when there are multiple on the same line 2024-01-08 22:03:31 -03:00
Logan Aerl Arias
4edebbe67f Merge branch 'blockedexposed' into 'next'
Expose P_LineIsBlocking to Lua

See merge request STJr/SRB2!2150
2024-01-08 23:38:11 +00:00
Logan Aerl Arias
f5c3c200b5 Merge branch 'lua-colorlib' into 'next'
Lua colorlib

See merge request STJr/SRB2!2094
2024-01-08 19:40:20 +00:00
Logan Aerl Arias
0781adc3ca Merge branch 'pandoradev' into 'next'
Enable Pandora and Level Select with Devmode / Always allow Level Select if unlocked

See merge request STJr/SRB2!2066
2024-01-08 19:20:23 +00:00
Logan Aerl Arias
03e5edb6f0 Merge branch 'chat_on' into 'next'
Expose chat_on to Lua as chatactive

See merge request STJr/SRB2!2023
2024-01-08 19:13:30 +00:00
Jisk
efb1b491aa Expose chat_on to Lua as chatactive 2024-01-08 19:13:30 +00:00
Logan Aerl Arias
845df8f1df Merge branch 'sector-portals' into 'next'
Sector portals

See merge request STJr/SRB2!2139
2024-01-08 03:28:43 +00:00
Logan Aerl Arias
154af01348 Merge branch 'theyseemerollingtheybraking' into 'next'
Fix roll braking assuming player angle is camera angle (resolves #1055)

Closes #1055

See merge request STJr/SRB2!2053
2024-01-08 03:13:57 +00:00
Alam Ed Arias
626ac069f2 Merge branch 'master' into next 2024-01-07 14:22:43 -05:00
Alam Ed Arias
a1308d8aa5 Update .gitlab-ci.yml file
Drop Debian musl jobs
2024-01-07 19:21:30 +00:00
Alam Ed Arias
caaeaef6cc fixup Valgrind warning:
Conditional jump or move depends on uninitialised value(s)
strncpy (vg_replace_strmem.c:599)
MIT_SetCurBackground (m_menu.c:2650)
M_IterateMenuTree (m_menu.c:2581)
M_SetMenuCurBackground (m_menu.c:2790)
F_InitMenuPresValues (f_finale.c:2276)
D_StartTitle (d_main.c:998)
G_Responder (g_game.c:2117)
D_ProcessEvents (d_main.c:282)
Local_Maketic (d_clisrv.c:5297)
NetUpdate (d_clisrv.c:5701)
TryRunTics (d_clisrv.c:5371)
D_SRB2Loop (d_main.c:820)
2024-01-07 13:09:47 -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
Logan Aerl Arias
8fefb8a87b CircleCI: move to LINUX64 build 2024-01-05 22:17:00 +00:00
Alam Ed Arias
c05f6e8053 Update config.yml 2024-01-05 16:49:52 +00:00
Alam Ed Arias
f613bd1279 Update config.yml 2024-01-05 16:47:48 +00:00