ec125628ab
Merge branch 'master' into next
2017-09-28 10:16:35 -04:00
1ffdd2e945
Travis: still need to keep -Wno-tautological-compare for GCC 7
2017-09-28 10:15:10 -04:00
7f98c5c804
Build: do not error on fallthrough
2017-09-28 10:02:08 -04:00
2ccd397d11
Build: kill GCC 7's implicit-fallthrough warning
2017-09-28 09:39:47 -04:00
55f377ba3d
Build: kill GCC 7's format-overflow warnings
2017-09-28 09:13:46 -04:00
bdba212b2a
Makefile: add support for GCC 7.1 and 7.2
2017-09-28 09:13:01 -04:00
7e23014d5f
Makefile: support GCC 6.4
2017-09-28 09:04:36 -04:00
62264901e5
Merge branch 'master' into next
2017-09-20 17:18:58 -04:00
829328637d
Merge branch 'netcode-fixes-the-sequel' into 'next'
...
Netcode fixes the sequel
See merge request !207
2017-09-20 15:00:09 -04:00
533fdcae0a
Merge branch 'custom-savegames-home-path-fix' into 'master'
...
Fix save games for a custom mod not saving to custom home folder
See merge request !209
2017-09-20 14:56:39 -04:00
7f875131ee
If compiling for GP2X with SDL, make it use SDL 1.2 interface like the others
...
Doing this way because I have no idea if the GP2X port was SUPPOSED to use SDL or not in the first place
2017-09-18 18:14:05 +01:00
2c73c1657f
Restored all missing objs/bin subfolders from the move to Git, held in place by .gitignores
2017-09-17 17:20:51 +01:00
b040113246
Removed the wrong endif by mistake
2017-09-16 20:59:35 +01:00
a33bb70a0c
Removed all support for Dreamcast, XBox, PSP, PS3, GP2X, Wii, and WinCE from files in the sdl/ folder. If you wanted these ports, use the SDL 1.2 code in sdl12
...
Also removed GP2X setup from sdl/MakeNIX.cfg, use sdl12 for that too
2017-09-16 20:26:04 +01:00
dcb23e01c0
SDL_INIT_NOPARACHUTE does nothing in SDL 2.0, so don't use it anymore
2017-09-15 21:22:28 +01:00
f3a605de6b
I need to stop leaving things commented out that are going
2017-09-15 18:03:06 +01:00
5fb551dd75
Removed 1.2.x version checks in these files, SDL 2.0.x should always have these files
2017-09-15 17:15:06 +01:00
d2a76ca269
Removed references to console ports and WinCE in sdl/Makefile.cfg
2017-09-15 17:12:53 +01:00
9e6ed121ba
Comment out sdl12/SRB2CE/cehelp.h include in m_fixed.h
...
I think it was originally included for defining the "USEASM" macro, but USEASM isn't used by m_fixed.h/c code anymore
2017-09-14 21:29:38 +01:00
900bab9b13
Fix includes for SDL 1.2-only ports' files
2017-09-14 21:15:38 +01:00
5076861e0f
Fixed sdl12/Makefile.cfg and sdl12/(port)/Makefile.cfg and related to refer to sdl12/ subfolders, not sdl/ subfolders
2017-09-14 21:09:35 +01:00
c330907dba
Added a SDL12=1 flag to all ports whose interface code still lives in the sdl12 folder (and is unsupported by SDL 2.0 officially anyway)
...
This basically causes the makefile to use the sdl12 folder instead of the main sdl folder
2017-09-14 21:03:20 +01:00
cf41a11770
Fix for window being offcenter
2017-09-11 16:36:30 -04:00
8514251ad5
fix savegamename not prepending srb2home to itself for custom mods using their own gamedata files
2017-09-09 21:19:07 +01:00
db99537a6b
Various Transparent Texture Fixes
...
Draw Textures and Flats that have holes in them like a solid polygon so they use the depth buffer and don't need to be sorted
Disable all linear filtering on textures and flats that have holes in them, the linear filtering introduces translucency into the textures where the edges are. Leaving them with either a black border, or causing pixels behind the slightly translucent areas to not be drawn. Doesn't apply to sprites and the HUD as they are always already sorted properly.
Make the Alpha Testing more strict on non-translucent blend modes. This makes it so any transparency below 0.5 is discarded instead. Would make anything that is blended and has holes in it look slightly better, only the HUD and MD2s where the texture has holes are effected currently.
Set TF_TRANSPARENT on flat texture flags when there are holes in the texture.
Minor fix to make sure MD2s always set the right blend mode
2017-09-09 00:44:13 +01:00
6877930ed9
Go through and draw MD2s and sprites at the same time so they are sorted from each other (mostly) correctly
2017-09-08 00:57:21 +01:00
d565cc6a2c
Merge branch 'master' into next
2017-09-04 20:16:06 +01:00
017df6cd75
Merge branch 'SDL2_RelMouse' into 'master'
...
SDL2: Relative mouse mode
See merge request !206
2017-09-04 15:11:50 -04:00
1aa4972021
Merge branch 'floorzatpos-slopefix' into 'next'
...
P_FloorzAtPos slope fix
See merge request !208
2017-09-04 15:00:49 -04:00
50917d2ee2
P_FloorzAtPos: Check the normal floor's slope as well as FOF slopes, silly.
2017-08-30 19:21:23 +01:00
9c4e2eeeef
Merge branch 'next' into netcode-fixes-the-sequel
2017-08-23 19:17:25 +01:00
36977a5eda
SDL_SetRelativeMouseMode(SDL_TRUE) already does what HalfWarpMouse does
...
Also, don't post an ev_mouse event_t if not in relative mouse mode, so the camera doesn't jerk when the mouse enters the window
2017-08-22 22:53:18 +01:00
821a1810f7
Moved lrounding of mouse motion events to the actual point an event is made
...
Also did some cleanup and moving around, as well as adding comments
2017-08-21 21:38:29 +01:00
10cbe2c82b
Turns out the issue was with fullscreen! All I have to do is factor in the resolution/real window size ratio apparently (which was already done before)
...
Also changed movemousex/y to INT32
2017-08-19 22:54:30 +01:00
758e9c4558
Merge all (relative) mouse motion events into one mouse event
...
This fixes SDL2_RelMouse's weaker sensitivity for me on Windows (but apparently not for others??)
2017-08-19 21:39:04 +01:00
9b788b55f6
Merge branch 'patch-lua-cv_registervar' into 'public_next'
...
Patch: Lua CV_RegisterVar
See merge request !109
2017-08-16 15:06:41 -04:00
720987367a
Prevent cvar naming conflicts from pointing Lua to the wrong internal data.
2017-08-08 14:27:02 -05:00
2d661fef18
Turns out we don't need to use SDL_SetWindowTitle on its own, since SDL_CreateWindow already deals with the window title anyway. So I've disabled everything related to Impl_SetWindowName for now
...
Also what were you thinking Fury?!? window shouldn't be NULL for SDL_SetWindowTitle, you backwards person you
2017-08-07 16:44:29 -04:00
35404be1e0
SDL: y input is flipped
2017-08-07 16:37:03 -04:00
c25b2eb37f
Merge remote-tracking branch 'origin/master' into SDL2_RelMouse
2017-08-07 16:33:39 -04:00
55e0e71d92
Merge branch 'next' into public_next
2017-07-25 17:17:01 +01:00
bba78a95b5
Merge branch 'charability-trigger-hotfix' into 'next'
...
Charability trigger hotfix
Apparently when I made `P_RunTriggerSpecial` less than 3 years ago (August 2014) and cleaned up the trigger linedef code, I accidentally inverted the ability check for linedef types 305-307 by mistake, thereby causing the linedefs to activate for anyone EXCEPT those with the ability instead. Whoops.
See merge request !205
2017-07-25 11:07:03 -04:00
821692fbf7
This was my fault, whoops
2017-07-24 17:53:18 +01:00
2456ae8260
Merge branch 'p_isobjectongroundin-fixes' into 'next'
...
Fixes for Each Time and P_IsObjectOnGroundIn
Fixes the issue with Each Time reported here: https://mb.srb2.org/showthread.php?t=42818
Also fixes a separate issue with P_IsObjectOnGroundIn and intangible FOFs (where it determined that standing at the top height of them counted as being on the ground) which was also reproducable via the above bug funnily enough.
See merge request !204
2017-07-18 22:51:29 -04:00
6e5cffba5b
Create static function P_IsObjectOnRealGround for each time thinker to use in place of P_IsObjectOnGroundIn, for non-FOF floor touch specials
...
This fixes solid FOFs activating floor touch specials for normal ground if using an "each time" trigger linedef
2017-07-17 20:56:55 +01:00
7d4513f2f1
Don't be stupid with FF_BLOCKPLAYER/FF_BLOCKOTHERS flags please
2017-07-17 20:47:00 +01:00
2350e94a9f
Merge branch 'master' into next
2017-07-09 15:08:51 +01:00
2ac566fa85
Fix whitespace goofup of mine
2017-07-09 15:08:17 +01:00
0bfd4106fb
Merge branch 'next' into public_next
2017-07-08 17:43:28 +01:00
f0ffd691f4
Merge branch 'master' into next
2017-07-07 22:47:34 +01:00
Alam Ed Arias