900f7e3dc9
FORCEWIPEOFF define in place of wipegamestate = -2
2018-11-25 19:40:18 -05:00
ab47e83939
Merge remote-tracking branch 'origin/master' into menu-execs
2018-11-25 19:03:22 -05:00
73be0c33ae
Use get_number in dehacked readmenu
2018-11-25 15:16:53 -05:00
e2ca92a3db
Remove unused menu hierarchy methods
2018-11-25 15:09:25 -05:00
0439479b3e
Remove M_ApplyMenuPresState
2018-11-25 15:08:36 -05:00
eb95289ea4
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
146dd52d24
Smarter pause/break rejection for setcontrol
2018-11-22 14:48:33 -05:00
38b4425030
Merge branch 'new-control-names' into 'master'
...
Change camera control names to Look
See merge request STJr/SRB2Internal!207
2018-11-22 11:32:10 -05:00
dd1ecb04cf
Change camera control names to Look
2018-11-22 11:28:32 -05:00
9ff8881e95
Merge branch 'nights-nerfjump' into 'master'
...
Nights nerfjump
See merge request STJr/SRB2Internal!206
2018-11-21 21:25:14 -05:00
6a3b41ea6f
Let skins jump their regular strength variances in NiGHTS
2018-11-21 21:24:44 -05:00
40eda0e749
Nerf jumping
2018-11-21 21:13:15 -05:00
9e75774fd2
Merge branch 'nights-ideyaspawn-dronebox' into 'master'
...
NiGHTS: Ideya Anchor Points
See merge request STJr/SRB2Internal!160
2018-11-21 21:03:29 -05:00
250aab5889
Missed sign cast
2018-11-21 20:30:26 -05:00
c6bd1111e5
Merge branch 'nights-dronebox' into 'master'
...
NiGHTS: Drone hitbox improvements and player position correction on Nightserize
See merge request STJr/SRB2Internal!158
2018-11-21 20:19:39 -05:00
bb38aa649f
Merge branch 'nov20-build-fixes' into 'master'
...
Nov20 build fixes
See merge request STJr/SRB2Internal!205
2018-11-21 17:23:20 -05:00
e599428442
Merge branch 'debug_stuff' into 'master'
...
Debug tweaks
See merge request STJr/SRB2Internal!144
2018-11-21 16:41:51 -05:00
f3e4cf1f9d
Merge branch 'nights-fastercapsule' into 'master'
...
NiGHTS: Faster Egg Capsule destruct sequence
See merge request STJr/SRB2Internal!164
2018-11-21 16:30:01 -05:00
597877773b
Merge branch 'nights-onfootcapsulefix' into 'master'
...
NiGHTS: Allow player to destroy capsule on-foot before transforming into NiGHTS
See merge request STJr/SRB2Internal!185
2018-11-21 16:29:37 -05:00
973df61ec2
Merge branch 'hud-n-menu-tidbits' into 'master'
...
Improved addons menu performance and other HUD tidbits
See merge request STJr/SRB2Internal!151
2018-11-21 16:29:24 -05:00
9bdab67de6
Don't accept KEY_PAUSE for control console command
2018-11-21 11:21:17 -05:00
2acad7ad86
Dont show Hold to Retry HUD when using Pause/Break key
2018-11-21 11:10:18 -05:00
8a9c10e633
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-21 10:58:07 -05:00
74da082c75
Merge remote-tracking branch 'origin/master' into HEAD
2018-11-20 23:19:36 -05:00
c0df7b47c5
Merge branch 'c88bbda028a21a51058488ee0214ce925625f0a0' into nov20-build-fixes
...
# Conflicts:
# src/hardware/hw_main.c
2018-11-20 22:42:20 -05:00
ddd357d27c
VC build fixes
2018-11-20 21:54:20 -05:00
0af071dbca
build errors
2018-11-20 20:23:48 -05:00
dcac157ccd
Merge remote-tracking branch 'origin/master' into menu-execs
2018-11-20 18:31:30 -05:00
5870d145b2
Draw connection screen correctly; make scroll speed inherit global setting
2018-11-20 18:13:18 -05:00
094ec7ce3c
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
b2c3a39a2f
I forgot to do this earlier, welp
2018-11-20 21:17:46 +00:00
224c0fccdb
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile.cfg
# src/d_clisrv.c
# src/p_setup.c
# src/r_segs.c
# src/r_things.c
2018-11-20 14:33:10 +00:00
66900c70ee
Merge branch 'master' into next
2018-11-20 13:55:36 +00:00
948466658f
Merge branch 'fof-wall-rendering-fixes-and-cleanup' into 'master'
...
FOF wall rendering fixes and cleanup
See merge request STJr/SRB2!317
2018-11-20 08:54:09 -05:00
2d1f927a17
Fix the nonsense going on here regarding dc_colormap, this makes FOF walls appear strange if they were for a fog block with colormap adjacent to a normal sector with a colormap and no FOFs.
...
...that was a mouthful
2018-11-19 22:12:26 +00:00
f34e1edb4d
Travis-CI: allow GCC 8.x to fail
2018-11-18 21:25:33 -05:00
a290c4727b
Merge branch 'master' into Travis_CI-gcc8
2018-11-18 21:23:27 -05:00
42afd3532d
Merge branch 'master' into next
2018-11-18 20:22:40 -05:00
0b5069f36c
We need to include the NUL char
2018-11-18 20:21:32 -05:00
5a09d44fd2
Merge remote-tracking branch 'public/master' into Travis_CI-gcc8
2018-11-18 19:59:21 -05:00
ab39534ef6
Merge branch 'mingw-64bit' into 'master'
...
MinGW: Fix compiling on 64-bit Windows.
See merge request STJr/SRB2!329
2018-11-18 19:49:18 -05:00
243f4eedd8
Statically link stdc++ and libgcc into libgme
...
Should fix libgme depending on two DLLs externally.
2018-11-18 18:09:34 -05:00
4fa6895f60
Fixed skullAnimCounter type for text prompts
2018-11-18 12:56:37 -05:00
8c71cd0b90
Merge branch 'master' into next
2018-11-18 17:11:57 +00:00
a400bb9ef6
Merge branch 'camera-subsector-crash-fix' into 'master'
...
Camera subsector crash fix
See merge request STJr/SRB2!318
2018-11-18 08:28:38 -05:00
53b956f540
Mirror a wipe if it's forced off and the counter-wipe is specified
2018-11-18 04:39:34 -05:00
765e4b3134
Compiler fixes
2018-11-18 04:32:38 -05:00
3d1e5fa7e8
Allow inherited wipes when switching menus without a common ancestor (Multiplayer > Server Settings)
2018-11-18 03:32:19 -05:00
5fc91e8405
Fix lingering titlemapcameraref when reloading title screen
2018-11-18 03:19:32 -05:00
3acabdab93
Fix MN_SPECIAL check for menu meta state
2018-11-18 03:19:07 -05:00
mazmazz