stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-22 20:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity
531 commits 174 branches 42 tags 246 MiB
Commit graph

531 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alam Arias
8bee6bef59 Make sure clear_conditionsets feeds in 1 to MAXCONDITIONSETS instead of 0 to MAXCONDITIONSETS-1, so that M_ClearConditionSet can use them all properly AND clear all condition sets properly. 
Apparently the mistake also caused myargc to be cleared in Linux64 SDL2 (as pointed out by that ilag11111 guy on GitHub), so that should be fixed now too.
 2015-01-09 23:55:56 -05:00
Alam Arias
7535bb261f Account for the separation of F11 and F12 in the keycodes list 2015-01-09 23:55:52 -05:00
Alam Ed Arias
2b2b23efab Merge branch 'next' 2015-01-01 14:51:38 -05:00
Alam Ed Arias
73b3287b19 SRB2 2.1.14 release 2015-01-01 14:50:31 -05:00
Alam Ed Arias
d959d0e462 Merge remote-tracking branch 'wolfy852/patch-2' into next 2014-11-29 13:08:32 -05:00
Alam Ed Arias
35547282ca Merge branch 'master' into next 2014-11-29 13:08:12 -05:00
Alam Ed Arias
b153073585 Merge remote-tracking branch 'Sryder13/master' 2014-11-29 13:07:59 -05:00
Ronald Kinard
54f0d0c110 IN PROGRESS: porting eternity slopes from srb2cb 2014-11-18 18:45:57 -06:00
yellowtd
7b858501c4 Update hw_light.c 
Fixes rendering lights with cv_drawdist by adding *FRACUNIT
 2014-11-18 02:18:51 -05:00
yellowtd
7af57684f0 Revert "Comment out HWR_MakeScreenFinalTexture" 
This reverts commit 78f297efd8.
 2014-11-17 04:42:35 -05:00
yellowtd
78f297efd8 Comment out HWR_MakeScreenFinalTexture 
unsure why this is here right now..
 2014-11-17 03:50:15 -05:00
yellowtd
c8863a3590 Update hw_defs.h 2014-11-17 03:39:16 -05:00
yellowtd
ed3801948a Update i_cdmus.c 2014-11-17 03:36:17 -05:00
yellowtd
d8ef32ab38 Revert "quickedit" 
This reverts commit 37b0a0f7f6.
 2014-11-17 03:34:09 -05:00
yellowtd
37b0a0f7f6 quickedit 2014-11-17 03:31:08 -05:00
yellowtd
a29d5a86af Merge branch 'RedEnchilada-ogl-lighting-fixes' into opengl-edit 2014-11-17 02:57:49 -05:00
yellowtd
d8c754ab6d git sux 2014-11-17 02:56:09 -05:00
RedEnchilada
b44aa0ed49 Changes to how dynamic lights are loaded to make them appear more consistently 2014-11-17 00:30:45 -06:00
RedEnchilada
b7dba4be12 Merge branch 'master' of https://github.com/stjr/SRB2.git 
Conflicts:
	src/st_stuff.c
 2014-11-17 00:25:41 -06:00
Sryder13
3f1bb6359f Merge remote-tracking branch 'upstream/master' 2014-11-14 22:21:07 +00:00
Sryder13
e90286ae52 Fix the polyobject crash 2014-11-14 22:19:44 +00:00
Alam Ed Arias
c9753836d2 Merge remote-tracking branch 'Furyhunter/master' 2014-11-14 01:05:47 -05:00
Ronald Kinard
3fd2a705ee Maybe this is the last warning related commit? 2014-11-14 00:04:54 -06:00
Ronald Kinard
98c3c3a3ae More warning squashing 2014-11-13 23:09:57 -06:00
Ronald Kinard
3eafca0dc1 Fix compile errors on win32, warnings elsewhere 2014-11-13 22:58:08 -06:00
Ronald Kinard
2feda0b560 Fix second joystick in sdl 2014-11-13 22:34:47 -06:00
Ronald Kinard
be1565fce3 Add support for new HWR functions in win32 and sdl12 2014-11-13 22:34:09 -06:00
Ronald Kinard
869c4241eb Restrict mouse to window when in focus 2014-11-13 19:18:24 -06:00
Ronald Kinard
d056e82b3b Parse GL version correctly. 2014-11-13 18:20:32 -06:00
Ronald Kinard
d8484a86e0 Virtual resolutions in OpenGL 
Also made fades use core functions if they are available.
 2014-11-13 18:06:38 -06:00
Ronald Kinard
5d0eafb26a Fix MOUSE4/MOUSE5 
MOUSE6-8 will not be supported on SDL2 as there is no interface for them.
 2014-11-13 15:31:32 -06:00
Ronald Kinard
80891e916d Use scancodes instead of keycodes for locale independence. 
ONLY US KEYBOARDS SUPPORTED! THAT'S HOW WE DO IT IN AMURRICA
 2014-11-13 15:19:39 -06:00
Ronald Kinard
0913bd44af Fix mouse warping 
In some cases, the warp back to center was being detected as a mouse motion, causing all sorts of silliness with the mouse. The workaround is by only using the first motion event and ignoring every event after that, until the next call to I_GetEvent.
 2014-11-13 03:51:33 -06:00
Ronald Kinard
b82f64dea5 Display error window on crash 2014-11-13 01:51:29 -06:00
Ronald Kinard
4c55b5db20 Center only on display 1. No more multimonitor span. 2014-11-13 01:36:06 -06:00
Ronald Kinard
b7e8d7d044 Fix -nomouse 2014-11-13 01:04:17 -06:00
Sryder13
9796260709 Merge remote-tracking branch 'upstream/master' 2014-11-12 17:02:40 +00:00
Alam Ed Arias
a721528c50 DunceEnchilada had been glared at 2014-11-12 09:28:14 -05:00
yellowtd
eed5daf3d4 Merge remote-tracking branch 'origin/master' into opengl-edit 2014-11-12 02:31:48 -05:00
yellowtd
a8efa8cab7 Merge remote-tracking branch 'upstream/master' 2014-11-12 01:37:03 -05:00
Alam Ed Arias
404b5f666c SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
RedEnchilada
ec15dd9dc6 messing around with how the nights hud renders in non-aspect-correct resolutions/splitscreen (unfinished) 
(kill me)
 2014-11-05 22:37:06 -06:00
Alam Ed Arias
3fe4921a24 Merge remote-tracking branch 'origin/master' into next 2014-11-02 01:12:23 -05:00
Alam Ed Arias
6d773c54a5 Use OpenGL 1.3 in static builds and on SDL interfaces 2014-11-02 01:11:59 -05:00
Alam Ed Arias
be73e84245 Merge remote-tracking branch 'origin/master' into next 2014-11-02 01:32:33 -04:00
JTE
9d1da548aa Fix hardware / r_opengl warnings. 2014-11-02 01:31:38 -04:00
Alam Ed Arias
aa612bcf91 whiteline checkup 2014-11-02 01:31:36 -04:00
Alam Ed Arias
21edc49ea4 Merge remote-tracking branch 'Sryder13/master' 2014-11-02 01:30:46 -04:00
RedEnchilada
2df51dc151 Support polyobject planes in software renderer 
Backported from private trunk (it's all my work so shoosh) so other people can check out how it's done (and maybe provide some additional bugfixes? hint hint?)
 2014-10-31 23:34:07 -05:00
Sryder13
0c0ede6f18 OpenGL: Polyobject Planes 2014-10-27 20:57:45 +00:00