d89050f073
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into public_hexang
...
# Conflicts:
# src/r_defs.h
2020-01-08 21:47:47 +00:00
7deb18bdc9
Merge remote-tracking branch 'origin/master' into next
2020-01-08 13:27:14 -08:00
4d8c916ca1
Merge branch 'names-update' into 'master'
...
Update copyright statements for changed names
See merge request STJr/SRB2!644
2020-01-08 16:16:41 -05:00
551df5f93a
Merge branch 'state-fix' into 'next'
...
Fix S_HAMMER being off by one
See merge request STJr/SRB2!654
2020-01-08 16:15:55 -05:00
a63bd720b9
Merge branch 'next-newcontrols' into 'next'
...
fcam simple controls but slightly less hacky
See merge request STJr/SRB2!647
2020-01-08 16:15:47 -05:00
117d5ab66f
Merge branch 'highresscale-continue' into 'master'
...
Apply skin's highresscale to continue screen
See merge request STJr/SRB2!645
2020-01-08 16:15:15 -05:00
6870492cf2
Merge branch 'more-opengl-fixes' into 'master'
...
More OpenGL fixes plus masked PNG conversion
See merge request STJr/SRB2!619
2020-01-08 16:14:51 -05:00
3b90571987
Merge branch 'local-lua-commands' into 'next'
...
Local Lua commands + no magic numbers
See merge request STJr/SRB2!602
2020-01-08 16:14:30 -05:00
07dfc5cce7
Fix S_HAMMER being off by one
2020-01-08 16:00:02 -05:00
0b1108425d
Hexafaceted sprite angle support (See merge request description coming soon).
...
Also, some minor memory efficiency fixes to both rotsprite and ordinary sprite rotations.
2020-01-08 20:49:14 +00:00
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
6211c80a69
Mixed code and declaration stuff
2020-01-08 00:22:17 -06:00
5abf0c24f9
oh god I forget why this is here but let's not remove it now
2020-01-08 00:21:03 -06:00
0597d0ccbd
Merge branch 'dashmode-tweaks' into 'next'
...
Dashmode tweaks
See merge request STJr/SRB2!646
2020-01-08 01:10:44 -05:00
c133e645f7
Merge remote-tracking branch 'upstream/next' into next-newcontrols
2020-01-07 23:43:43 -06: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
e069e149d9
Apply skin's highresscale to continue screen
2020-01-07 13:56:54 +08:00
360e8f28b4
ifdefs make indenting confusing
2020-01-07 01:24:04 -03:00
808d731652
Update copyright statements for changed names
2020-01-06 17:16:27 -05: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
03245b28fd
Merge remote-tracking branch 'origin/master' into more-opengl-fixes
2020-01-05 22:04:51 -03:00
9086b1851d
Fix chroma key
2020-01-05 22:04:19 -03: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
d93adbacbb
Fix GetTextureUsed
2020-01-05 18:10:33 -03: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
6d754821fb
AA trees are not needed at all for rotated patches
2020-01-05 03:10:03 -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
f8a3e3b898
Merge remote-tracking branch 'origin/next' into next-newcontrols
2020-01-04 09:57:09 -06:00
f0e6a56b6b
Merge branch 'newcontrols' into next-newcontrols
2020-01-04 09:56:24 -06:00
34fe284416
Fix camera stuff in splitscreen
2020-01-04 09:54:56 -06:00
toaster