Jaime Passos
a6472c2ffb
Merge remote-tracking branch 'origin/next' into pictureformats
2020-01-10 04:11:26 -03:00
James R
f1712f2cd8
Merge branch 'rollout_consistency' into 'next'
...
Rollout Rockonsistency
See merge request STJr/SRB2!655
2020-01-09 16:20:34 -05:00
Alam Ed Arias
f267f7bb3e
whitespace cleanup
2020-01-09 16:19:12 -05:00
James R
2317cb4c04
Merge branch 'public_hexang' into 'next'
...
Hexafaceted sprite angle support.
See merge request STJr/SRB2!652
2020-01-09 16:14:49 -05:00
MascaraSnake
9c70ee2690
Merge branch 'fakeplanes-colormap' into 'next'
...
Don't create colormap data out of sidedef text for fake planes linedef
See merge request STJr/SRB2!648
2020-01-09 15:04:33 -05:00
toaster
4f77e1e99b
Allow Rollout Rocks that are being ridden to:
...
* Break bustable FOFs like pushables.
* Activate pushable-counting executor activators.
* Get pushed by currents/wind.
This takes advantage of the previously-existing hack relating to objects with MF_PUSHABLE infotable (but not active) flags and a nonzero fuse, which is used as the condition to group this under (rather than MT_ROLLOUTROCK specific fuckery).
Thanks to the bug report submitted by our kirbs pal for getting me off my ass this evening.
2020-01-08 22:36:29 +00:00
toaster
456778f950
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
James R
f97afe47fa
Merge remote-tracking branch 'origin/master' into next
2020-01-08 13:27:14 -08:00
James R
b3a03c76b4
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
James R
0046d8844d
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
James R
0035964251
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
James R
0f79370188
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
James R
60ffbcdf29
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
James R
40d080cfe1
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
Steel Titanium
447f9e65c3
Fix S_HAMMER being off by one
2020-01-08 16:00:02 -05:00
toaster
336b6ad85e
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
MascaraSnake
8ae2f1d4d3
Don't create colormap data out of sidedef text for fake planes linedef (the colormap data isn't even used anymore)
2020-01-08 09:28:37 +01:00
MascaraSnake
ce7a1b289f
Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next
2020-01-08 08:43:55 +01:00
MascaraSnake
3a6614409b
Fix a condition in the flame jet thinkers I accidentally messed up
2020-01-08 08:43:36 +01:00
fickleheart
e20365ca81
Mixed code and declaration stuff
2020-01-08 00:22:17 -06:00
fickleheart
7008c10f23
oh god I forget why this is here but let's not remove it now
2020-01-08 00:21:03 -06:00
James R
cea03e4256
Merge branch 'dashmode-tweaks' into 'next'
...
Dashmode tweaks
See merge request STJr/SRB2!646
2020-01-08 01:10:44 -05:00
fickleheart
084a8db5a9
Merge remote-tracking branch 'upstream/next' into next-newcontrols
2020-01-07 23:43:43 -06:00
Jaime Passos
e459a44848
Fix shadowed declarations
2020-01-07 20:07:35 -03:00
Jaime Passos
c85c1550c3
Fix Picture_GetPatchPixel
2020-01-07 20:05:40 -03:00
Jaime Passos
058ad19433
Fix patch generation
2020-01-07 20:05:33 -03:00
Jaime Passos
f39368dfb0
use enum for bpp
2020-01-07 20:04:18 -03:00
Jaime Passos
c7eed47340
Provide some cleaner method to generate textures as flats.
...
R_GenerateTextureAsFlat
2020-01-07 16:51:02 -03:00
Jaime Passos
9c66740e2b
AA trees are not needed at all for rotated patches
2020-01-07 16:10:38 -03:00
Jaime Passos
3b29ec3fbc
Merge remote-tracking branch 'origin/next' into pictureformats
2020-01-07 16:10:25 -03:00
Jaime Passos
679eb3902f
How did I even manage to do this?
2020-01-07 14:12:19 -03:00
Jaime Passos
769c1a4e38
Fix OpenGL
2020-01-07 14:07:14 -03:00
Jaime Passos
e2d0ddfb54
R_GetTextureFlat -> R_GetLevelFlat
2020-01-07 13:27:59 -03:00
Jaime Passos
82998100d3
Move location of R_CheckPowersOfTwo and R_CheckFlatLength
2020-01-07 12:46:46 -03:00
Jaime Passos
fb0d9cdede
Move location of R_GetTextureFlat
2020-01-07 12:45:22 -03:00
Jaime Passos
b6ced0884e
Organise header files, use R_GetFlat
2020-01-07 12:43:27 -03:00
Jaime Passos
96340ac80c
Move texture stuff to its own file
2020-01-07 12:35:10 -03:00
lachwright
1811a2a34d
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
James R
9804e15e6f
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
lachwright
58d1bcf984
Apply skin's highresscale to continue screen
2020-01-07 13:56:54 +08:00
Tatsuru
30683f5bdd
ifdefs make indenting confusing
2020-01-07 01:24:04 -03:00
Jaime Passos
d18b0dcde8
How did I mess this up?
2020-01-06 22:08:51 -03:00
Jaime Passos
d9b64c14c6
Missing check
2020-01-06 21:16:33 -03:00
Jaime Passos
a24607a452
Don't force 16bpp if the bit depth was already higher!
2020-01-06 21:02:25 -03:00
Jaime Passos
fd2340d802
Make error messages consistent
2020-01-06 20:42:46 -03:00
Jaime Passos
c4e082d56e
Fix patch conversion
2020-01-06 20:39:38 -03:00
Jaime Passos
66dedc3730
Initialise
2020-01-06 20:20:05 -03:00
Jaime Passos
385a6cf3c3
Cleanup, NOW
2020-01-06 20:16:48 -03:00
Steel Titanium
9a48bc65ec
Update copyright statements for changed names
2020-01-06 17:16:27 -05:00
MascaraSnake
36183e0455
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
