Christoph Oelckers
005313c00e
Merge branch 'master' of https://github.com/rheit/zdoom
2014-01-04 11:29:02 +01:00
Braden Obrzut
b0f40c0733
- So we did end up restoring the variable that the last commit was compensating for.
2014-01-04 00:37:15 -05:00
Braden Obrzut
4770b9b27b
- Fixed: Rampage timer should only reset when the weapon is ready to be fired.
2014-01-03 01:21:21 -05:00
Braden Obrzut
a62996386d
Merge branch 'maint'
2014-01-02 19:42:15 -05:00
Braden Obrzut
511bdc7208
- Work around GCC 4.8 bug 54570
2014-01-02 19:41:53 -05:00
Braden Obrzut
50cec119a0
- Work around GCC 4.8 bug 54570
2014-01-02 19:12:03 -05:00
Braden Obrzut
1e50a0af9e
- Hard code gdtoa constants for OS X since the programs can’t always be run on the target. (The values are the same for GCC and Clang.)
2014-01-02 03:06:06 -05:00
Braden Obrzut
49edd7c60c
- Add support for cross compiling so that OS X PowerPC builds can still be made on systems without rosetta (10.7+). (Compiling x86 binaries on ppc should also be possible.)
2014-01-02 01:59:04 -05:00
Christoph Oelckers
853c1c4f1e
Merge branch 'master' of https://github.com/Edward850/zdoom
2014-01-01 16:51:27 +01:00
Edward Richardson
455145d611
Stall testing for interpolation
...
Uncapped framerate never triggered the stall detection code, as it never
tried to process a frame to start with.
2014-01-02 00:04:32 +13:00
Christoph Oelckers
ad88cfc5e2
Merge branch 'master' of https://github.com/rheit/zdoom
2013-12-25 22:32:21 +01:00
Christoph Oelckers
6e0f885135
- fixed: The 3D floor setup code treated alphas larger than 255 as translucent. This was causing problems with ZDCMP2 in GZDoom
2013-12-25 22:30:47 +01:00
Christoph Oelckers
917a869a54
- fixed: gl_SetFog set the vertex attribute for software lighting mode without checking if the mode is actually on.
2013-12-23 09:56:16 +01:00
Christoph Oelckers
ae49044f96
- let 'showloadtimes' measure UDMF parsing.
2013-12-19 17:59:58 +01:00
Christoph Oelckers
3e0325c8b0
Merge branch 'master' of https://github.com/rheit/zdoom
2013-12-17 17:24:43 +01:00
Christoph Oelckers
9a927c2030
Merge branch 'master' of https://github.com/Edward850/zdoom
2013-12-16 11:56:58 +01:00
Edward Richardson
a993b0288a
Stop prediction from playing and stopping sounds
...
Player prediction would play *jump and stop falling sounds, creating odd
cases of sound repetition before the gametic caught up.
2013-12-16 23:02:27 +13:00
Braden Obrzut
5904df7f56
Merge branch 'maint'
2013-12-13 03:05:06 -05:00
Braden Obrzut
12d45bbc33
- Use setenv for LC_NUMERIC since setlocale gets reset by the libraries on some systems.
2013-12-13 03:00:35 -05:00
Braden Obrzut
10c312f55c
- Silence GCC PCD_PRINTBINARY warning since we've been able to since GCC 4.6.
2013-12-13 02:51:15 -05:00
Christoph Oelckers
d2927c3d8c
Merge branch 'master' of https://github.com/rheit/zdoom
2013-12-09 11:34:41 +01:00
Christoph Oelckers
3b5d379fa4
- Linux compile fix.
2013-12-09 11:34:26 +01:00
Christoph Oelckers
74dee4cd63
- removed ddraw.lib from CMake files because that library is not used anymore.
2013-12-09 11:24:58 +01:00
Christoph Oelckers
fd767233aa
- fixed typo: glColor must be gl_Color in shader.
2013-12-08 10:01:03 +01:00
alexey.lysiuk
4b24489393
* fix compilation on non-Windows systems
2013-12-07 12:25:38 +02:00
Christoph Oelckers
d46315c44b
- some finetuning of subtractive effect.
2013-12-05 15:39:46 +01:00
Christoph Oelckers
8d08624f97
Merge branch 'master' of https://github.com/rheit/zdoom
2013-12-05 15:38:14 +01:00
Christoph Oelckers
31c9a0b0e8
- Subtract should respect alpha.
2013-12-05 15:36:20 +01:00
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