Commit graph

18023 commits

Author SHA1 Message Date
Jaime Ita Passos
06bad96b03 Fix a few renderflags oversights in OpenGL 2021-03-02 02:27:14 -03:00
James R
017c5a363f Fix casing 2021-03-01 19:49:44 -08:00
Lachlan Wright
e24ed9bd75 Merge branch 'nogmever' into 'next'
Check if GME_VERSION is defined.

See merge request STJr/SRB2!1372
2021-03-01 17:50:48 -05:00
Lachlan Wright
5ede909a1f Merge branch 'fix-flipped-bounce' into 'next'
Fix CA_BOUNCE height when flipped (Fixes #428)

Closes #428

See merge request STJr/SRB2!1373
2021-03-01 17:49:54 -05:00
Steel Titanium
85bd18eeec Merge branch 'master' into next 2021-03-01 16:55:48 -05:00
Lachlan Wright
8ea7e3498d Merge branch 'marathon-pause-fix' into 'next'
Disable pausing during score screens in marathon mode

See merge request STJr/SRB2!1416
2021-03-01 16:51:28 -05:00
Lachlan Wright
4c4b4b1f68 Merge branch 'skincolor-modif-fix' into 'next'
Fix translation colormap cache rebuilding using the old translation enumerations (fixes #443, #449, #459)

Closes #443, #449, and #459

See merge request STJr/SRB2!1421
2021-03-01 16:49:20 -05:00
Lachlan Wright
b71a9478da Merge branch 'linkdraw-scale-fix' into 'next'
Fix thing scale mismatch in R_DrawVisSprite. (Fixes #458)

Closes #458

See merge request STJr/SRB2!1420
2021-03-01 16:49:10 -05:00
Lachlan Wright
032c40863d Merge branch 'revert-e305de03' into 'next'
Revert "Merge branch 'player-speed' into 'next'"

Closes #466 and #471

See merge request STJr/SRB2!1418
2021-03-01 16:49:00 -05:00
Sally Coolatta
0be122189f Remove turn easing code
Vanilla holdover lots of people complain about & tbh just doesn't need to exist
2021-03-01 12:39:42 -05:00
Sally Coolatta
d165e723be Make it through Lua 2021-03-01 01:49:05 -05:00
Sally Coolatta
a93acd1958 Make it through OGL 2021-03-01 01:48:31 -05:00
Sally Coolatta
1619efec82 Make it past kart & mixer files 2021-03-01 01:13:03 -05:00
Sally Coolatta
885b7673eb Makes it to kart files 2021-03-01 01:02:23 -05:00
James R
ec00710396 Use 2.2's version of the -warp parameter 2021-02-28 21:51:44 -08:00
Sally Coolatta
4139e67ddb Renderer compile errors 2021-02-28 23:31:56 -05:00
Sally Coolatta
f540156bbf Fully fix taglist for james scroller 2021-02-28 23:11:51 -05:00
Sally Coolatta
7dca95da14 Fix scroller merge 2021-02-28 23:01:46 -05:00
Sally Coolatta
caa5314866 Get past some taglist stuff 2021-02-28 22:58:30 -05:00
Sally Coolatta
420a6ccccb Fix Dehacked loading 2021-02-28 22:39:47 -05:00
Sally Coolatta
7f912e1558 Remove unused cv_freedemocamera
Not relevant to kart
2021-02-28 21:28:18 -05:00
Sally Coolatta
20e2c78331 Delete seenames code
We had SEENAMES disabled before, and vanilla removed the define, so I went ahead and removed it. Repurposed the old seenames console variable for our nametags.
2021-02-28 21:27:23 -05:00
Sally Coolatta
4c9aceded1 Merge remote-tracking branch 'srb2/next' into 22-merge-again 2021-02-28 21:03:09 -05:00
Sally Coolatta
23ed607d11 Handle angleturn conflict
Since Sryder mentioned it, the main difference is:

- player->angleturn is the absolute angle, like vanilla, but it's now an angle_t, so it doesn't need shifted.
- cmd->turning modifies player->angleturn relatively, instead of absolute angles being stored in the cmd (makes the system less cheatable for kart)
- Because the absolute angle is no longer stored in the cmd, all of the pre/post angleturn values that vanilla has basically just need to be flat-out removed.
2021-02-28 21:02:14 -05:00
James R
0bd0b98909 Fix dependency file trying to be made for SRB2.res and not for interface/blua/hardware files 2021-02-28 17:02:08 -08:00
James R
2a9cb311b3 I forgot to add the dep directory 2021-02-28 16:14:54 -08:00
Jaime Ita Passos
049b50a791 Change I_Error message 2021-02-28 17:47:12 -03:00
Jaime Ita Passos
f71281b498 Fix translation colormap cache rebuilding using the old translation enumerations
This was causing a buffer underwrite too. Lovely.
2021-02-28 17:05:25 -03:00
Jaime Ita Passos
95c6139b32 Fix thing scale mismatch in R_DrawVisSprite 2021-02-28 16:23:40 -03:00
sphere
943b7b5aab Merge branch 'fix-implicit-tablecheck' into 'next'
Fix "implicit declaration of function 'DEH_TableCheck'" warning

See merge request STJr/SRB2!1419
2021-02-28 12:14:28 -05:00
sphere
3fe8e01a4e Merge branch 'udb-config-bruh' into 'master'
Nice UDB config there, SRB2.

See merge request STJr/SRB2!1354
2021-02-28 11:57:30 -05:00
GoldenTails
4a0c907d34 Make it more async-signal-safe 2021-02-27 18:07:47 -06:00
GoldenTails
9a2e330af2 Print the backtrace before showing the signal handler popup. 2021-02-27 18:07:47 -06:00
GoldenTails
0c71a73513 Use file descriptors and ditch file streams, for now. 2021-02-27 18:07:47 -06:00
GoldenTails
9bc3050c49 Crash backtrace logging for NEWSIGNALHANDLER. 2021-02-27 18:07:47 -06:00
Sryder
a25d721a6a Fix some d_clisrv compile errors. Left some in regarding angleturn because I know we have it different but I can't remember exactly how.
Made issue #133 regarding some changes we should mirror.
2021-02-27 15:19:51 +00:00
Jaime Ita Passos
a8909190ff Fix "implicit declaration of function 'DEH_TableCheck'" warning 2021-02-27 12:04:48 -03:00
James R
98bcfc7cac Conflicts e9bbdb8cc3 ef1ca357de 2021-02-27 03:35:38 -08:00
James R
9df5a4b25f Conflicts a59c03fef 08d087c6b 2021-02-27 03:32:19 -08:00
James R
6cb0e9667d Conflicts da7e79ac83 d5688f53a0 2021-02-27 03:29:01 -08:00
James R
1ce3a7dd56 Conflicts cb3660331a 031665cdf 2021-02-27 03:26:17 -08:00
James R
0243a31ee4 Merge branch 'dependency-files' into 'master'
Dependency files

See merge request STJr/SRB2!1407
2021-02-27 05:38:13 -05:00
Sally Coolatta
9d7ec0ab8f Merge SRB2 next
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
Sally Coolatta
1f082f15e6 Merge SRB2 master 2021-02-27 02:25:14 -05:00
Sally Coolatta
d63b428565 Merge Kart-Public next 2021-02-27 02:16:21 -05:00
Sally Coolatta
176900c7e2 Merge branch 'master' into next 2021-02-27 00:38:43 -05:00
Sally Coolatta
cbe14d74c8 Increase default hint weight 2021-02-26 22:56:59 -05:00
Sally Coolatta
cb655f863c Reduce object distance by its radius
Just gives bot hint size a purpose again, even if it's minor.
2021-02-26 22:43:10 -05:00
Lachlan Wright
67b06edf3e Revert "Merge branch 'player-speed' into 'next'"
This reverts merge request !1309
2021-02-27 03:38:13 +00:00
Sally Coolatta
03c13052e8 Fix bot hint weighting 2021-02-26 22:37:46 -05:00