Monster Iestyn
|
62a640e282
|
make savegamename in doomdef.h an extern, put the actual definition in d_main.c
|
2020-05-12 18:37:15 +01:00 |
|
sphere
|
948582ce4e
|
Restore SHORT().
|
2020-05-12 17:20:29 +02:00 |
|
sphere
|
4d9d125a99
|
Fix some errors and add some comments. Also, actnum is not an INT32.
|
2020-05-12 17:20:28 +02:00 |
|
sphere
|
21130dfbb0
|
Support act numbers up to 99 and draw both digits individually.
|
2020-05-12 17:17:24 +02:00 |
|
MascaraSnake
|
999ebe2fd1
|
Rename variables for Fang waypoints, in preparation for new global waypoint data structure
|
2020-05-12 14:53:10 +02:00 |
|
Sally Coolatta
|
95a077b4dd
|
C'mon git merge everything, not just most of it |:V
|
2020-05-12 03:16:35 -04:00 |
|
Sally Coolatta
|
15d18640de
|
Merge remote-tracking branch 'public/master' into merge-12
|
2020-05-12 03:16:14 -04:00 |
|
Sally Coolatta
|
f903ca960d
|
Not in modeattacking
|
2020-05-12 01:41:00 -04:00 |
|
Sally Coolatta
|
ccfc326885
|
Add to CMakeLists
|
2020-05-12 00:20:59 -04:00 |
|
Sally Coolatta
|
45e2f03846
|
New colors
- Removed Salmon, Robo-Hood, Caribbean, and Azure.
- Added Skunk, Robin, Blueberry, and Blossom.
- Updated Lime, Algae, Violet and Magenta.
- Renamed old Blueberry to Midnight.
|
2020-05-11 23:46:37 -04:00 |
|
Wolfy
|
a8529f0855
|
Update patch.kart hash
|
2020-05-11 22:31:38 -05:00 |
|
wolfs
|
4bfea852f8
|
Merge branch 'appveyor-shit' into 'next'
Fuck you Appveyor / Thank you Appveyor
See merge request KartKrew/Kart-Public!165
|
2020-05-11 22:43:44 -04:00 |
|
James R
|
2e42865655
|
Fucking shadowed declarations in hw_md2.c
|
2020-05-11 18:57:38 -07:00 |
|
James R
|
bd52a32eb6
|
Disable 64-bit Appveyor builds
|
2020-05-11 18:55:20 -07:00 |
|
James R
|
3e2c7f42a1
|
Name the archive like the EXE
(cherry picked from commit 4304fe91e65845e3887935de046876b6313af9c9)
|
2020-05-11 18:45:46 -07:00 |
|
James R
|
72c4eedd4f
|
Windows is dumb so no colon
srb2win-jameds-appveyor-exename-b1d931d47.exe
(cherry picked from commit 70cf119a8402607116b2f8fbb79028a2de0e8d96)
|
2020-05-11 18:45:46 -07:00 |
|
James R
|
ae7eb4bd57
|
Check if this actually is a PR before using those variables
(cherry picked from commit e082553f6d3a90baf97e056ab6790ce136f502d0)
|
2020-05-11 18:45:45 -07:00 |
|
James R
|
9b6410e86f
|
I promise I know what I'm doing
(cherry picked from commit 6337932190d68d6f825f4f5dd47a6f3655c88f16)
|
2020-05-11 18:45:45 -07:00 |
|
James R
|
6265bd53fb
|
Use the pull request repo, branch and commit
srb2win-jameds:appveyor-exename-b1d931d47.exe
(cherry picked from commit ef2febe1e01bc7c93f30d2063bfd754b1a79dd3a)
|
2020-05-11 18:45:45 -07:00 |
|
James R
|
959674c533
|
Well I'm an idiot
(cherry picked from commit b1d931d471bcf2ec9a40f6e7e52518807c5fd14b)
|
2020-05-11 18:45:45 -07:00 |
|
James R
|
98d6708b29
|
Put the abbreviated commit hash in the EXENAME for AppVeyor
srb2win-master-a6d49eaaa.exe
(cherry picked from commit d3315ae03c57296bfb5a7f9f5959492bdb7de24c)
|
2020-05-11 18:45:44 -07:00 |
|
James R
|
15193cb2b3
|
Put branch name and commit hash in EXENAME for AppVeyor builds
srb2win-master-a6d49eaaa70be5f88c26623c7b4a2fa5a770341e.exe
(cherry picked from commit c3f42859882e6a1a789668d9b78d1310dd5e7312)
|
2020-05-11 18:45:44 -07:00 |
|
James R
|
069e3589c2
|
Use GCC 8.1 for x86_64
(cherry picked from commit 658b8dcfa95935bbaef92c15476ad57ecc96950f)
|
2020-05-11 18:45:43 -07:00 |
|
James R
|
32ef2ec1b6
|
Remove Direct Draw from AppVeyor config
(cherry picked from commit 945f50c2736ee64734dcc94f36ff7dff4085c8e2)
|
2020-05-11 18:45:42 -07:00 |
|
Alam Ed Arias
|
06448c15cf
|
Appveyor: other way around, the Mingw32 is at 9.1
(cherry picked from commit 0c2b3002944b28cd823326fb5febc71fad120ca0)
|
2020-05-11 18:43:25 -07:00 |
|
Alam Ed Arias
|
85ae5251fc
|
Appveyor: the Mingw64 is 9.1, the Mingw32 is still 7.3
(cherry picked from commit 33c0b825a7cdfd6538f388748dba334191fbb9ee)
|
2020-05-11 18:43:25 -07:00 |
|
Alam Ed Arias
|
ca22d7524e
|
Makefile: GCC80 does not exist
(cherry picked from commit eacf89e309d555bda78ed69945a7d995e56a3292)
|
2020-05-11 18:43:25 -07:00 |
|
Alam Ed Arias
|
2a116ac847
|
Tested to be compile with Mingw64 9.1.0
(cherry picked from commit 5a79a446dfc3632de3e27567afd65d9782510739)
|
2020-05-11 18:43:24 -07:00 |
|
Alam Ed Arias
|
a3287a8913
|
Makefile: support GCC 9.1
(cherry picked from commit d5cc3ce48daf594fc64ecdbaeceb5c537cf5bf72)
|
2020-05-11 18:43:01 -07:00 |
|
Alam Ed Arias
|
c12fac04c1
|
Makefile: stop building with DWARF v2 debugging info
(cherry picked from commit 07f89fd6b5130b886ba20cf4e8a2f1022853fb14)
|
2020-05-11 18:43:01 -07:00 |
|
Wolfy
|
61a4e1e762
|
HWR_CreateBlendedTexture optimizations
By Hannu_Hanhi
|
2020-05-11 17:47:24 -05:00 |
|
Steel Titanium
|
a491f20bee
|
Merge branch 'master' into next
|
2020-05-11 18:20:09 -04:00 |
|
SteelT
|
a43072a853
|
Merge branch 'splitscreen-titlecards-fix' into 'master'
Fix splitscreen Title Card act name regression
See merge request STJr/SRB2!934
|
2020-05-11 18:18:22 -04:00 |
|
SteelT
|
9e93ab4cf5
|
Merge branch 'menu-soc-bullshit-mergefix' into 'master'
Menu soc bullshit mergefix
See merge request STJr/SRB2!933
|
2020-05-11 18:17:59 -04:00 |
|
SteelT
|
1c7f684f3e
|
Merge branch '2.2.4-prep' into 'next'
2.2.4 preparation
See merge request STJr/SRB2!935
|
2020-05-11 18:06:11 -04:00 |
|
James R
|
4753c9042d
|
Merge remote-tracking branch 'origin/next' into 2.2.4-prep
|
2020-05-11 15:01:32 -07:00 |
|
LJ Sonic
|
b0c1bf50e3
|
Merge branch 'fix-rollout-rock-crash' into 'next'
Fix crash with rollout rock
See merge request STJr/SRB2!936
|
2020-05-11 17:57:31 -04:00 |
|
Louis-Antoine
|
be67ca3203
|
Fix crash with rollout rock
|
2020-05-11 23:48:35 +02:00 |
|
James R
|
e95d2beed7
|
Update patch.pk3 asset hash
|
2020-05-11 14:41:36 -07:00 |
|
James R
|
ffd88746da
|
Update version names, SUBVERSION, MODVERSION
|
2020-05-11 14:41:36 -07:00 |
|
Monster Iestyn
|
ce3639f569
|
Merge branch 'master' into next
|
2020-05-11 20:08:02 +01:00 |
|
Zwip-Zwap Zapony
|
cb9d0a2fbe
|
Fix splitscreen Title Card act name regression
This fixes act names not being shown on player 2's view
|
2020-05-11 19:57:20 +02:00 |
|
MascaraSnake
|
ca324f7edc
|
Merge branch 'showfps-fix' into 'master'
Don't show the FPS counter during startup.
See merge request STJr/SRB2!930
|
2020-05-11 13:31:26 -04:00 |
|
MascaraSnake
|
35b4f88efe
|
Merge branch 'fix-simple-camera-and-eggstatue' into 'next'
Fix Simple Camera not working with the tutorial's statue challenge
See merge request STJr/SRB2!931
|
2020-05-11 13:31:09 -04:00 |
|
MascaraSnake
|
2ec7a14b9d
|
Merge branch 'delete-lua-again' into 'next'
Fix the BotRespawn hook and hooking A_Dye being disabled for no reason
See merge request STJr/SRB2!932
|
2020-05-11 13:30:18 -04:00 |
|
toaster
|
67e01ad66e
|
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into fickleheart/SRB2-menu-soc-bullshit
# Conflicts:
# src/m_menu.c
|
2020-05-11 15:00:31 +01:00 |
|
Sally Coolatta
|
b4f5d931cc
|
Skincolor code cleanup
Split everything off into its own file and turn SETBRIGHTNESS from a define into a function (K_ColorRelativeLuminance).
|
2020-05-11 02:28:25 -04:00 |
|
James R
|
1065ded275
|
Remove instances of HAVE_BLUA that actually disable Lua now
|
2020-05-10 19:59:56 -07:00 |
|
James R
|
5ad69621f2
|
Use camera angle, not mobj angle, when comparing Angle Anchor
|
2020-05-10 19:40:28 -07:00 |
|
Sally Coolatta
|
ccc2d17817
|
Actually do what the last commit said it would do
🤦
|
2020-05-10 19:43:41 -04:00 |
|