Alam Ed Arias
|
e5e978f8bd
|
Merge branch 'master' into next
|
2018-12-19 13:20:54 -05:00 |
|
Digiku
|
7982b1695a
|
Merge branch 'ogl-zfighting-fix' into 'master'
OpenGL z-fighting fix [by Azeonus]
Closes #43
See merge request STJr/SRB2!395
|
2018-12-19 13:05:04 -05:00 |
|
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 |
|
mazmazz
|
96cad09db6
|
Change 0.05 to 0.05f
|
2018-12-18 16:59:59 -05:00 |
|
Azeonus
|
67cd6dcdd2
|
dispoffset OGL fix [by Azeonus]
|
2018-12-18 16:50:03 -05:00 |
|
Alam Arias
|
ba00752c71
|
Merge pull request #367 from monster-psychic-cat/the_second_remote_view_camera_fix
Fix remote viewpoint cameras for real this time
|
2018-12-18 15:00:59 -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
|
e0eb64375a
|
Merge pull request #368 from monster-psychic-cat/automap_fix
Automap fix
|
2018-12-18 14:02:05 -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
|
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 |
|
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 |
|