Alam Ed Arias
b869d29580
Fixup compiling errors
2019-12-02 12:12:26 -05:00
Jaime Passos
6cdcb24360
Fix FreeMipmapColormap crash
2019-11-24 17:37:11 -03:00
toaster
dbeec7dacc
Prevent Knuckles latching onto horizon special linedefs.
...
Also, update all references to the horizon special to use a #defined constant instead of a magic number.
2019-11-23 14:20:41 +00:00
MascaraSnake
76ef50f73e
Merge branch 'gfz-debris' into 'master'
...
VAdaPEGA's GFZ debris
See merge request STJr/SRB2Internal!505
2019-11-22 15:27:11 -05:00
lachwright
eb80360850
Add missing GFZD spriteset
2019-11-21 01:14:24 +08:00
Jaime Passos
bb3958d463
Merge remote-tracking branch 'origin/subtitlesubterfuge' into remove-unused-levelwipes
2019-11-19 21:49:45 -03:00
MascaraSnake
04fbb5dbd3
Merge branch 'cobalt-ai' into 'master'
...
CobaltBW's Tails AI
See merge request STJr/SRB2Internal!358
2019-11-18 17:26:28 -05:00
Jaime Passos
3ed8470b58
remove unused levelwipes
2019-11-18 19:22:46 -03:00
MascaraSnake
9052105215
Merge branch 'f_wipes' into 'master'
...
Colormapped fades
See merge request STJr/SRB2Internal!469
2019-11-18 17:21:09 -05:00
MascaraSnake
66cc8046a5
Merge branch 'dragonbomber' into 'master'
...
Dragonbomber
See merge request STJr/SRB2Internal!489
2019-11-18 17:10:30 -05:00
Jaime Passos
925940b44e
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-18 18:48:19 -03:00
toaster
7bcaa5c359
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into cobalt-ai
...
# Conflicts:
# src/p_map.c
2019-11-18 21:33:51 +00:00
Jaime Passos
8ce00492c2
Merge remote-tracking branch 'origin/master' into titlecards
2019-11-18 17:55:47 -03:00
Jaime Passos
f37e0de8c5
stuff
2019-11-18 11:39:54 -03:00
lachwright
cd38e4ba1a
Add flight indicator
2019-11-18 15:17:27 +08:00
toaster
5afa5f12ee
Disable the GL sprite shadows behind a #define.
...
Reasoning:
* They're horribly broken (they completely ignore slopes).
* A similar final demo GL-only feature (coronas) has been completely disabled.
* Nobody's going to bugfix them before release because not even the devteam's resident GL users use them.
* They look ugly.
2019-11-17 22:18:46 +00:00
lachwright
814ee200fa
Add Dragonbomber enemy
2019-11-18 05:23:59 +08:00
Jaime Passos
2ccdb483cd
Update hw_main.c
2019-11-15 19:40:58 -03:00
Jaime Passos
46f88101b2
Small mistake
2019-11-15 19:36:25 -03:00
Jaime Passos
ffa03980f4
Move scope of wipelumpname
2019-11-15 19:09:02 -03:00
Jaime Passos
150283b20a
I don't get it
2019-11-15 19:04:40 -03:00
Jaime Passos
aecba1ec40
Shadowed declaration and unused parameters
2019-11-15 18:58:45 -03:00
Jaime Passos
bc7686c16a
LEVELWIPES
2019-11-15 18:21:12 -03:00
Jaime Passos
dc7f8bafd5
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-14 19:57:51 -03:00
Jaime Passos
499c724f9f
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-14 12:49:03 -03:00
Jaime Passos
3e759a2b75
rename rollaxis to rotaxis
2019-11-13 12:47:30 -03:00
Jaime Passos
ae630a9a23
Rotation axis (will rename internally later)
2019-11-13 12:36:44 -03:00
MascaraSnake
d648a2ad87
Merge branch 'radiomode' into 'master'
...
Radio mode
See merge request STJr/SRB2Internal!443
2019-11-13 04:16:38 -05:00
Jaime Passos
24d20d2abb
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-12 21:38:02 -03:00
Jaime Passos
4acdb54d87
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-12 20:36:06 -03:00
Jaime Passos
845b82668b
Merge remote-tracking branch 'origin/master' into renderswitch
2019-11-12 20:25:40 -03:00
Jaime Passos
66b009722b
Merge remote-tracking branch 'origin/master' into flats-in-walls
2019-11-12 18:26:51 -03:00
MascaraSnake
fae4fb16e9
Merge branch 'internal-md3-vanilla-c' into 'master'
...
Internal MD3 merge 2 good riddance glBegin
See merge request STJr/SRB2Internal!362
2019-11-12 15:44:20 -05:00
MascaraSnake
ee58e7d234
Merge branch 'texture-flats-optimization' into 'master'
...
Texture flat optimization
Closes #257
See merge request STJr/SRB2Internal!405
2019-11-12 15:42:04 -05:00
MascaraSnake
f984c28dd0
Merge branch 'dashmodecut' into 'master'
...
Dashmode polish
Closes #266
See merge request STJr/SRB2Internal!418
2019-11-12 15:40:46 -05:00
Jaime Passos
b078b8791a
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-11 14:41:55 -03:00
Jaime Passos
d4bf34b714
Merge remote-tracking branch 'origin/master' into flats-in-walls
2019-11-11 14:10:37 -03:00
Jaime Passos
33de0ad0d7
Merge remote-tracking branch 'origin/master' into texture-flats-optimization
2019-11-11 14:05:03 -03:00
Jaime Passos
e8c475c1e9
Trying to make sense of chroma keying
2019-11-09 14:09:20 -03:00
Jaime Passos
d7f38ed2c9
Support OpenGL
2019-11-09 13:28:56 -03:00
Jaime Passos
911238945c
fix invisible planes, fix flat animation
2019-11-08 23:42:15 -03:00
Jaime Passos
a1339b60ad
Merge remote-tracking branch 'origin/master' into texture-flats-optimization
2019-11-08 23:01:29 -03:00
Jaime Passos
c7c6a0d5b3
make hwrender compile
2019-11-08 22:58:41 -03:00
James R
e255c340f0
Also allocate mipmap for MD2
2019-11-07 18:04:53 -08:00
James R
fd74f1848c
Fix nonpacked to packed cast for OpenGL
2019-11-07 16:30:29 -08:00
James R
7c0d5b3bcf
There's some whitespace...
2019-11-07 14:56:42 -08:00
toaster
a8169e3844
Sound test is cool now!
...
https://cdn.discordapp.com/attachments/405336003239477249/641295998395613224/srb20042.gif
* Port MUSICDEFs from Kart.
* Safe to modify without modifying game, so we can put it in music.dta eventually.
* "Title", "AltTitle", "Authors" fields are self-evident.
* "Soundtestpage" and "Soundtestcond" are used to determine which sound test unlockable can play them (set with Unlockable's variable, just like Level Select).
* "Stoppingtime" and "BPM" both accept floats, and are used for presentation stuff on the sound test.
* Ironically, we don't share a single field name with them. Such is the case of differing foci, though, and I expect they'll change their implementation to match (since this is necessary for a sound test).
* Change how S_AddSoundFx works to avoid iterating through all of them, and to allow cv_soundtest to only scroll through defined slots (instead of the infinite wall of thok sounds when scrolling to the left).
* Change V_DrawFixedPatch to allow scaling on two seperate axes.
* Now called "V_DrawStretchyFixedPatch".
* "V_DrawFixedPatch" is a macro to V_DrawStretchyFixedPatch now (same scale on both axes).
* Available to Lua under v.drawStretched!
* Even works in GL!
* Bugfix: Add SR_PLAYER to SOC's menutypes_list.
Stay tuned for the merge request, where I put the onus on the Music Team to finish this off...
2019-11-05 16:23:46 +00:00
Jaime Passos
79c81d3c0b
Update hw_main.c
2019-11-05 12:31:50 -03:00
Jaime Passos
ffc9626355
fix fades for real
2019-11-05 12:10:42 -03:00
Jaime Passos
5fabd3f165
function renaming
2019-11-05 10:28:19 -03:00