Commit graph

557 commits

Author SHA1 Message Date
mazmazz
2326a58bc7 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-01 10:41:40 -05:00
mazmazz
4e07436276 Credits update 2018-12-23 14:41:41 -05:00
mazmazz
a03acf16b4 Add SRB2 Community Contributors to Special Thanks 2018-12-22 23:41:43 -05:00
mazmazz
8e40bdb59d Re-order Special Thanks -- groups first, then names in ABC order 2018-12-21 11:40:35 -05:00
mazmazz
a4ddad6824 Add sirjuddington and CodeImp to Special Thanks credits 2018-12-20 17:27:25 -05:00
TehRealSalt
5e4bd29c9c Add Miku's author to credits. 2018-12-05 21:58:26 -05:00
Monster Iestyn
94ad0b880f Merge branch 'next' into 21-version
# Conflicts:
#	src/d_netcmd.c
2018-12-02 15:45:07 +00:00
TehRealSalt
e1c71f652d Fixes to merge process 2018-11-29 10:07:35 -05:00
TehRealSalt
4507ee18fd Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
Wolfy
cabe9871e3 Multiple admins
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
2018-11-29 06:46:59 -06:00
TehRealSalt
d5abeafc91 Update credits for bonuschars 2018-11-29 06:54:36 -05:00
TehRealSalt
4f0c74e1dc Remove previous commit's votebuffer, allow an external optional buffer to be passed into G_RandMap
I meant to fix the previous method, but I didn't even understand how it knew it was in a vote or not... so I just did it my own way :V

(Shouldn't FLUSHMAPBUFFEREARLY be on now...?)
2018-11-26 04:27:31 -05:00
mazmazz
0d9749f418 Merge remote-tracking branch 'origin/master' into menu-execs 2018-11-25 19:03:22 -05:00
Monster Iestyn
d824e05a6f Merge branch 'master' into next 2018-11-25 20:39:17 +00:00
mazmazz
f3914583c6 Rearranged menu presentation methods
* Menu parameter retrieval and hierarchy in m_menu
* Presentation logic (background display) in f_finale
2018-11-25 15:08:12 -05:00
Digiku
f79adecdef Merge branch '21-source-copyright' into 'master'
Update source copyrights to 2018

See merge request STJr/SRB2!346
2018-11-25 07:36:41 -05:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Digiku
bacdb3a392 Merge branch '21-credits-update' into 'master'
Extra credits update .21

See merge request STJr/SRB2!345
2018-11-25 07:21:31 -05:00
mazmazz
354037b251 Additional 2.1 credits update 2018-11-23 21:57:07 -05:00
Monster Iestyn
4db1220ad9 Merge branch 'master' into next 2018-11-23 21:01:03 +00:00
Digiku
032d6a02fe Merge branch '21-credits-update' into 'master'
2.1.21 credits update

See merge request STJr/SRB2!339
2018-11-23 07:38:28 -05:00
mazmazz
f51d2950a5 Update credits for 2.1.21 2018-11-23 07:34:23 -05:00
mazmazz
d1209e3f3d Make the credits pics darker 2018-11-22 20:08:02 -05:00
mazmazz
3bb75690c4 Merge remote-tracking branch 'origin/master' into HEAD 2018-11-20 23:19:36 -05:00
mazmazz
e682fb919f Draw connection screen correctly; make scroll speed inherit global setting 2018-11-20 18:13:18 -05:00
mazmazz
c65ff66383 Performance improvements
* Don't loop every frame for menu drawing parameters
* Fixed in-game escape menu not dimming correctly
* Fixed glitches on default title screen parameters
2018-11-20 17:28:26 -05:00
TehRealSalt
b8696fc0ff Random map buffer only gets added to when
Needs another temporary buffer for the vote screen so that it doesn't roll dupes
2018-11-20 00:13:08 -05:00
mazmazz
647ae7ad9f Fixed skullAnimCounter type for text prompts 2018-11-18 12:56:37 -05:00
TehRealSalt
c0b9cdb921 Fix for waiting player screen animation 2018-11-18 06:34:29 -05:00
mazmazz
958163089c Fix lingering titlemapcameraref when reloading title screen 2018-11-18 03:19:32 -05:00
mazmazz
02fe8dc178 Allow changing titlemap's cameraref via Line 422 Cut-Away View; change music too 2018-11-18 02:41:35 -05:00
mazmazz
3334df7ac4 More title screen features; menu meta state implementation (active and previous menu types)
* Draw background over titlemap
* HIDEBACKGROUND to show titlemap
* Specify NOMUSIC or IGNOREMUSIC (to not change music)
* Linedef execs implemented for tree hierarchy, including bubbling (NOENTERBUBBLE/NOEXITBUBBLE)
* Specify ENTERWIPE and EXITWIPE
* Menuid hierarchy fixes (Control mapping, joystick setup)
* Time attack handling fixes
* Specify custom wipes on runtime for D_Display and P_SetupLevel (for titlemap)
* Allow for forcing and skipping a wipe
* Wipe utility functions F_GetWipeLength and F_WipeExists
2018-11-17 19:08:30 -05:00
mazmazz
b22538beb9 Implemented features
* M_SkyScroll optimization with still speeds; refactor background drawing
* Music (in time attack screens so far)
* FadeStrength
* HideTitlePics
* Scrolling backgrounds in Time Attack (moved F_SkyScroll to m_menu)
2018-11-17 01:21:21 -05:00
mazmazz
a046718c47 Implement scrolling menu backgrounds 2018-11-16 18:26:26 -05:00
mazmazz
917222a8c7 Merge branch 'menu-execs' into menu-execs-skyscroll 2018-11-16 15:11:02 -05:00
mazmazz
536e0bb18a Extra title SOCs: Music and FadeScreen. TitleScrollYSpeed in MainCfg 2018-11-16 15:01:28 -05:00
mazmazz
648f57f17c Sky scroll attempt 2018-11-16 14:34:28 -05:00
TehRealSalt
24215074d0 Minor credits issues 2018-11-16 12:05:57 -05:00
TehRealSalt
4ceb09372a Final credits 2018-11-15 22:55:01 -05:00
TehRealSalt
d0f869e8f5 Final title screen 2018-11-14 00:30:51 -05:00
TehRealSalt
01d4978149 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart 2018-11-13 21:02:49 -05:00
TehRealSalt
a8b57e6f0d Title demos don't interrupt the music 2018-11-13 21:01:59 -05:00
toaster
1f93f57a42 final menu tweaks before i fall asleep in my chair 2018-11-14 01:27:01 +00:00
mazmazz
336610c042 Remove misplaced tutorialmode = false due to debugging 2018-11-13 14:12:22 -05:00
mazmazz
7b0ec6479f Merge branch 'master' into text-prompts 2018-11-13 11:12:44 -05:00
mazmazz
7b224cdcd5 Tutorial named tag detection adjustment 2018-11-13 02:00:58 -05:00
mazmazz
5270743a42 F_AdvanceToNextPage adjustment 2018-11-13 01:38:20 -05:00
mazmazz
422692ed03 NextTag implementation
* Adjust named tag implementation to be more portable
* Next page adjustments
2018-11-13 00:13:36 -05:00
mazmazz
deb036058c text-prompts gclist -> gcl refactor 2018-11-12 23:31:10 -05:00
mazmazz
7663c0828e PicToStart implementation; fix NumPrompts limitation error 2018-11-12 23:16:24 -05:00