stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-18 18:41:57 +00:00
Code Issues Projects Releases Packages Wiki Activity
452 commits 171 branches 41 tags 312 MiB
Commit graph

367 commits

Author SHA1 Message Date
MonsterIestyn
ffc1d3cb64 Correcting a most minor math mistake 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8992 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-01 19:38:00 -05:00
MonsterIestyn
2d8868feca Made HWR_InitMD2 and HWR_AddSpriteMD2/HWR_AddPlayerMD2 slightly less stupid with MD2-related searches in md2.dat: *Don't go barmy and search for a player skin called "THOK" when you already found the sprite called "THOK" beforehand! (or any other sprite prefix for that matter) *Don't make errors appear only for the last sprite/skin when it doesn't make sense to do so!! 
Todo: Stop the redundancy that currently goes on with adding MD2s on game start-up (note that HWR_AddSpriteMD2/HWR_AddPlayerMD2 are run for all sprites/skins BEFORE HWR_InitMD2 is called)

git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8988 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-01 19:38:00 -05:00
Matt Walsh
f3e6770e9a Well that shows you how much we care about the old special stages *or* race! 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8985 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-01 19:38:00 -05:00
Matt Walsh
0a7f3751f6 Add in missing super check 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8984 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-01 19:38:00 -05:00
MonsterIestyn
8232dbca10 *Fixed OpenGL's handling of cv_translucency effects (should not remove shadows if off, but perhaps make them use default alpha?), someone was a bit hasty! *De-stupified the MD2 status checks regarding drawing of sprites - if they're already checked before calling HWR_DrawSprite, there's no point doing them WITHIN the function as well *Split off sprite shadow code into HWR_DrawSpriteShadow for convenience 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8983 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-01 19:38:00 -05:00
Alam Ed Arias
6513954789 whitespace cleanup 2015-03-01 19:30:22 -05:00
Wolfy
627889eec1 Have super sparks scale with the player 
Fixes https://mb.srb2.org/showthread.php?t=40279

Should work fine, but do keep in mind that this fix is untested.
 2015-03-01 19:28:57 -05:00
Ronald Kinard
15f0670c43 Merge branch 'fix_each_time' into next 
Conflicts:
	src/p_floor.c
 2015-03-01 02:13:46 -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
Ronald Kinard
54f0d0c110 IN PROGRESS: porting eternity slopes from srb2cb 2014-11-18 18:45:57 -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
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
ilag11111
97b61eb66d Each Time Fix Fix: Don't infinite loop when each time is set to trigger on exit. 2014-10-02 10:26:12 -07: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
ilag11111
2191e5b9de Each Time Fix: Multiple players simultaneously entering a sector, e.g. Tails carries one in. 2014-10-01 13:49:44 -07: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
Sryder13
278f2e9b66 Polyobject top/bottom texture + translucency 
polyobjects do have top/bottom textures, silly.
And translucency.
 2014-08-30 14:10:55 +01:00
Alam Ed Arias
b1e1163b91 evil changes 2014-08-27 22:43:10 -04:00
Alam Ed Arias
7cb77075d1 SRB2 2.1.11 release 2014-08-26 23:56:30 -04:00
Alam Arias
81cbdcccd5 Merge pull request #28 from wolfy852/master 
Remove momentum reduction in CA_JUMPTHOK
 2014-08-26 21:29:24 -04:00
Alam Ed Arias
d6c29e19ab SRB2 2.1.10 release 2014-08-05 19:59:40 -04:00
Wolfy
53c791b29c Remove momentum reduction in CA_JUMPTHOK 
Also add new multiability handling for it
 2014-08-04 13:38:19 -05:00
Alam Ed Arias
d066a7a6d1 Change mixer panning to make sense (for SDL12) 
This makes positional audio in sdl work correctly (things to the left
    play sounds in the left speaker)
 2014-08-04 11:57:29 -04:00
Ronald Kinard
8eef7239b2 Change mixer panning to make sense 
This makes positional audio in sdl work correctly (things to the left
play sounds in the left speaker)
 2014-08-04 02:48:18 -05:00
Ronald Kinard
25739b38e3 INTERFACE=sdl 2014-08-04 00:27:12 -05:00
Ronald Kinard
a0f959e597 Fix Makefile to target sdl correctly 2014-08-04 00:04:03 -05:00
Alam Ed Arias
c028c83235 SRB2 2.1.9 release 2014-08-03 23:49:33 -04:00
Alam Ed Arias
ab9934932e Merge branch 'master' into next 2014-08-03 23:41:57 -04:00
Alam Ed Arias
0386516946 Merge remote-tracking branch 'Furyhunter/sdl2' 2014-08-03 21:02:24 -04:00
Alam Ed Arias
e2d3ce1aed keep the old SDL interface 2014-08-03 21:02:04 -04:00
Alam Ed Arias
13f3fbac2e Merge branch 'master' into next 2014-08-02 11:11:09 -04:00
Alam Ed Arias
cd97685e5a fix build for sh sheel 2014-08-02 11:10:00 -04:00
Alam Ed Arias
abce10fd65 Merge branch 'master' into next 2014-07-29 15:53:53 -04:00
Alam Ed Arias
d8eceeb0ac add build is done message into Makefile 2014-07-29 14:14:59 -04:00
Ronald Kinard
03fe3bdad2 Replace sdl with sdl2 
SDL1.2 is dead, long live SDL
 2014-07-26 02:06:00 -05:00
Ronald Kinard
87df25a58c sdl2: Fallback resolution for gl fullscreen 
to avoid a crash
 2014-07-26 00:56:30 -05:00
Ronald Kinard
3a1a0c8871 sdl2: fix mouse grabbing in windowed 
Should now ignore all motion events and not warp the mouse when the
window is out of focus.
 2014-07-25 23:47:14 -05:00
Ronald Kinard
1bfea632c9 sdl2: windows exe rename srb2sdl2.exe 2014-07-25 23:08:37 -05:00
Ronald Kinard
e3c7bc0637 sdl2: Slow the mouse a bit 
Fixes Furyhunter/SRB2#1 but probably makes mouse speed too slow on
Linux. Whatever.
 2014-07-25 22:55:48 -05:00
Alam Ed Arias
424d6531c9 Merge remote-tracking branch 'Furyhunter/sdl2' into sdl2 2014-07-25 20:00:46 -04:00
Alam Ed Arias
d438a8f8c2 doh, I forget one, and in SDL2's Makefile.cfg 2014-07-25 19:44:43 -04:00
Alam Ed Arias
f03e591f64 change SDL into HAVE_SDL 2014-07-25 19:10:24 -04:00
Ronald Kinard
b429cce3b6 sdl2: add -borderless option for windowed 2014-07-24 22:35:04 -05:00
Ronald Kinard
ce8d82aa52 sdl2: oops it should be 32 bpp in softblit 2014-07-24 21:46:35 -05:00
Ronald Kinard
93e00cc694 sdl2: -softblit, use smaller texture format 
-softblit uses SDL2 software renderer backend for blitting
 2014-07-24 21:32:47 -05:00
Ronald Kinard
8b0f374bfe sdl2: potential huge perf. boost to software 
SDL_UpdateTexture is apparently not good for streaming textures.
So instead, I did SDL_LockTexture/Unlock.
 2014-07-24 19:18:48 -05:00
Ronald Kinard
005b502756 sdl2: limit fullscreen resolution in OpenGL 2014-07-24 03:15:35 -05:00
Ronald Kinard
8890722223 sdl2: handle no AF support correctly (1, not 0) 
GL_EXT_texture_filter_anisotropic is cool I guess
 2014-07-24 03:03:41 -05:00
Ronald Kinard
39603487ec sdl2: restore anisotropic filtering support in gl 2014-07-24 03:01:16 -05:00
Ronald Kinard
716aa1f33a sdl2: fix mouse motion (remove -mousewarp) 2014-07-24 02:51:46 -05:00
Ronald Kinard
0d82e3b54b sdl2: reorder graphics initialization 
GL Initialization needs to happen before window creation,
otherwise the GL library will get reloaded while in use and
Windows will have a heart attack. This is bad, obviously.
 2014-07-24 00:20:34 -05:00
Ronald Kinard
4433be194f sdl2: software: clear window on mode change 2014-07-23 23:21:19 -05:00
Ronald Kinard
73e99fa96c sdl2: I_Error if we can't create gl context 2014-07-23 23:15:31 -05:00
Ronald Kinard
fc075e4c81 sdl2: use ABGR8888 texture on little endian system 
This is a massive performance boost on slow processors, because
before, the intermediary buffer had to be swizzled to ABGR8888
before being uploaded -- for large resolutions this was an
enormous performance penalty.
 2014-07-23 23:02:21 -05:00
Ronald Kinard
345b59f6f5 sdl2: code cleanup 2014-07-23 21:45:36 -05:00
Alam Ed Arias
a103697dd0 isFullscreen is unused? 2014-07-23 22:05:03 -04:00
Alam Ed Arias
1a731fb463 there no fade for non mixer builds 2014-07-23 22:04:46 -04:00
Ronald Kinard
9a4b2bd360 sdl2: restore vsync option (use sdl swap interval) 2014-07-23 19:46:12 -05:00
Ronald Kinard
20f871bd84 sdl2: opengl compiles fine, no TESTHW=1 needed 2014-07-23 19:43:15 -05:00
Ronald Kinard
d078e3e17f sdl2: fix opengl (almost) entirely 2014-07-23 19:39:41 -05:00
Ronald Kinard
fea559398a sdl2: we have colored rects in gl now I guess 2014-07-22 02:23:51 -05:00
Ronald Kinard
0a37bdf76d sdl2: start getting opengl working again 2014-07-22 01:23:08 -05:00
Ronald Kinard
145618785c sdl2: reuse window on mode change 2014-07-21 22:41:01 -05:00
Ronald Kinard
2618b1dd0b sdl2: truncate resolution list, add 16:9 hdtv modes 2014-07-21 22:16:34 -05:00
Ronald Kinard
1ac1d04cca sdl2: joystick fixes. don't pause in demo play/rec 2014-07-21 21:32:18 -05:00
wolfy852
9ab60d1295 Add LUA_EvalMath to Lua with function name EvalMath 2014-07-19 17:46:53 -05:00
wolfy852
d6b466b7dd Add skin flag for running on water 2014-07-05 03:23:49 -05:00
wolfy852
39ce16a468 Add the Jump Thok ability for use by custom characters 2014-07-05 02:50:07 -05:00
Alam Ed Arias
c130be77b1 Merge remote-tracking branch 'RedEnchilada/next' into next 
Also clean up whitespaces
 2014-06-19 13:00:36 -04:00
RedEnchilada
37d3780458 Add hook for chat messages, including csays 2014-06-18 15:28:09 -05:00
Alam Ed Arias
b520d61ba2 Merge branch 'master' into sdl2 2014-05-27 15:19:18 -04:00
Alam Ed Arias
15f976a06c Merge branch 'master' into next 2014-05-27 15:19:08 -04:00
Alam Ed Arias
b511294749 Merge remote-tracking branch 'Sryder13/master' 2014-05-27 15:14:55 -04:00
wolfy852
a8f5406233 Add P_Telekinesis and P_IsFlagAtBase to Lua. 2014-05-25 21:41:05 -05:00
Wolfy
9987d132fb Add P_DoSpring to base library. 2014-05-24 12:51:59 -04:00
Wolfy
f509c56e3c Unstatic P_DoSpring. 2014-05-24 12:49:15 -04:00
Wolfy
5316f8da96 Add P_SpawnSpinMobj to base library. 2014-05-24 12:46:46 -04:00
Wolfy
3f1038dcbe Unstatic P_SpawnSpinMobj. 2014-05-24 12:46:10 -04:00
Wolfy
ec443af3d9 Add P_SpawnThokMobj to Lua base library. 
I don't know too much about this but I THINK I did it right.
 2014-05-24 12:35:01 -04:00
Wolfy
ed82755b6d Unstatic P_SpawnThokMobj. 2014-05-24 12:30:33 -04:00