45404f7f27
Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next
2020-01-08 08:43:55 +01:00
031e7cfb82
Fix a condition in the flame jet thinkers I accidentally messed up
2020-01-08 08:43:36 +01:00
0597d0ccbd
Merge branch 'dashmode-tweaks' into 'next'
...
Dashmode tweaks
See merge request STJr/SRB2!646
2020-01-08 01:10:44 -05:00
01b8bd21cc
Dashmode tweaks:
...
- Remove the ability for non-SF_MACHINE players in dashmode to break spikes and monitors
- Replace instances of dashmode magic numbers with dashmode constants
- Add dashmode constants to dehacked.c
2020-01-07 15:38:48 +08:00
fc1eff6eee
Merge branch 'amyhearts-fix' into 'next'
...
Fix NPC Amy's love hearts crashing if they didn't have a set fuse
See merge request STJr/SRB2!641
2020-01-07 01:05:09 -05:00
360e8f28b4
ifdefs make indenting confusing
2020-01-07 01:24:04 -03:00
b95d1cef01
Merge branch 'ignore-glsegs' into 'next'
...
Add missing glseg checks (and remove a superfluous one)
See merge request STJr/SRB2!642
2020-01-06 17:08:32 -05:00
5b93230a94
Merge branch 'master' into next
2020-01-06 10:28:21 -05:00
21c224fce0
idented hell
2020-01-06 09:58:05 -05:00
759b1c82e2
Add missing glseg checks (and remove a superfluous one)
2020-01-06 14:40:59 +01:00
1cbf7aba0d
Merge branch 'move-map-copying' into 'next'
...
Reorder map loading
See merge request STJr/SRB2!635
2020-01-06 04:24:39 -05:00
0fbc459243
cleanup whitespace
2020-01-05 21:49:07 -05:00
07f9ddc45a
Don't fuck with the fuse if it's negative
2020-01-05 23:41:22 -03:00
fce1313517
No comments
2020-01-05 23:19:52 -03:00
664bce71de
:amybruh:
2020-01-05 23:18:38 -03:00
0bbc11c2a9
Merge branch 'lua-neatstuff' into 'next'
...
Extra functionality for lua
See merge request STJr/SRB2!601
2020-01-05 20:54:17 -05:00
ea3c36eb13
Merge branch 'fix-mouse-grabbing' into 'master'
...
Fix mouse being grabbed even when not used
See merge request STJr/SRB2!639
2020-01-05 18:46:13 -05:00
e847777a35
Fix mouse being grabbed even when not used
...
The other way around this time.
2020-01-06 00:40:28 +01:00
88c8049c77
Revert "Fix mouse being grabbed even when not used"
...
This reverts commit 6c85c4e1d3
2020-01-06 00:38:40 +01:00
6af0249d01
Merge branch 'vgetcolorfixes' into 'master'
...
Fix usage of V_GetColor
See merge request STJr/SRB2!638
2020-01-05 17:12:21 -05:00
fa690e2133
Merge branch 'appveyor-gcc-8.1' into 'master'
...
Use GCC 8.1 for AppVeyor 64-bit builds
See merge request STJr/SRB2!624
2020-01-05 17:12:06 -05:00
e4f88d142e
Merge branch 'connect-ip-textbox' into 'master'
...
Add clipboard functionality to the Connect via IP textbox.
See merge request STJr/SRB2!597
2020-01-05 17:06:45 -05:00
6c85c4e1d3
Fix mouse being grabbed even when not used
2020-01-05 18:39:16 +01:00
deee2a0d6f
I was using V_GetColor in a lot of places I shouldn't have, making the game look wrong with a non-default colour profile.
...
Though, I left R_RainbowColormap alone.
2020-01-05 03:20:05 -03:00
18ccdd855a
Merge branch 'remove-vertex-z-mk2' into 'next'
...
Remove "z" from "vertex_t"
See merge request STJr/SRB2!636
2020-01-04 19:31:16 -05:00
0a061616ef
Merge branch 'fix-nonslope-slopes' into 'next'
...
Provide a fix for "non-sloped" slopes launch/land behavior by checking the normal's components.
See merge request STJr/SRB2!634
2020-01-04 16:17:38 -05:00
9999be2d6e
Remove vertex_t's z variable.
2020-01-04 18:29:02 +01:00
91222f7527
Adapt P_ClosestPointOnLine3D() to be much like FV3_ClosestPointOnLine() and use vector3_t's as args, save for the hypotenuse calculation, which remains the same; the output should be the same as before.
...
Adapt the rope hang snapping to the new function's form.
2020-01-04 18:28:25 +01:00
49667689c1
Provide a fix for "non-sloped" slopes launch/land behavior by checking the normal's components.
2020-01-04 11:27:31 +01:00
1e42dc7ee5
Move P_ProcessLinedefsAfterSidedefs into P_LoadMapData, but move map data copying after everything else
2020-01-04 11:08:05 +01:00
a6926e339f
Merge branch 'no-compress' into 'next'
...
Compressing sidedefs can break both special effects and netgame syncing, so let's get rid of it
See merge request STJr/SRB2!628
2020-01-03 16:38:42 -05:00
26bb0b3c67
Compressing sidedefs can break both special effects and netgame syncing, so let's get rid of it
2020-01-03 21:50:27 +01:00
a26c5f5428
Merge branch 'master' into next
2020-01-03 14:56:37 -05:00
7b5f2f09c0
Merge branch 'textmap-parser' into 'next'
...
Textmap parser
See merge request STJr/SRB2!604
2020-01-03 04:14:38 -05:00
a3396d6bd7
Merge branch 'fix-major-issue' into 'master'
...
Fix major issue
See merge request STJr/SRB2!625
2020-01-02 21:03:18 -05:00
b45ee059e3
Fix major issue
2020-01-03 02:58:23 +01:00
859bef9fa2
Merge branch 'dd-is-dead' into 'master'
...
Remove Direct Draw from AppVeyor config
See merge request STJr/SRB2!622
2020-01-02 20:54:56 -05:00
12e87d58b4
Merge branch 'findvar' into 'next'
...
CV_FindVar for Lua
See merge request STJr/SRB2!583
2020-01-02 20:54:16 -05:00
ff8cb3ddb0
Merge branch 'do-not-save-netvars' into 'master'
...
Do not save netgame-synced console variables
See merge request STJr/SRB2!623
2020-01-02 20:50:00 -05:00
c6aec51d99
Merge branch 'ungrab-mouse-in-menus' into 'master'
...
Let the mouse move freely when a menu is open or game is paused
See merge request STJr/SRB2!617
2020-01-02 18:48:38 -05:00
658b8dcfa9
Use GCC 8.1 for x86_64
2020-01-02 15:45:13 -08:00
1845266bc8
Do not save netgame-synced console variables
...
This is a bad thing to do, because if you join a server,
your game will save the host's settings.
2020-01-03 00:40:49 +01:00
49934007d7
Add a "alwaysgrabmouse" console variable
2020-01-03 00:25:58 +01:00
945f50c273
Remove Direct Draw from AppVeyor config
2020-01-02 14:58:09 -08:00
dc0c17dbb8
P_LoadExtendedSubsectorsAndSegs: Print size_t with %s
2020-01-02 22:28:32 +01:00
e0e5e83869
Revert "Ungrab mouse when watching a record"
...
This reverts commit 17636ccc01
2020-01-02 20:29:51 +01:00
5ba179ad7c
Fix two bugs in extended segs loading, and add some error checking while I'm at it
2020-01-02 09:51:07 +01:00
ad610ba4aa
Move MobjLineCollide up a bit to where we first know for sure that we hit a line
2020-01-01 19:38:48 -08:00
9931f0d58f
Merge branch 'thiccnames' into 'next'
...
Allow 6-letter character names to be drawn with the thick font
See merge request STJr/SRB2!618
2020-01-01 21:49:13 -05:00
69dd8acf7f
Merge branch 'sstailscarry-fix' into 'next'
...
Fix MP Special Stages crashing if a player is being carried when it ends
See merge request STJr/SRB2!615
2020-01-01 21:49:01 -05:00
MascaraSnake