Monster Iestyn
b7dc441e10
Starting work on porting hw_clip.c/h code, Makefiles and CMake can compile them at least
...
Other notes:
* Renamed all new functions to have HWR_ prefix instead of gld_, for consistency
* HWR_FrustrumSetup and HWR_SphereInFrustum are disabled and require HAVE_SPHEREFRUSTRUM. This is because 1) SRB2CB did not need the code, so presumably neither will we, and 2) there are some OpenGL API functions used there that due to our way of using OpenGL we don't use outside of r_opengl.c, which makes dealing with HWR_FrustrumSetup complicated in theory
* The new clipping functions are not added to OpenGL's "main" rendering code itself just yet, they're just available to use now once hw_clip.h is included
2018-11-10 16:08:26 +00:00
mazmazz
c607991f16
Implement music switching for prompts
2018-11-10 11:05:33 -05:00
Monster Iestyn
89eafc59e7
....ow this slipup hurt me badly
2018-11-10 16:00:33 +00:00
Monster Iestyn
778a2b1dc7
Whoops, mucked up this part of the conflict resolving
2018-11-10 15:55:09 +00:00
Monster Iestyn
027ad8aca9
adding lua_maplib.c comments for new slope-related userdata types
2018-11-10 15:47:04 +00:00
Monster Iestyn
7989e9a482
Merge branch 'public_next'
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/dehacked.c
# src/g_game.h
# src/hardware/hw_draw.c
# src/hardware/hw_main.c
# src/lua_baselib.c
# src/lua_hook.h
# src/lua_hooklib.c
# src/lua_hudlib.c
# src/lua_libs.h
# src/lua_maplib.c
# src/lua_script.c
# src/m_misc.h
# src/p_mobj.c
# src/s_sound.c
# src/sdl12/mixer_sound.c
# src/w_wad.c
2018-11-10 15:41:57 +00:00
mazmazz
e48156ed66
SOC for prompt gfx and music
2018-11-10 10:33:58 -05:00
mazmazz
b1bfc35ad7
Hardcode tutorial prompt offset index
2018-11-10 10:15:16 -05:00
mazmazz
9660c0e3c8
Prompt page string field length adjustment; check empty named tag before prompt search
2018-11-10 09:38:32 -05:00
mazmazz
3174969755
Added page tags and find page by tag
...
* Added tutorial mode defines to this branch
2018-11-10 09:32:53 -05:00
Monster Iestyn
c44b742112
Merge branch 'master' into next
2018-11-10 14:27:27 +00:00
Monster Iestyn
24bc2a04fa
Merge branch 'opengl-improvements-backport' into 'master'
...
Opengl improvements backport
See merge request STJr/SRB2!304
2018-11-10 09:25:18 -05:00
Monster Iestyn
3a926cff5a
Merge branch 'copyright-info-update' into 'master'
...
Update copyright info
See merge request STJr/SRB2!309
2018-11-10 08:33:09 -05:00
Monster Iestyn
8fac10505f
Place limit on the amount of alias recursion allowed, to prevent cycles or otherwise excessive recursion
2018-11-10 13:08:26 +00:00
mazmazz
59417ecd4a
WIP: First-time tutorial prompt
2018-11-10 02:30:21 -05:00
mazmazz
722929a661
Force camera defaults during tutorialmode (doesn't work in all cases)
2018-11-10 01:31:30 -05:00
mazmazz
d406809ee8
Hide Tutorial menu option if no tutorialmap
2018-11-10 01:17:11 -05:00
mazmazz
bf9b5c5d5b
Prompt HUD hiding implementation
2018-11-10 01:00:18 -05:00
mazmazz
aaf0a0a3df
Merge branch 'text-prompts' into text-prompts-hidehud
2018-11-10 00:10:42 -05:00
mazmazz
19dd2b500b
Actually fix empty prompt text crash
2018-11-10 00:10:16 -05:00
mazmazz
b25cf9e0d9
Text prompt Hide HUD dehacked
2018-11-09 23:50:25 -05:00
mazmazz
2106ff30f0
Make gray/black text prompt backcolor darker in OpenGL
2018-11-09 22:52:13 -05:00
mazmazz
b7af1e385b
Set up separate background color for prompts vs. console
2018-11-09 22:38:55 -05:00
mazmazz
90c83962d1
Fix tmthing crash in EndTextPrompt when loading an invalid prompt on level start
2018-11-09 22:07:32 -05:00
mazmazz
6c785cff56
Fix crash when page text is empty; add checks for MAX_PROMPTS and MAX_PAGES
2018-11-09 21:55:14 -05:00
Monster Iestyn
5532882303
Merge branch 'master' into next
2018-11-09 23:18:14 +00:00
Alam Arias
cdf6ef7cc5
Merge pull request #320 from monster-psychic-cat/remote_view_fixes
...
Minor remote viewpoint bugfixes.
2018-11-09 16:09:20 -05:00
Monster Iestyn
ebb27b1c3c
Merge branch 'public-op-nightsbumper-fix' into 'next'
...
Objectplace: Fix NiGHTS bumper angle being reset when WRITETHINGS
See merge request STJr/SRB2!299
2018-11-09 12:11:11 -05:00
Monster Iestyn
32a2c6dc3c
Merge branch 'master' into next
2018-11-09 16:09:49 +00:00
Monster Iestyn
74f221d73f
Merge branch 'music-clean' into 'master'
...
Some code cleanup.
See merge request STJr/SRB2!298
2018-11-09 10:58:57 -05:00
Monster Iestyn
7d31440ca6
WHY DID I FORGET THIS
2018-11-08 21:22:45 +00:00
Monster Iestyn
8440664c2f
Remove hasslope, per colette's warning about it potentially causing desyncs
2018-11-08 21:13:58 +00:00
Monster Iestyn
1200793a94
Merge branch 'Playerquit_hook' into 'next'
...
"PlayerQuit" Lua Hook
See merge request STJr/SRB2!127
2018-11-08 15:53:35 -05:00
Monster Iestyn
5f7c333625
Merge branch 'lua-slopes' into 'next'
...
Lua support for slopes
See merge request STJr/SRB2!307
2018-11-08 15:52:44 -05:00
Monster Iestyn
68305c3b18
Merge branch 'master' into next
2018-11-08 20:50:58 +00:00
Monster Iestyn
8c2a163f5d
Merge branch 'winsock-error-handling-fixes' into 'master'
...
Winsock error handling fixes
See merge request STJr/SRB2!303
2018-11-08 15:49:35 -05:00
Monster Iestyn
91a44addd9
d_main.c: remove the _MAX_PATH define, the file hasn't used it since v2.0
2018-11-08 20:09:00 +00:00
Monster Iestyn
389b39d541
byteptr.h: include endian.h to help define WRITE/READ macros correctly according to endianness
2018-11-08 17:16:54 +00:00
Monster Iestyn
1d0065f16a
More doomtype.h cleaning up:
...
* Move the misc types in the file to bottom, so that ATTRPACK at least is usable for RGBA_t
* Include endian.h, so that UINT2RGBA can be defined correctly for big endian builds
* Add more comments to make clear the main sections of the file
2018-11-08 17:05:35 +00:00
Monster Iestyn
a4a975224a
Clean up doomtype.h a bit, add indenting and comments to make some preprocessor code more readable
2018-11-08 16:31:20 +00:00
Monster Iestyn
b34e8c5390
Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified)
2018-11-08 16:26:55 +00:00
Monster Iestyn
6042ac0c78
ST_Ticker also should not have FUNCMATH, as it also has side effects
2018-11-07 21:45:27 +00:00
Monster Iestyn
95c2d12d94
HU_Start should not have FUNCMATH, it has side effects
2018-11-07 21:37:42 +00:00
Monster Iestyn
7c0fb1702f
D_PostEvent_end is only used by Allegro (used by the DOS port) to help timers work, so check for PC_DOS in preprocessor code. Also remove FUNCMATH from said function.
2018-11-07 21:21:36 +00:00
Monster Iestyn
856afe0708
P_NullPrecipThinker no longer should have FUNCMATH (though I'm not sure if it should have had it in the first place anyway)
2018-11-07 21:00:38 +00:00
GoldenTails
71f97a4a92
Add Lua Ultimate Mode global variable so people can use it.
2018-11-06 18:09:45 -06:00
MPC
eef8119123
Minor remote viewpoint bugfixes.
2018-11-05 20:40:51 -02:00
mazmazz
20f1eb6e8e
Add exec to GoldMonitorPop; transfer Angle tag to mobj->lastlook for Lua compat
2018-11-05 07:41:02 -05:00
mazmazz
3d86cbc729
Close text prompt upon level load
2018-11-04 22:32:47 -05:00
mazmazz
0169847e06
Pause TextPrompt when game is paused
2018-11-04 22:32:47 -05:00
