Commit graph

6205 commits

Author SHA1 Message Date
Christoph Oelckers
79ef119ae2 Merge branch 'master' of https://github.com/rheit/zdoom 2013-12-05 15:28:37 +01:00
Christoph Oelckers
c959b3f250 - added 'subtract' render style to DECORATE parser. This is actually 'reverse subtract' 2013-12-05 15:28:09 +01:00
Christoph Oelckers
95163e378e - added a fog layer when drawing sprites with render style reverse subtract. 2013-12-05 15:06:10 +01:00
Christoph Oelckers
f40dc9deb2 Merge branch 'master' of https://github.com/chungy/gzdoom 2013-12-05 14:02:35 +01:00
Mike Swanson
d48d337883 convert file from UTF-16LE to UTF-8
This one file gave issues with parsing in certain programs, including
the GitHub UI. No need for English text to waste so much space.
2013-12-05 04:43:29 -08:00
Christoph Oelckers
2f60ca338b - removed unused members from sector_t 2013-12-05 12:19:44 +01:00
Christoph Oelckers
058f065446 - fixed: FFlatVertex contained two unused members.
- fixed: Clearing the args in the VavoomLightColor constructor only cleared 5 bytes, still assuming byte args.
2013-12-05 10:23:01 +01:00
Christoph Oelckers
7ba0f2467a Merge branch 'master' of https://github.com/rheit/zdoom 2013-12-01 21:11:52 +01:00
Christoph Oelckers
86d7a326be - allowdecals logic was nonfunctional. 2013-12-01 21:11:33 +01:00
Christoph Oelckers
f7c7b07962 Merge branch 'master' of https://github.com/rheit/zdoom 2013-12-01 20:37:50 +01:00
Christoph Oelckers
25f60779fd - fixed: The 'allowdecals' check in animated doors was wrong. 2013-12-01 20:20:26 +01:00
Christoph Oelckers
d6d905fb88 Merge branch 'master' of https://github.com/rheit/zdoom 2013-12-01 18:44:43 +01:00
Christoph Oelckers
8b92597508 Merge branch 'master' of https://github.com/Edward850/zdoom 2013-12-01 18:29:46 +01:00
Edward Richardson
7045f195f3 Removed excess value from stall debug output
The debug output for a stalled Arbitrator had an excess Net_Arbitrator
value, bumping the gametic+counts value off the output.
2013-12-02 06:23:22 +13:00
Christoph Oelckers
8451cc6e9f Merge branch 'master' of https://github.com/rheit/zdoom 2013-12-01 16:49:55 +01:00
Christoph Oelckers
c5b2c95572 - fixed placement and handling of 'allowdecals' for animated doors. 2013-12-01 15:11:41 +01:00
Christoph Oelckers
a89ecdad50 Merge branch 'master' of https://github.com/Edward850/zdoom 2013-12-01 10:27:40 +01:00
Edward Richardson
662bc7a3ac cl_bloodtype could break playsim sync
Corrected entries were blood would spawn inconsistently because of
cl_bloodtype. Blood now always spawns but is marked invisible according
to cl_bloodtype.
2013-12-01 22:06:48 +13:00
Christoph Oelckers
a915c934b5 Merge branch 'master' of https://github.com/rheit/zdoom 2013-12-01 01:43:50 +01:00
Christoph Oelckers
7e062f394b - fixed: animated door textures defined by index were not added to the sequence.
- fixed: animated doors should set 'no decals' for the texture.
- added 'allowdecals' option to override the above.
2013-12-01 01:26:30 +01:00
Christoph Oelckers
698495efc5 - fixed: missing return in playerinfo CCMD added. 2013-12-01 01:21:43 +01:00
Christoph Oelckers
e7225bced6 - check negative XScale on sprites to allow mirroring. 2013-12-01 01:15:10 +01:00
Christoph Oelckers
9ac3b6aa1b - fixed: IsVisibleToPlayer needs to be checked for the owner of owned dynamic lights. 2013-11-30 13:15:22 +01:00
Christoph Oelckers
992994239b - changed rules for drawing HUD sprites to match the software renderer. 2013-11-30 13:01:48 +01:00
Christoph Oelckers
228c6f976f - fixed: the size limit for dynamic light uniforms was not checked properly, causing artifacts when there were too many dynamic lights. 2013-11-30 12:53:34 +01:00
Christoph Oelckers
12985cf635 - fixed: Particle drawing needs to apply the current fixed colormap to the particle's color. 2013-11-30 12:35:38 +01:00
Christoph Oelckers
e4282d3554 - added error check to GL getProcAddress calls to spot driver errors. 2013-11-30 12:34:55 +01:00
Christoph Oelckers
cdd0aef1ce - fixed: HQnX must be excluded on Win64 builds. 2013-11-30 10:20:24 +01:00
Christoph Oelckers
3fbcfa7551 Merge branch 'master' of https://github.com/rheit/zdoom 2013-11-30 01:34:10 +01:00
Braden Obrzut
974619d5be - According to Graf, we should just let zipdir determine if the pk3 needs updating. 2013-11-29 17:13:34 -05:00
Braden Obrzut
c04a800e2b - When doing OLDSTYLE builds we can use the RUNTIME_OUTPUT_DIRECTORY_<CONFIG> properties to force the output location properly. 2013-11-29 17:10:29 -05:00
Braden Obrzut
90e9482067 - Get as many files as possible as dependencies for pk3 building. (Kind of feels like CMake changes the behavior of depending on directories every now and then, but maybe it's just me.) 2013-11-29 14:41:03 -05:00
Christoph Oelckers
cbed4624fa - added a user-settable factor for earthquake intensity. Value can be between 0 (no shaking) and 1 (normal shaking.) 2013-11-29 13:24:38 +01:00
Christoph Oelckers
5624b1ace0 Merge branch 'master' of https://github.com/rheit/zdoom 2013-11-29 12:53:31 +01:00
Christoph Oelckers
b9c032461e - add a CMake option to enable/disable SSE2 with Visual C++. This is necessary because since VC 2012 SSE2 is the default instruction set. 2013-11-29 12:35:45 +01:00
Christoph Oelckers
bac9303fe4 Merge branch 'master' of https://github.com/rheit/zdoom 2013-11-29 10:09:12 +01:00
Braden Obrzut
a8090dc22c - Remove a hardcoded "zdoom" so that the name passed into the copy operation should always match that passed to /MAP. 2013-11-29 02:09:27 -05:00
Braden Obrzut
c21beb0b6c - Fixed: Some versions of Visual Studio put the map file in a different location. 2013-11-29 01:54:46 -05:00
Braden Obrzut
c6c6487a30 - Fixed: Got a little hyper corrective in c763217. 2013-11-28 14:41:40 -05:00
Christoph Oelckers
45070114e8 Merge branch 'master' of https://github.com/rheit/zdoom
Conflicts:
	.gitignore
	CMakeLists.txt
2013-11-28 12:44:27 +01:00
Edward Richardson
447ce068f9 Merge pull request #3 from rheit/master
Merge branch 'master' of https://github.com/rheit/zdoom
2013-11-28 02:33:00 -08:00
Christoph Oelckers
7cb70f60b3 - removed duplicate #define warning in fmodsound.cpp.
- commented out output of Cr0NpxState for floating point state because this variable was renamed in most recent Windows headers.
- added CMAKE option to generate assembly output for release builds.
- added my CMake-based project directory to .gitignore.
2013-11-28 11:03:19 +01:00
Edward Richardson
97490a3b65 Merge pull request #2 from rheit/master
Merge branch 'master' of https://github.com/rheit/zdoom
2013-11-27 22:24:01 -08:00
Braden Obrzut
0c1d92834a - Fixed: Some setups require the dynamic linking library to be linked explicitly, so specify it when using DYN_FLUIDSYNTH 2013-11-26 17:58:55 -05:00
Christoph Oelckers
40d4ebcbc5 Merge branch 'master' of https://github.com/rheit/zdoom 2013-11-26 22:12:18 +01:00
Braden Obrzut
c7632174d8 - Fixed error in manifest embedding that stopped the binary from working on Windows XP.
- Tweaked PK3 copying commands so that it shouldn't be possible to end up with files named Debug/Release.
2013-11-26 12:49:23 -05:00
Christoph Oelckers
9cd59ddfcd Merge branch 'master' of https://github.com/rheit/zdoom 2013-11-24 10:27:35 +01:00
Christoph Oelckers
8bf5872fc0 - always add DelayImp.lib for MSVC. 2013-11-24 10:27:08 +01:00
Braden Obrzut
1710e92c3a - Fix issues with building XCode projects with CMake. 2013-11-21 01:54:56 -05:00
Christoph Oelckers
3f63e22479 - deleted obsolete VC++2008 solution. Please use CMake to generate VC++ projects from now on. 2013-11-20 23:12:13 +01:00