Commit graph

2766 commits

Author SHA1 Message Date
Jimita 3329c10b60
Merge branch 'next' into the_second_remote_view_camera_fix 2018-12-17 17:46:17 -02:00
Jimita 362fb491f7
Merge branch 'next' into the_second_remote_view_camera_fix 2018-12-17 15:40:20 -02:00
Monster Iestyn e9be5e895e Merge branch 'master' into next 2018-12-17 17:34:41 +00:00
Alam Ed Arias dc92bb49fd Merge branch 'revert-62faa135' into 'next'
Revert "Merge branch 'kart-luatextures-backport' into 'next'"

See merge request STJr/SRB2!390
2018-12-16 17:57:53 -05:00
Alam Ed Arias 14e98df69b Revert "Merge branch 'kart-luatextures-backport' into 'next'"
This reverts merge request !387
2018-12-16 22:57:39 +00:00
Monster Iestyn 6b1b11441d Merge branch 'sdl-sound-fix' into 'master'
SDL: Force use DirectSound driver to fix wrong-pitch sound effects

See merge request STJr/SRB2!375
2018-12-16 17:16:49 -05:00
Monster Iestyn 62faa135db Merge branch 'kart-luatextures-backport' into 'next'
Lua: Expose R_TextureNumForName

See merge request STJr/SRB2!387
2018-12-16 17:15:31 -05:00
Monster Iestyn 33e99a279e Merge branch 'deprecate-admin' into 'master'
Lua: Add deprecation warning to admin

See merge request STJr/SRB2!386
2018-12-16 17:14:32 -05:00
TehRealSalt cc22ef3f05 Add deprecation warning to admin 2018-12-16 16:05:18 -05:00
TehRealSalt 4ba23e1028 Expose R_TextureNumForName
Backport from SRB2Kart
2018-12-16 15:58:47 -05:00
TehRealSalt d85c9b5abc Merge remote-tracking branch 'actualsrb2/next' into next 2018-12-16 15:55:28 -05:00
Monster Iestyn 073ca10320 Merge branch 'opengl-bsp-cleanup' into 'master'
Opengl BSP cleanup and fixes

See merge request STJr/SRB2!382
2018-12-16 12:51:38 -05:00
Digiku f855263f78 Merge branch 'linux-symlink' into 'master'
Add symlink to debian package for /usr/games/srb2

See merge request STJr/SRB2!385
2018-12-15 22:17:04 -05:00
Monster Iestyn e0079ea1a2 remove NearVertice (which was unused anyway), clean up maz's changes 2018-12-14 23:28:07 +00:00
mazmazz de96fe8e7b Revert "compiler SSE tweak for 32-bit"
This reverts commit 09d9a555c6.
2018-12-14 16:47:38 -05:00
mazmazz abae63a64b SameVertice floating point match; fixes 64-bit OGL holes 2018-12-14 16:47:24 -05:00
mazmazz 66efc7ea7f Merge remote-tracking branch 'public-gitlab/opengl-bsp-cleanup' into opengl-bsp-cleanup 2018-12-14 16:23:42 -05:00
Monster Iestyn c1e0041a0b copy doom legacy's replacement for the den == 0.0 calc in fracdivline 2018-12-14 21:22:13 +00:00
mazmazz 09d9a555c6 compiler SSE tweak for 32-bit 2018-12-14 16:21:07 -05:00
mazmazz fa3cc13024 Add symlink to debian package for /usr/games/srb2 2018-12-14 16:19:38 -05:00
Monster Iestyn 623d1574ce minor cleanup 2018-12-14 21:00:53 +00:00
Monster Iestyn b42c306ef3 remove code from SearchDivline that was disabled ...and doesn't seem to exist anymore anyway 2018-12-14 18:14:08 +00:00
Monster Iestyn 52fd3dcbed split loading status code into a separate function 2018-12-14 18:11:30 +00:00
Monster Iestyn 02fc845a72 Make sure nptfront is explicitly > 0, so we don't alloc a poly for negative number points at all 2018-12-14 18:01:18 +00:00
Monster Iestyn 4089b6b8e9 use continue if NULL instead of a big if block if ...not NULL
also, SplitPoly returns if ps < 0, so there's no need to check for ps >= 0 afterwards
2018-12-14 18:00:08 +00:00
Monster Iestyn 3a125dbbd5 compare with actual doubles, not ints 2018-12-14 17:14:03 +00:00
Jimita cf792ef4f3
Merge branch 'master' into the_second_remote_view_camera_fix 2018-12-14 15:09:24 -02:00
Monster Iestyn ef6533fb83 Merge branch 'master' into next 2018-12-13 22:21:31 +00:00
Monster Iestyn 880c017f8f Merge branch 'cfg-srb2home-fix' into 'master'
Apply srb2home path to EXEC, SAVECONFIG, and debugfile

See merge request STJr/SRB2!379
2018-12-13 16:16:52 -05:00
Digiku ab7f0ca4fb Merge branch 'awayviewmobj-sanity-checks' into 'next'
Awayviewmobj sanity checks

See merge request STJr/SRB2!377
2018-12-13 16:11:27 -05:00
Digiku c57f548c7b Merge branch 'savegamename-fix' into 'master'
Fix savegamename being improperly built

See merge request STJr/SRB2!378
2018-12-13 16:11:13 -05:00
mazmazz d18b2cda59 Apply srb2home to saveconfig ONLY if srb2home isn't already there 2018-12-13 13:32:38 -05:00
mazmazz 93f7f0a8df Apply srb2home to debugfile 2018-12-13 13:23:09 -05:00
mazmazz b1641aa8e9 Apply srb2home to SAVECONFIG 2018-12-13 13:17:56 -05:00
mazmazz 93eda4e7c9 EXEC: Search for CFG by file path 2018-12-13 13:11:25 -05:00
mazmazz b84470ec51 Fix savegamename being improperly built due to missing null char after copying timeattackfolder 2018-12-13 12:01:07 -05:00
Jimita 966afb6017
Update p_user.c 2018-12-12 13:09:47 -02:00
Jimita 172fd3bf52
Merge branch 'master' into the_second_remote_view_camera_fix 2018-12-11 21:52:28 -02:00
MPC c68875ad93 Fix remote viewpoint cameras for real
I'm so sorry
2018-12-11 20:48:45 -03:00
Monster Iestyn 582c5332f4 Add some checks to prevent invalid awayviewmobjs from crashing the game. Not fullproof but at the least the P_CameraThinker crash no longer happens 2018-12-11 18:39:58 +00:00
mazmazz 47ee3525af Indentation 2018-12-08 14:10:56 -05:00
mazmazz 01f1933f69 Force directsound to fix wrong-pitch sound effects 2018-12-08 14:05:58 -05:00
Digiku feb7b05e6e Merge branch 'no-more-installer' into 'master'
Remove windows installer

See merge request STJr/SRB2!372
2018-12-07 16:58:37 -05:00
mazmazz 6b5fc921f2 Remove windows installer 2018-12-07 16:56:48 -05:00
Digiku 1029463741 Merge branch '21-version' into 'next'
Update code versions to 2.1.21

See merge request STJr/SRB2!338
2018-12-06 17:20:45 -05:00
mazmazz df89781623 Windows string adjustment 2018-12-06 15:42:58 -05:00
mazmazz ba60989c00 Adjust version strings 2018-12-06 15:39:19 -05:00
Digiku 17e9188c89 Merge branch 'execversion' into '21-version'
Block previous versions' config defaults with EXECVERSION consvar

See merge request STJr/SRB2!371
2018-12-06 12:41:20 -05:00
mazmazz 3ceeb6a205 Register execversion and remove CV_SAVE because we write manually 2018-12-06 12:28:30 -05:00
mazmazz 0be61e8830 a stray if block 2018-12-06 12:03:53 -05:00