mazmazz
|
4d3ddda5b5
|
Sky scroll attempt
|
2018-11-16 14:34:28 -05:00 |
|
mazmazz
|
9c76c61384
|
Extra title SOCs: Music and FadeScreen. TitleScrollYSpeed in MainCfg
|
2018-11-16 14:18:35 -05:00 |
|
mazmazz
|
199bc155bc
|
Make MENU dehacked block top-level; TITLESCREEN is not necessary
|
2018-11-16 12:12:11 -05:00 |
|
mazmazz
|
15c0bab0c9
|
Title screen menu SOC
|
2018-11-16 12:07:47 -05:00 |
|
mazmazz
|
75dab7850f
|
Refactor MM_ menu types to MN_
|
2018-11-16 09:56:22 -05:00 |
|
mazmazz
|
3ec96d8b99
|
Menutypes for dehacked
|
2018-11-16 09:46:32 -05:00 |
|
mazmazz
|
6c69dd1f78
|
Merge branch 'master' into text-prompts
|
2018-11-13 11:12:44 -05:00 |
|
Digiku
|
b6a0b2f1d9
|
Merge branch 'tutorial-time' into 'master'
Tutorial mode handling
See merge request STJr/SRB2Internal!201
|
2018-11-13 10:49:02 -05:00 |
|
Digiku
|
3ccfd57fba
|
Merge branch 'tracerangle' into 'master'
Line Exec 457, 458: Track mobj's angle to tracer; executes line tag if mobj faces away
See merge request STJr/SRB2Internal!198
|
2018-11-13 10:48:01 -05:00 |
|
mazmazz
|
c1c815ce6e
|
Compile errors
|
2018-11-13 10:31:06 -05:00 |
|
mazmazz
|
75c4a96e69
|
NextTag implementation
* Adjust named tag implementation to be more portable
* Next page adjustments
|
2018-11-13 00:13:36 -05:00 |
|
mazmazz
|
eb7718bfeb
|
PicToStart implementation; fix NumPrompts limitation error
|
2018-11-12 23:16:24 -05:00 |
|
mazmazz
|
a362407886
|
Merge branch 'control-selector' into text-prompts
|
2018-11-12 21:11:53 -05:00 |
|
mazmazz
|
ce7f168568
|
Fix PICSMETAPAGE
|
2018-11-11 14:50:10 -05:00 |
|
mazmazz
|
424bc557c2
|
Dehacked typos
|
2018-11-11 14:44:57 -05:00 |
|
mazmazz
|
c883b13b5d
|
Merge branch 'tutorial-time' into tutorial-time-firstprompt
|
2018-11-11 09:21:10 -05:00 |
|
Monster Iestyn
|
e4f157786c
|
Merge branch 'public_next'
# Conflicts:
# src/Makefile
# src/doomtype.h
# src/hardware/hw_clip.c
# src/hardware/hw_main.c
# src/sdl12/sdl_sound.c
|
2018-11-10 19:18:34 +00:00 |
|
Monster Iestyn
|
fced19d291
|
Merge branch 'master' into next
|
2018-11-10 19:05:33 +00:00 |
|
mazmazz
|
9a038b28e1
|
Implemented GFX for text prompts
* PicMode SOC
* PicToLoop SOC
|
2018-11-10 12:42:13 -05:00 |
|
Monster Iestyn
|
268bde3fdf
|
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
|
3d9ce630d2
|
SOC for prompt gfx and music
|
2018-11-10 10:33:58 -05:00 |
|
mazmazz
|
a197c19742
|
Prompt page string field length adjustment; check empty named tag before prompt search
|
2018-11-10 09:38:32 -05:00 |
|
mazmazz
|
e1e94c3af2
|
Added page tags and find page by tag
* Added tutorial mode defines to this branch
|
2018-11-10 09:32:53 -05:00 |
|
mazmazz
|
7ac641450f
|
Text prompt Hide HUD dehacked
|
2018-11-09 23:50:25 -05:00 |
|
mazmazz
|
9ee894f777
|
Make gray/black text prompt backcolor darker in OpenGL
|
2018-11-09 22:52:13 -05:00 |
|
mazmazz
|
7daf5d4727
|
Set up separate background color for prompts vs. console
|
2018-11-09 22:38:55 -05:00 |
|
mazmazz
|
b8897db308
|
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
|
d8f3a20e65
|
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
|
a9cfd6a781
|
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
|
0bdbdd1b1e
|
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 |
|
GoldenTails
|
a3bc7ddfa0
|
Add Lua Ultimate Mode global variable so people can use it.
|
2018-11-06 18:09:45 -06:00 |
|
mazmazz
|
c16c59fd73
|
Support underscores -> spaces in TextPrompt name
|
2018-11-04 22:32:47 -05:00 |
|
mazmazz
|
6356a6cf2e
|
Lowercase font for body text; added ICONFLIP parameter
|
2018-11-04 22:32:46 -05:00 |
|
mazmazz
|
73ae273348
|
Implemented auto-advancing TextPrompts
* Fixed TextSpeed
* New TimeToNext
* Other bugs
|
2018-11-04 22:32:46 -05:00 |
|
Monster Iestyn
|
d327f82e85
|
Fix errors found when compiling
|
2018-11-04 22:32:46 -05:00 |
|
mazmazz
|
971151ab83
|
Fixes: MetaPage, AdvanceToNextPage, center/scale icons, button handling
|
2018-11-04 22:32:46 -05:00 |
|
mazmazz
|
a3d000a37e
|
Kind of support line breaks with PAGETEXT. Can't trim trailing whitespace yet.
|
2018-11-04 22:31:52 -05:00 |
|
mazmazz
|
ef241b4521
|
Broken attempt at supporting linebreaks for PageText, like cutscenes
|
2018-11-04 22:31:52 -05:00 |
|
mazmazz
|
95c68c331a
|
TextPrompt/Page freeslots; SOC Prompt/Page parsing
|
2018-11-04 22:31:52 -05:00 |
|
mazmazz
|
cf6a6991cb
|
Trigger line exec by whether mobj is facing its tracer
* MFE_TRACERANGLE
* Thing 758 MT_ANGLEMAN
* mobj thinker behavior
* Line Exec 457/458 Enable/Disable
|
2018-11-04 16:28:25 -05:00 |
|
mazmazz
|
eec3f630cf
|
Merge remote-tracking branch 'origin/master' into tutorial-time
|
2018-11-03 10:58:11 -04:00 |
|
Monster Iestyn
|
e9ea1b47d5
|
Fix the game crashing if you put params with no "=" for some reason in some of the SOC blocks, just stop going through the lines if that happens
|
2018-10-31 19:26:29 +00:00 |
|
Monster Iestyn
|
e15ed742c1
|
add ESLOPE ifdef checks around all the Lua slope support code that was there before I was involved
|
2018-10-21 16:27:54 +01:00 |
|
Monster Iestyn
|
7d4e27937d
|
Merge branch 'next' into lua-slopes
# Conflicts:
# src/lua_maplib.c
|
2018-10-20 18:31:06 +01:00 |
|
Monster Iestyn
|
8ab4915b5b
|
Whoops these should be L not gL here (not that it makes much difference normally though)
|
2018-10-11 21:44:25 +01:00 |
|
Digiku
|
106afd48af
|
Merge branch 'nights-score-lap' into 'master'
NiGHTS: Intermission Bonuses
See merge request STJr/SRB2Internal!159
|
2018-09-19 11:03:14 -04:00 |
|
Digiku
|
1dadee6804
|
Nights intermission dehacked: a comment
|
2018-09-19 10:45:51 -04:00 |
|
mazmazz
|
eb590910b2
|
Added NIGHTSLINK bonus type for the 2.1 Link Bonus
|
2018-09-09 01:13:02 -04:00 |
|
mazmazz
|
fe2d1e9020
|
Merge branch 'master' into flicky-things
|
2018-09-06 08:09:02 -04:00 |
|
Monster Iestyn
|
bcc9e58d0e
|
Merge branch 'master' into tutorial-time
|
2018-09-04 15:54:50 +01:00 |
|