Digiku
|
bea76aa4bf
|
Merge branch 'save-override' into 'next'
Feature: Save override for level header
See merge request STJr/SRB2!392
|
2018-12-19 13:04:41 -05:00 |
|
Digiku
|
4c69fe23f6
|
Merge branch 'kart-luatextures-backport' into 'next'
Lua: Kart textures backport (non-foolish vers)
See merge request STJr/SRB2!391
|
2018-12-19 13:04:24 -05:00 |
|
Alam Arias
|
b62e6ee909
|
Merge branch 'next' into the_second_remote_view_camera_fix
|
2018-12-18 14:11:43 -05:00 |
|
Alam Ed Arias
|
d5c7ca1d23
|
Merge branch 'master' into next
|
2018-12-18 14:05:07 -05:00 |
|
Alam Arias
|
056cfe71a4
|
Merge pull request #373 from monster-psychic-cat/sw_planefixes
Software plane fixes
|
2018-12-18 14:02:21 -05:00 |
|
Alam Arias
|
afecb2fc85
|
Merge branch 'next' into the_second_remote_view_camera_fix
|
2018-12-18 13:57:48 -05:00 |
|
Monster Iestyn
|
bd58ff8c49
|
Merge branch 'frame-backslash-fix' into 'next'
Accept '+' as substitute for '\' for sprite frames (PK3)
See merge request STJr/SRB2!380
|
2018-12-17 17:34:41 -05:00 |
|
Jimita
|
1d40676f3a
|
Merge branch 'master' into automap_fix
|
2018-12-17 17:46:29 -02:00 |
|
Jimita
|
3329c10b60
|
Merge branch 'next' into the_second_remote_view_camera_fix
|
2018-12-17 17:46:17 -02:00 |
|
Jimita
|
f3956ffb4c
|
Merge branch 'master' into sw_planefixes
|
2018-12-17 17:45:36 -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 |
|
TehRealSalt
|
bef3bb23f8
|
Undo dc92bb49
|
2018-12-16 21:36:54 -05:00 |
|
TehRealSalt
|
97639848e1
|
Merge remote-tracking branch 'upstream/next' into kart-luatextures-backport
|
2018-12-16 21:22:06 -05:00 |
|
TehRealSalt
|
9e596d15af
|
Save override for level header
Kind of like 2.2's, but with backwards-compatability with 2.1
|
2018-12-16 20:09:59 -05:00 |
|
TehRealSalt
|
ec53e12294
|
Foolish
|
2018-12-16 18:19: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 |
|
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 |
|
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 |
|
Monster Iestyn
|
623d1574ce
|
minor cleanup
|
2018-12-14 21:00:53 +00:00 |
|
MPC
|
9c04a066d9
|
Update r_plane.h
|
2018-12-14 15:49:32 -03: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 |
|
MPC
|
9c2197db17
|
Software plane fixes
|
2018-12-14 14:08:25 -03:00 |
|
Jimita
|
d70dbada1c
|
Merge branch 'master' into automap_fix
|
2018-12-14 15:07:53 -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 |
|
mazmazz
|
dc7992a815
|
R_Char2Frame special case for backslash: accept plus as substitute
|
2018-12-13 14:59:12 -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
|
e628d98f20
|
Update am_map.c
|
2018-12-12 19:59:21 -02:00 |
|
Jimita
|
a5874019cb
|
Update am_map.c
|
2018-12-12 19:57:52 -02:00 |
|
MPC
|
649b6c9ca1
|
Remove MINIAUTOMAP code
|
2018-12-12 18:53:13 -03:00 |
|
MPC
|
6b22dc183b
|
Fix the automap
|
2018-12-12 18:01:52 -03:00 |
|
Jimita
|
966afb6017
|
Update p_user.c
|
2018-12-12 13:09:47 -02:00 |
|
MPC
|
c68875ad93
|
Fix remote viewpoint cameras for real
I'm so sorry
|
2018-12-11 20:48:45 -03:00 |
|