Monster Iestyn
6ca806a8c0
Fix FOF lighting being stupid with repeating midtextures.
2016-12-31 20:44:16 +00:00
Louis-Antoine
d4f153d3ca
Random changes in the netcode lol
2016-12-31 19:26:33 +01:00
Inuyasha
8fb9a3b3d5
Ignore modifier keys in chat
...
(Fixes LSHIFT typing D repeatedly into chat)
2016-12-26 21:32:35 -08:00
Inuyasha
f326b3cbf9
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2 into public_next
2016-12-22 17:45:51 -08:00
Inuyasha
f4b0591174
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
2016-12-22 17:44:28 -08:00
Alam Ed Arias
97f87827f4
hardware: init undef vars in HWR_SortVisSprites
2016-12-22 19:42:00 -05:00
Alam Ed Arias
fca398ae4d
Win32 Debugger: no need for Win32 interface code for SDL
2016-12-22 19:40:02 -05:00
Alam Ed Arias
1c16a4e670
m_aatree: add newline
2016-12-22 19:39:37 -05:00
Alam Ed Arias
fc9a86f6d2
Mingw: fixup unsigned/signed compare
2016-12-22 19:39:14 -05:00
Alam Ed Arias
0835c17dfe
CB: fixup Mingw target
2016-12-22 19:36:26 -05:00
Alam Ed Arias
8f8724fced
CB: added missing C/header files
2016-12-22 19:13:46 -05:00
Alam Ed Arias
a583225d79
CB: disable compiling and linking IMG_xpm.c, it was updated for SDL2
2016-12-22 19:09:08 -05:00
Alam Ed Arias
064650d93c
Codeblock: fixup SDL_mixer to SDL2_mixer
2016-12-22 19:07:46 -05:00
Alam Ed Arias
b32be1b9a9
Codeblock: fixup sdl-config to sdl2-config
2016-12-22 19:03:48 -05:00
Alam Ed Arias
5c295d5733
Codeblock: fixup sdl2 to sdl
2016-12-22 18:59:18 -05:00
Alam Arias
fe3916a60d
Merge pull request #147 from LJSonik/hook-optimisation
...
Hook optimisation
2016-12-22 18:26:49 -05:00
Monster Iestyn
d782638da8
Merge branch 'zlib_pkgconfig' into 'master'
...
Zlib pkgconfig
Linux build to include libgme by default
See merge request !116
2016-12-18 21:44:19 -05:00
Monster Iestyn
02b32b3f65
Merge branch 'master' into next
2016-12-17 20:01:06 +00:00
Monster Iestyn
8e56582728
Created R_CheckTextureCache to make sure midtexture/FOF walls cache their textures before choosing colfunc_2s, for software mode
2016-12-17 19:59:54 +00:00
Monster Iestyn
a9cfd12e04
Created R_GetTextureNum to make sure top/bottom/midtexture texture ids are always valid in rendering code for both software and OpenGL (and also for the Solid Midtexture effect physics code)
2016-12-16 21:38:53 +00:00
Louis-Antoine
db20bfb3c3
Generic mobj hooks are now run before mobjtype-specific mobj hooks, and player/linedef executor hooks now have their own lists
2016-12-15 21:05:54 +01:00
Alam Arias
fa8a673d3b
Merge pull request #146 from mdeguzis/patch-1
...
readme.txt duplicated, also incorrect
2016-12-14 18:13:23 -05:00
Michael T. DeGuzis
78f5dd15b5
readme.txt dupilcated, also incorrect
...
readme.txt should be README.md
2016-12-14 15:07:48 -05:00
Monster Iestyn
504e8c5f12
Merge branch 'next' into public_next
2016-12-14 18:44:50 +00:00
Sryder
2e72539df2
Remove accidental leftovers
...
Accidentally left a comment and stuff in there from previous attempts
2016-12-13 21:22:40 +00:00
Sryder
4fb2a18846
Fix a one character bug with clipping
2016-12-13 21:18:05 +00:00
Sryder
39d4f22660
Flat sprites for OGL
2016-12-13 21:02:23 +00:00
Monster Iestyn
aa82042cf8
Merge branch 'credit_switch' into 'next'
...
No switching skins mid-credits/custom cutscene in SP
Does what it says on the tin.
See merge request !129
2016-12-13 09:33:53 -05:00
Monster Iestyn
1ec97c242a
Merge branch 'smooth_ropes' into 'next'
...
Smoother ropes and zoom tubes
Makes rope hangs and zoom tubes suck less. Specifically, they handle corners (and vertical height changes, ala sloped rope hangs) a LOT nicer. Ported from internal.
See merge request !139
2016-12-12 14:18:36 -05:00
Sryder
93901847d3
Fix the Fixed Rounding functions
2016-12-12 00:06:48 +00:00
Monster Iestyn
ab423f99c6
Optimising retrieval of sector_floorpic/ceilingpic
...
As LJSonic has pointed out, there's no need for a for loop in either case; just use sector->floorpic/ceilingpic as a levelflats index directly
(Besides, if that was to stop any out-of-bounds indexes being used, that's hardly the way to do it anyway)
2016-12-09 21:18:06 +00:00
Monster Iestyn
d294c9d15c
P_NetUnArchiveWorld now uses P_AddLevelFlatRuntime instead of P_AddLevelFlat.
...
Also created P_CheckLevelFlat to just return the flat # from a name, since that's all P_NetArchiveWorld really needed from P_AddLevelFlat anyway
2016-12-08 21:45:25 +00:00
Alam Ed Arias
5e74318fb2
Merge branch 'master' into next
2016-12-06 17:29:43 -05:00
Monster Iestyn
64801a1a8e
Merge branch 'sdl2-cleanup' into 'master'
...
SDL2 i_video.c code cleanup
Made some code look a bit neater, removed the need for some SDL2STUBs Fury placed, vid_info console command actually kind of has a use again, etc
See merge request !138
2016-12-06 17:18:47 -05:00
toasterbabe
77399b8fb9
* Disabled #define SECTORSPECIALSAFTERTHINK. This did not need to be done in next, since it could have subtle consequences which we'd rather not deal with in the hyperextended patch cycle as-is.
...
* Removed the adding of SF_TRIGGERSPECIAL_TOUCH for sectors with slopes in them. Too many undesired consequences, I'll handle them another way.
2016-12-06 21:49:59 +00:00
toasterbabe
3c8f5b4629
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into touching_fixes
2016-12-06 21:28:33 +00:00
Monster Iestyn
ac966bf790
Merge branch 'mfe_onground-is-stupid' into 'next'
...
Fix ceiling springs thrusting themselves down in midair on touch
What the title says. I blame MFE_ONGROUND for being stupid, but for now I made it behave a bit better with flipped items at least.
See merge request !140
2016-12-06 16:22:33 -05:00
Monster Iestyn
7c07f39019
Make sure flipped things placed directly on ceiling get MFE_ONGROUND
...
This fixes ceiling springs apparently flying down with you in various scenarios
2016-12-05 22:07:16 +00:00
TehRealSalt
f6a73fbc4a
Merge remote-tracking branch 'refs/remotes/upstream/next' into next
2016-12-05 11:48:00 -05:00
Prisima the Fox
dd13df2308
Whoops, didn't see the duplicate line.
2016-12-03 18:18:16 -05:00
toasterbabe
02d78b355b
Smoother ropes and zoom tubes ported from internal.
2016-12-01 14:33:44 +00:00
toasterbabe
a901f88d24
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into touching_fixes
2016-12-01 14:14:20 +00:00
Monster Iestyn
ae3e11369e
Revert "(Messiness warning) attempt to start using SDL_SetRelativeMouseMode instead of the old hacks of making the mouse do movement without leaving the window and be hidden"
...
This reverts commit 347b531881
.
(Too experimental, may end up adding new bugs; let's just keep it to clean up for now)
2016-11-30 17:21:28 +00:00
Monster Iestyn
347b531881
(Messiness warning) attempt to start using SDL_SetRelativeMouseMode instead of the old hacks of making the mouse do movement without leaving the window and be hidden
...
Seems to work so far though
2016-11-25 21:13:39 +00:00
Prisima the Fox
d788cb7676
Keeping the lua_gettop(gL) thing, otherwise the player/reason values will be pushed once to the stack each for every hook. Thanks MonsterIestyn!
2016-11-25 15:20:41 -05:00
Monster Iestyn
8bbbeff2a9
Make Impl_SDL_Scancode_To_Keycode look a bit neater
...
This way it's easier by eye to see from the list which SDL scancode maps to which SRB2 key code
2016-11-23 17:08:37 +00:00
Monster Iestyn
5cf4767aed
Clearing away lots of disabled code (some of it would no longer work on SDL2 anyway)
2016-11-23 16:51:37 +00:00
Monster Iestyn
153ba39f19
Remove remnants of SDLK_ stuff, we use scancodes now not keycodes
...
(Apparently SDLK_LMETA/SDLK_RMETA don't exist anymore in SDL2 anyway?)
2016-11-22 22:41:02 +00:00
Monster Iestyn
1606a45b18
Some cleanup/reorganisation in SDLSetMode and Impl_CreateWindow
2016-11-21 22:07:05 +00:00
Monster Iestyn
208546165b
Comment out SDL2STUB from Impl_SetWindowIcon
2016-11-21 20:59:44 +00:00