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
fdee54626e
Merge branch 'master' into next
2015-02-06 10:22:39 -05:00
Alam Ed Arias
2609745b51
it was me, Duo!
2015-02-06 10:22:16 -05:00
Alam Ed Arias
dbb1d8088e
Merge branch 'master' into next
2015-02-05 17:33:00 -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
Alam Ed Arias
776dafa0bb
Merge branch 'master' into next
2015-02-05 17:05:20 -05:00
Alam Ed Arias
01d441e6c0
Merge remote-tracking branch 'Furyhunter/ipv6-osx-fix'
2015-02-05 17:04:54 -05:00
Alam Ed Arias
8cccfa558a
do not include anything in assets folder unless forced
2015-02-05 17:04:24 -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
e0f90d83ee
Merge branch 'master' into next
2015-02-02 15:22:14 -05:00
Alam Ed Arias
3d498fe894
VERSIONSTRINGW is funny
2015-02-02 15:21:58 -05:00
Alam Ed Arias
963276e8ca
Merge branch 'master' into next
2015-02-02 14:59:00 -05:00
Alam Ed Arias
7cf1a1aab8
fixup cmake merge
2015-02-02 14:58:51 -05:00
Alam Ed Arias
5c8a6e3917
Merge branch 'master' into next
2015-02-02 12:53:06 -05:00
Alam Ed Arias
244fb0b2b5
Merge remote-tracking branch 'Furyhunter/cmake-update'
2015-02-02 12:52: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
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
