Christoph Oelckers
37e8221067
Merge branch 'master' of https://github.com/rheit/zdoom
2015-12-15 22:07:10 +01:00
Christoph Oelckers
60f7217fbb
Merge branch 'master' of https://github.com/rheit/zdoom
2015-12-15 22:01:03 +01:00
Chris Moeller
17a216c832
Fix issue #15 / CVE-2006-3668
2015-12-15 14:47:54 -06:00
Chris Moeller
e5a4031a70
Fixed another memory leak in an error handler
2015-12-15 14:47:43 -06:00
Chris Moeller
45e031170e
Implement missing n_pchannels for AMF format reader
2015-12-15 14:47:34 -06:00
Chris Spiegel
865f083128
Fix memory leaks.
2015-12-15 14:47:25 -06:00
Tuomas Virtanen
3d83ed2ee5
Change dumb.h version information to match release version
...
Conflicts:
dumb/include/dumb.h
2015-12-15 14:47:13 -06:00
Randy Heit
8a6dfabedb
Revert "- Implemented loop-accurate time position reporting into DUMB"
...
This reverts commit 153721b1c9f4cde62fa17d6aef56f782b37384bf.
Conflicts:
dumb/include/dumb.h
dumb/include/internal/tarray.h
dumb/src/helpers/tarray.c
dumb/src/it/itrender.c
2015-12-15 14:29:51 -06:00
Randy Heit
d0f1df1132
Revert "Fixed duplicating some timekeeping state variables"
...
This reverts commit 381ce8ea4237a64d63ac447d1e42463edde356da.
2015-12-15 14:17:02 -06:00
Randy Heit
d3000fd838
Revert "Fixed timekeeping"
...
This reverts commit 68f8a3aa8fb53b98625232d99cc5bd040e67dd96.
Conflicts:
dumb/src/it/itrender.c
2015-12-15 14:16:34 -06:00
Randy Heit
06bb75576c
Revert "Fixed timekeeping when starting a sigrenderer with a time offset"
...
This reverts commit cf2577d4bc284fb5c5b71377413a47c72a1362dc.
2015-12-15 14:13:54 -06:00
coelckers
fe990dcc7c
Merge pull request #442 from alexey-lysiuk/fix_machexen_font
...
Fix incorrect small font rendering with Hexen Mac IWAD
2015-12-14 11:29:29 +01:00
alexey.lysiuk
9176d75580
Fix incorrect small font rendering with Hexen Mac IWAD
...
Unused high resolution font lumps broke composite font logic
Small font had doubled height because of that, at least alternate HUD and inter-hub text messages had noticeable visual issues
2015-12-14 11:47:46 +02:00
Christoph Oelckers
68a72d64a4
Merge branch 'master' of https://github.com/rheit/zdoom
2015-12-14 09:06:42 +01:00
Christoph Oelckers
af2ce6ef42
- fixed: The 'mindefaults' game configuration must define the player starts 5-8.
2015-12-14 09:06:13 +01:00
Christoph Oelckers
17569139b6
Merge branch 'master' of https://github.com/coelckers/gzdoom
2015-12-11 22:26:45 +01:00
Christoph Oelckers
37ea94abf3
- fixed: translucent walls did not set up their dynamic lights in the GL4 render path.
2015-12-11 22:26:10 +01:00
coelckers
d80b15e608
Merge pull request #32 from kevans91/gzdoom-freebsd-compile
...
<stdlib.h> has replaced <malloc.h> on FreeBSD as well
2015-12-11 09:25:18 +01:00
Kyle Evans
841ddb0d63
<stdlib.h> has replaced <malloc.h> on FreeBSD as well
2015-12-10 23:01:59 -06:00
Kyle Evans
7c6237e134
<stdlib.h> has replaced <malloc.h> on FreeBSD as well
2015-12-10 21:24:37 -06:00
Christoph Oelckers
5b4323ec6c
Merge branch 'master' of https://github.com/rheit/zdoom
2015-12-08 09:35:06 +01:00
coelckers
94c397b868
Merge pull request #435 from Edward850/pauseext-fix
...
Fix lost focus loosing network data
2015-12-07 12:52:23 +01:00
coelckers
fbccc3350c
Merge pull request #437 from edward-san/lemon_free_buf_fix
...
- Fixed lemon trying to free non-allocated memory.
2015-12-07 12:49:55 +01:00
Edoardo Prezioso
18de376edf
- Fixed lemon trying to free non-allocated memory.
...
This is a regression from commit 24a096fb27
. It happened only the input files were present in the same directory as the executable.
2015-12-07 11:19:42 +01:00
Braden Obrzut
964ee6bb23
- Worked around issue where stat doesn't work in v140_xp. Even though the bug was supposedly fixed for awhile now it didn't make it into Update 1.
2015-12-07 04:49:40 -05:00
Braden Obrzut
72d4c33453
- Removed GetAspectRatio as the implementation was highly fragile. Even if converted to giving the ratio, I have strong concerns about having this function built in without ZDoom supporting arbitrary aspect ratios as the odds of people checking against the hard coded constants seems high. The existing ACS version of this function returns fixed point ratios (because why not) and I fully expected people to use a switch statement when writing it.
2015-12-07 01:18:56 -05:00
Braden Obrzut
62d41a58a8
Merge branch 'DecProx3' of git://github.com/MajorCooke/zdoom into master
2015-12-07 00:53:06 -05:00
Christoph Oelckers
0cb64dd464
- made character encoding for UFMF/ZDoom namespaces explicit.
2015-12-06 20:55:05 +01:00
Christoph Oelckers
a0d6b05707
Merge branch 'master' of https://github.com/rheit/zdoom
2015-12-06 09:59:41 +01:00
Christoph Oelckers
ad0e71942d
- added GetAspectRatio function to ACS.
...
- added a sixth parameter for SetHUDClipRect so that the forced aspect ratio fudging this function performs can be disabled.
2015-12-06 09:59:02 +01:00
coelckers
d8cacbb8bb
Merge pull request #436 from Gaerzi/master
...
3D floor support for check switch range
2015-12-05 09:17:35 +01:00
Gaerzi
542a108914
3D floor support for check switch range
2015-12-05 00:26:39 +01:00
Edward Richardson
f90ce1308e
Fix lost focus loosing network data
...
- Prevented focus loss from dropping network data during level
transitions
- Fixed delay counter underflows
2015-12-03 16:40:47 +13:00
Christoph Oelckers
455d8d9730
Merge branch 'master' of https://github.com/rheit/zdoom
2015-12-02 22:33:10 +01:00
Christoph Oelckers
81f521fe56
- fixed: Texture precaching from MAPINFO was broken
...
The code assumed that it had access to the texture manager but that gets initialized after MAPINFO, which means that MAPINFO can only store the texture names and let the precaching code resolve the actual textures.
2015-12-02 22:31:27 +01:00
Christoph Oelckers
41f91148a1
Merge branch 'master' of https://github.com/rheit/zdoom
2015-12-02 09:31:27 +01:00
coelckers
38df0665e3
Merge pull request #434 from alexey-lysiuk/fix_skill_assign
...
Fix incomplete assignment operator of FSkillInfo
2015-12-01 14:24:10 +01:00
alexey.lysiuk
4adf421513
Fix incomplete assignment operator of FSkillInfo
...
See http://forum.zdoom.org/viewtopic.php?t=50026
2015-12-01 14:30:57 +02:00
coelckers
5cd8d5f5d9
Merge pull request #433 from MajorCooke/CustomPunchSoundParam
...
A_CustomPunch Extension
2015-11-30 18:49:13 +01:00
MajorCooke
8594bfaa8b
A_CustomPunch Extension
...
- Added Melee/Miss parameters just like A_CustomMeleeAttack.
2015-11-30 11:42:08 -06:00
Christoph Oelckers
f4a60f29f3
- added missing sc.MustGetString() to 'optional' case of decal parser.
2015-11-30 09:21:45 +01:00
Christoph Oelckers
f9cbaef1df
- fixed: Boom's Transfer_Heights did not work for upper parts in sectors with a sky ceiling.
...
This incorrect check has been in the code for 12 years, unfortunately I have no idea anymore why it was added.
2015-11-30 00:11:30 +01:00
Christoph Oelckers
c9e4f120e7
- forgot to save this before committing.
2015-11-29 15:27:20 +01:00
Christoph Oelckers
f7cdb28eac
- added a HealthFactor skill property.
2015-11-29 12:58:17 +01:00
Christoph Oelckers
106886a9bb
- allow setting the ice translation with Thing_SetTranslation.
...
This requires passing a magic value because this translation is defined differently than all the rest which can be used in ACS.
2015-11-29 12:30:50 +01:00
Christoph Oelckers
1ad02a6ce8
- allow specifying infighting through skills.
2015-11-29 12:10:12 +01:00
Christoph Oelckers
1a0faf4761
- allow optional decal generator definitions.
2015-11-29 11:41:14 +01:00
Christoph Oelckers
5515cb02a6
- fixed incorrect error method call in decal parser.
2015-11-29 11:35:12 +01:00
Christoph Oelckers
9bfd676783
- allow setting the FloatbobPhase through UDMF.
2015-11-29 11:28:26 +01:00
MajorCooke
4fb48b332b
Added A_CheckProximity.
...
- Checks to see if a certain actor class, in numbers, is close to the actor/pointer via distance, based upon count. Can check for ancestry, disable Z searching, perform less than or equal to instead of greater or equal to, exact counts, check a pointer instead of itself and differentiate between live monsters and dead.
2015-11-28 10:53:34 -06:00