Commit graph

9962 commits

Author SHA1 Message Date
James R
fb0bedf02c Merge branch 'ogl-colorbug' into 'master'
Fix OpenGL "color bug"

See merge request STJr/SRB2!795
2020-02-20 19:32:34 -05:00
James R
62d943b609 Merge branch 'thin-fixed' into 'next'
Add more strings (and respective functions) for v.drawString().

See merge request STJr/SRB2!770
2020-02-20 19:27:01 -05:00
Snu
2a93ddc2dd Change SKINCOLOR_SUPERGOLD1-5 2020-02-20 21:53:21 +00:00
Sally Cochenour
400366802c Make hook_FollowMobj a mobj hook instead of a player hook
Makes more logical sense, as if you have a custom follow item for a custom skin, you probably want your new thinker to only run for your new MT_ and not the vanilla ones.
2020-02-20 16:40:39 -05:00
Monster Iestyn
5c33ff0458 clarify the situation a bit more in the comments 2020-02-20 20:38:01 +00:00
Monster Iestyn
903cc311a7 move -warp code to a later part of D_SRB2Main so G_LoadGameData isn't upset by G_SetGameModified 2020-02-20 20:31:11 +00:00
Louis-Antoine
3502278f8a SpaceSpaceSpaceSpace 2020-02-20 01:15:54 +01:00
James R
54794f325d :) 2020-02-19 14:44:22 -08:00
James R
61470201f9 Regex bruh moment 2020-02-19 14:37:42 -08:00
James R
7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Louis-Antoine
12959ff4a9 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into lua-io 2020-02-19 22:40:54 +01:00
Louis-Antoine
20d054a679 Minor code cleanup 2020-02-19 22:37:30 +01:00
Louis-Antoine
ebc1809da9 Fix bad tabulation 2020-02-19 22:01:33 +01:00
Tatsuru
380b2f87bb Merge branch 'coloredtitlecard' into Tatsuru/SRB2-dye 2020-02-19 17:47:13 -03:00
Tatsuru
3022e38d15 Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into Tatsuru/SRB2-dye
# Conflicts:
#	src/d_player.h
#	src/dehacked.c
2020-02-19 17:46:18 -03:00
Tatsuru
80edefa56e Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye 2020-02-19 17:32:43 -03:00
Steel Titanium
281d40d6d2 Merge branch 'master' into next 2020-02-18 22:03:08 -05:00
James R
d3d8f85602 Merge branch 'the-colors-feel-so-right' into 'next'
New skin colors, add support for preferred opposite color to save cards, new lua features.

See merge request STJr/SRB2!787
2020-02-18 22:02:01 -05:00
James R
92f65fd822 Merge branch 'exitmove-tweaks' into 'next'
Exitmove tweaks

See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
James R
a447a3d8a9 Merge branch 'rscache' into 'master'
Fix R_CacheRotSprite not working with PNG lumps

See merge request STJr/SRB2!800
2020-02-18 21:54:45 -05:00
James R
b92d66a54c Merge branch 'seenames-fix' into 'master'
Fix seenames not working without a SeenPlayer hook

See merge request STJr/SRB2!799
2020-02-18 21:53:28 -05:00
James R
c1a91cdc2e Merge branch 'setrenderneeded-fix' into 'master'
Clear setrenderneeded after calling VID_CheckRenderer

See merge request STJr/SRB2!793
2020-02-18 21:53:14 -05:00
James R
26825a2b4c Merge branch 'pw-justlaunched' into 'next'
Add pw_justlaunched to tell modders when a player launches from a slope

See merge request STJr/SRB2!792
2020-02-18 21:53:05 -05:00
James R
2d8522b9ec Merge branch 'titlecard-options' into 'next'
Allow more options for when the titlecard shows up

See merge request STJr/SRB2!765
2020-02-18 21:52:03 -05:00
James R
8054f341a1 Merge branch 'startup-file-not-found' into 'master'
Fix the issue !678 did, but just don't exit if the file was added twice

See merge request STJr/SRB2!753
2020-02-18 21:50:11 -05:00
James R
3fc9c7d298 Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER 2020-02-18 18:23:20 -08:00
Tatsuru
4a8de7cb55 Enough 2020-02-18 22:55:40 -03:00
Tatsuru
b1ad7787f4 Standards 3 2020-02-18 22:54:11 -03:00
Tatsuru
ec67e776dc Standards 2 2020-02-18 22:50:22 -03:00
Tatsuru
c76a8e8a58 Standards 2020-02-18 22:46:16 -03:00
Steel Titanium
da15c92568 Merge branch 'master' into next 2020-02-18 17:41:13 -05:00
Jaime Passos
1dc080e8cd Merge remote-tracking branch 'origin/master' into rscache 2020-02-18 19:38:19 -03:00
Jaime Passos
72edf514c2 Merge remote-tracking branch 'origin/master' into seenames-fix 2020-02-18 19:37:55 -03:00
SteelT
802bd4040f Merge branch 'ftrim-tweak-2' into 'master'
M_Ftrim

See merge request STJr/SRB2!798
2020-02-18 17:24:05 -05:00
Steel Titanium
f0e2ba9e6a Merge branch 'next' into the-colors-feel-so-right 2020-02-18 14:29:50 -05:00
MascaraSnake
cae99654be Merge branch 'next' into udmf-next 2020-02-18 18:39:11 +01:00
Monster Iestyn
2b3034a7af Merge branch 'master' into next 2020-02-18 17:38:05 +00:00
James R
e3ba369ae4 Fix M_Ftrim
- Use '%f' instead of '%g' to avoid going scientific. Should also fix some
  compiler warnings.
- The trailing zero trimming code is now useful. It started on the terminating
  byte before and wouldn't have done anything with '%g' anyway.
- Use the absolute fractional value to avoid a sign.
2020-02-17 19:38:14 -08:00
Jaime Passos
369fd8e35f Fix LUAh_SeenPlayer not working 2020-02-17 23:06:38 -03:00
Jaime Passos
b3933c7842 Fix R_CacheRotSprite not working with PNG lumps 2020-02-17 22:59:36 -03:00
Jaime Passos
bd7b2fcb93 setrenderneeded is already cleared earlier 2020-02-17 22:33:36 -03:00
Jaime Passos
d3abf5dcfa Set the palette :) 2020-02-17 22:31:34 -03:00
James R
b78fc670d0 Don't let console open with menu keys while the menu is open 2020-02-17 17:10:29 -08:00
Jaime Passos
bef6cb532b Fix what !785 tried to fix, but correctly 2020-02-17 21:58:32 -03:00
James R
b2733eba73 Draw console in the Record/NiGHTS Attack menus
(cherry picked from commit 4efd915d28)
2020-02-17 16:37:29 -08:00
James R
a9a0601c84 Revert "Revert "Let the console open in menus""
This reverts commit 705cf9fd40.
2020-02-17 16:37:13 -08:00
Jaime Passos
e53a17bb52 Rename stuff around 2020-02-17 21:11:56 -03:00
Jaime Passos
cac5f9d171 add -nogl parm 2020-02-17 12:14:51 -03:00
James R
d0b9027d0a Merge branch 'viewroll' into 'next'
Rolling

See merge request STJr/SRB2!690
2020-02-17 00:10:57 -05:00
James R
9bd9e667c5 Merge branch 'push-special-params' into 'master'
"+" command line parameters make sense

See merge request STJr/SRB2!707
2020-02-17 00:05:49 -05:00