Inuyasha
f500986692
use RGB for screen texture, not RGBA
...
the screen texture does not need an alpha channel.
the fact that it had one made OGL copy the topmost pixel of the screen texture's alpha channel.
which, naturally results in the screen becoming partially transparent and letting you see the working texture in the background.
2016-01-29 16:01:05 -08:00
Alam Ed Arias
e8cf4cdaac
SDL2: compile SDL with SDL_main for Win32
2016-01-29 00:33:11 -05:00
Alam Ed Arias
c47ff7b3c6
let make the main() entry point noreturns
2016-01-28 21:37:41 -05:00
Alam Ed Arias
050ce857c4
let not care for main() being noreturn
2016-01-28 21:31:18 -05:00
Alam Ed Arias
0d327c7c16
kill logical-not-parentheses warning in g_game.c
...
g_game.c: In function 'G_CheckDemoStatus':
g_game.c:5588:22: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses]
if (!modeattacking == ATTACKING_RECORD)
^
2016-01-28 21:15:51 -05:00
Alam Ed Arias
10e1aaaf85
appveyor: no need for DEPFLAGS
2016-01-28 12:08:08 -05:00
Alam Ed Arias
7fdb5cfcfb
move disabled warning out of mingw
2016-01-28 12:06:00 -05:00
Alam Ed Arias
2176b21e62
ignore noreturns
2016-01-28 11:49:23 -05:00
Alam Ed Arias
7a09a82489
new flags: DEPFLAGS, to tell the depend step where are the headers
2016-01-28 11:41:02 -05:00
Alam Ed Arias
f0842d2200
appveyor: add debug and sdl mixer
2016-01-28 11:33:36 -05:00
Alam Ed Arias
d0ce9170da
appveyor: build for GCC 5.2
2016-01-27 01:39:12 -05:00
Alam Ed Arias
181c875016
SDL: config.h.in is pre source tree, config.h for each cmake build
2016-01-22 17:25:19 -05:00
Sean Ryder
7d914913dd
Tabbing
2016-01-20 15:55:32 +00:00
Sean Ryder
6a67609b74
Merge branch 'master' into md2_colourchange
2016-01-12 23:52:04 +00:00
Monster Iestyn
a8e4234d74
Fixed implicit declaration of some functions if compiling without OpenGL support
...
Not related to Wolfy's problems afaik... this branch seems to be turning into a misc compiling fixes branch now
2016-01-11 14:51:55 +00:00
Monster Iestyn
be266c27e1
Removed void typedef for GLPatch_t used when HWRENDER is undefined
...
Apparently all parts of the source code that require GLPatch_t are themselves used only if HWRENDER is defined. Do I need to say more?
Not sure if this will fix Wolfy's latest problem or not though
2016-01-10 20:56:09 +00:00
Monster Iestyn
146011937a
Fixed what appears to be a minor including error in sdl/i_system.c
...
Basically, Wolfy's linux (non-CMake) compiling apparently fails here, and config.in.h actually lives outside of the sdl folder. Blame a particular someone for blindly copy+pasting these includes in this file without considering the consequences when adding support for CMake everywhere.
2016-01-10 18:24:58 +00:00
Monster Iestyn
775ccde424
Add M_Options(0); to F4/F5/F7 code to prevent them going to Main Menu instead of SP/MP pause menus when the latter should be shown
2015-09-01 22:56:45 -04:00
Sryder13
d050a60f36
Change a few colours.
2015-08-03 02:01:56 +01:00
Sryder13
cc3d3a67e6
Colour Changing MD2s
...
I don't know how I can move my old branch over so I've just created a new one.
2015-07-26 20:14:47 +01:00
Ronald Kinard
53680903e5
Fix compilation and debugging on Windows.
...
Core code has too many #define dependencies on interface-specific
defines. This means that it's currently not possible to safely
separate the core and interface code into different contexts. The
core code should be refactored to accomadate for this because we
should not have any interface-specific code in core in the first
place.
This reverts the static library SRB2Core from a7135094
2015-03-24 19:32:58 -05:00
Ronald Kinard
c43b41e183
Fix generation of SRB2DD target.
...
It still won't compile correctly. But this should avoid the error
messages related to it.
2015-03-08 04:30:07 -05:00
Ronald Kinard
8472075960
Prepend ASM sources with the current source directory in CMake.
...
This fixes generation with USEASM enabled.
2015-03-08 04:16:16 -05:00
Ronald Kinard
a713509493
Refactor CMake to allow source grouping and separation of interfaces.
...
Core and SDL2 are two separate targets now. Core is a static library
that is linked into SRB2SDL2. The sources for both are separated.
When using an IDE like Visual Studio or Xcode, the source code
organized into groups that explain what that group of sources does.
In the future, "Main" could be split into a few more groups based on
file prefixes, but I think the way it is set up works for now.
Makefile targets are not affected by source_groups and typing `make`
will automatically compile both the "Core" library and SRB2SDL2
itself.
2015-03-08 03:26:54 -05:00
Ronald Kinard
f28b050c07
Append current branch name to comp version string.
2015-03-04 20:15:57 -06:00
Alam Ed Arias
2609745b51
it was me, Duo!
2015-02-06 10:22:16 -05:00
Alam Ed Arias
ed0d70feca
do not typedef off_t when we do not need to
2015-02-05 17:32:27 -05:00
Alam Ed Arias
542295c863
remove comptime.h from cmake file list
2015-02-05 17:32:26 -05:00
Ronald Kinard
062a746fdd
Further fix IPv4 when IPv6 is available
2015-02-05 15:36:07 -06:00
Ronald Kinard
ae05613460
Fix IPv4 connectivity when IPv6 is enabled
2015-02-05 00:32:54 -06:00
Alam Ed Arias
3d498fe894
VERSIONSTRINGW is funny
2015-02-02 15:21:58 -05:00
Alam Ed Arias
7cf1a1aab8
fixup cmake merge
2015-02-02 14:58:51 -05:00
Ronald Kinard
e08bd45227
cmake: Separate debug symbols on gcc
...
Only when actually making the debug target though!
2015-02-01 22:14:52 -06:00
Ronald Kinard
d7015d1492
cmake: Fix nasm/add yasm support
...
Tested to work on MSVC, mingw-gcc
2015-02-01 21:25:02 -06:00
Ronald Kinard
194ce626e1
cmake: Add nasm support
...
Enables ASM-NASM and adds tmap*.nas to sdl target.
No idea if this actually works.
2015-02-01 19:18:25 -06:00
Ronald Kinard
8d3b948e1b
cmake: Fix compilation for MSVC 2015
...
snprintf is now available in MSVC 2015!
2015-02-01 19:02:08 -06:00
Ronald Kinard
ec79756c42
cmake: copy DLLs to build directory in MSVC
...
this is done as a POST_BUILD step
2015-01-31 22:40:36 -06:00
Ronald Kinard
4d3a7dd8fb
cmake: fix NDEBUG on Debug
...
wow i'm stupid
2015-01-29 00:17:47 -06:00
Ronald Kinard
70f046a320
cmake: on mac, check Resources in bundle first.
...
on non debug, check assets folder in src as well
2015-01-28 23:38:40 -06:00
Ronald Kinard
e54338ef01
cmake: fix Windows linking
2015-01-28 23:20:21 -06:00
Ronald Kinard
57037e4124
cmake: fixes to enable linux compilation
...
string.c, capitalization, find fixes
2015-01-28 20:15:24 +00:00
Ronald Kinard
68f8a5b0f9
cmake: build bundle and dmg on install/package
2015-01-28 19:29:16 -06:00
Ronald Kinard
0909fce2e3
cmake: Configure source via cmake
...
silently fixing a bad malloc here too shhhhhhhhh
2015-01-28 18:03:41 -06:00
Ronald Kinard
53799eb390
cmake: Add CPack Package Generation
...
Generates zips only at the moment
2015-01-28 16:42:05 -06:00
Ronald Kinard
1c9de50ad2
cmake: Search SDL2_main separately for MSVC
2015-01-28 15:33:29 -06:00
Ronald Kinard
20d6a7e675
cmake: exe icon on windows
2015-01-28 02:12:14 -06:00
Ronald Kinard
2f1367aab6
cmake: Fixes to allow MSVC to compile
...
running is another story
2015-01-28 02:09:03 -06:00
Ronald Kinard
495ea65cc5
Add GME and SDL2_mixer
...
Also support dynamic/static opengl switching
2015-01-28 01:20:43 -06:00
Ronald Kinard
479ebc3f94
Add Xcode target support
...
It is really messy at the moment. There is no support for copying the
necessary frameworks and dylibs out to the bundle for distribution, and
it is a frankenstein of manual find_library and find_package which can
sometimes pick up Homebrew dylibs.
2015-01-28 00:58:30 -06:00
Ronald Kinard
05f5ec664a
Initial CMake support pass
...
Compiles the SDL2 target on Windows successfully
2015-01-27 23:46:39 -06:00
Alam Ed Arias
45e8ec34a6
always turn on LFS support when compiling for a Linux/GNU system with libpng support
2015-01-10 17:35:36 -05:00
Alam Ed Arias
e28882a56d
oh, nPlaneVerts is a size_t?, well, then we need to use sizeu#()
2015-01-10 17:27:24 -05:00
Alam Ed Arias
f5cd1d5ebc
add check on write failed in old TGA screenshot code
2015-01-10 17:26:29 -05:00
Alam Arias
0c106a4ccc
I await the rise of AltimitOS because seriously, fuck this nonsense
2015-01-09 23:56:00 -05:00
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
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
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
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
Alam Ed Arias
a721528c50
DunceEnchilada had been glared at
2014-11-12 09:28:14 -05:00
Alam Ed Arias
404b5f666c
SRB2 2.1.12 release
2014-11-11 19:55:07 -05: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
Sryder13
0c0ede6f18
OpenGL: Polyobject Planes
2014-10-27 20:57:45 +00:00
Wolfy
197e5fce55
Change super transformation to freeze momentum instead of bitshifting
...
Fixes https://mb.srb2.org/showthread.php?t=39921 where the issue before was that when you transformed your momentum would still have you moving slowly, which could cancel out the animation.
2014-10-01 21:19:32 -05:00
Sryder13
1ab29ba96a
Merge remote-tracking branch 'upstream/master'
2014-09-12 20:53:55 +01:00
Sryder13
781dd16fa6
Fix THOK MD2's not rotating with camera
...
Will also fix any other case that an mobj has a skin and a single frame.
2014-09-10 00:22:39 +01:00
Sryder13
987f9f5c26
Quick sky fix 2
...
walls not extending down when a thok barrier has top textures and both
ceilings have sky.
2014-09-09 23:57:12 +01:00
Sryder13
cee8fff7b3
Quick sky fix
...
Avoid Z-Fighting on the depth wall with the regular walls to stop the
possibility of regular walls being made partially invisible.
2014-09-09 01:59:19 +01:00
Sryder13
b2852ec0f4
OpenGL: Sky culling
...
Gets rid of stuff being drawn where the sky should be being drawn.
2014-09-08 23:29:05 +01:00
Sryder13
bc0b5505a8
OpenGL: Fix sky drawing
...
sky positioning and scaling more correct compared to software.
2014-09-08 00:55:32 +01:00
Alam Ed Arias
dc6f798a43
Merge remote-tracking branch 'origin/master' into next
2014-09-05 20:26:07 -04:00
Ronald Kinard
5b07cf8ff0
SDL2: Add 1600x1200 mode
2014-09-05 20:25:06 -04:00
Ronald Kinard
399eddefe6
SDL2: Do not use xinput, force directinput
...
Fixes axes issue with xinput controllers.
2014-09-05 20:24:57 -04:00
Ronald Kinard
31abd19f75
SDL2: Reimplement some stubbed commands
...
Also remove some unnecessary functions.
2014-09-05 20:24:39 -04:00
Ronald Kinard
eece38609e
SDL2: Fix 320x200 mode
2014-09-05 20:24:25 -04:00
Ronald Kinard
c97eef238e
Use gcc_struct on ATTRPACK too
2014-09-05 20:23:38 -04:00
Wolfy
8a4ec56ef5
Merge the dedicatedserver and server global variables
...
Previously in Lua, dedicatedserver would only return true if the player running the script was the one hosting the dedicated server. In all other cases, it would return nil. This fixes it to point to the server host no matter what.
2014-09-05 20:23:32 -04:00
Sryder13
ca0f0bf2fd
OpenGL Fade masks
...
I think I've done this all right, someone correct me if I haven't.
2014-09-04 01:35:29 +01:00
Sryder13
da2b6f2c01
Fix certain textures with holes in
...
see: CEZ1 skybox in linear filtermodes.
2014-09-03 02:10:47 +01:00
Sryder13
d96eaa768c
else added
...
less redundancy.
2014-08-30 14:36:18 +01:00
Sryder13
ae27ace7fe
Polyobject translucency quick fix.
...
I realise what I did before may cause FOF's in the same sector to not be
drawn, if they were before.
2014-08-30 14:20:07 +01:00
