Christoph Oelckers
4f00aa3957
Merge branch 'master' of https://github.com/rheit/zdoom
2014-12-16 17:38:37 +01:00
MajorCooke
465d9ab89a
- Added flags for A_CheckLOF:
...
- CLOFF_SETTARGET | CLOFF_SETMASTER | CLOFF_SETTRACER
- An actor that causes A_CheckLOF (and only an actor) to succeed will set the intercepting actor as its target, master, and/or tracer, respectively.
2014-12-15 14:50:35 -06:00
MajorCooke
b6c5cfb9ef
- Fixed: The new HIT* flags were checking the wrong actor.
2014-12-15 10:26:22 -06:00
Christoph Oelckers
6410428715
- fixed: FxPick leaked the array's content. Also did some cleanup on FxPick code.
2014-12-14 12:03:55 +01:00
MajorCooke
3f3aab42f1
- Pick can now hold unlimited numbers to choose from.
...
- I.e. pick(1,4,12,16)
2014-12-14 04:45:39 -06:00
MajorCooke
785f72d6eb
- Renamed RClamp to Pick.
2014-12-13 15:59:27 -06:00
MajorCooke
8c5a8c54f0
- Added rclamp(<int>,<int>).
...
- Usable for DECORATE expressions. Chooses one of the two numbers placed in the field.
2014-12-13 15:08:18 -06:00
Braden Obrzut
b14eded8d8
- Accidentally committed debuging code.
2014-12-12 17:06:01 -05:00
Braden Obrzut
8ee0554d56
- Fixed: Extra Steam paths still need steamapps/common appended to them.
2014-12-12 16:33:49 -05:00
Braden Obrzut
86372fce34
- Added Steam detection for Stife: Veteran Edition.
...
- Added Steam install scanning for Linux and OS X. (OS X and Win32 not yet tested.)
2014-12-12 16:23:46 -05:00
Edoardo Prezioso
372f7e7002
- Various CMake fixes for two problems.
...
1) Don't show OSX_COCOA_BACKEND option if the host is not OSX;
2) Don't use the '-msse' compiler flag in dumb/ if the architecture does not support it.
2014-12-10 21:11:26 +01:00
Christoph Oelckers
b2a06f6ccd
Merge branch 'waitforsave' of https://github.com/Edward850/zdoom
2014-12-10 11:49:40 +01:00
Christoph Oelckers
6afe9cc048
Merge branch 'hitpointer2' of https://github.com/MajorCooke/zdoom
...
Conflicts:
src/actor.h
src/thingdef/thingdef_data.cpp
2014-12-10 11:48:32 +01:00
Edward Richardson
c339bb33cf
Added cl_waitforsave
...
- cl_waitforsave (default true) pauses the game timer when a save
starts, preventing the network buffer from trying to compensate for slow
saves.
2014-12-10 20:55:00 +13:00
MajorCooke
533ae95933
- Added three missile impact pointer changing flags.
...
- HITTARGET, HITMASTER, and HITTRACER.
- A missile that dies hitting an actor will set this impacted actor as the new target/master/tracer, depending on specifications.
2014-12-09 12:30:14 -06:00
MajorCooke
e5340ad637
- Splitting the pull request in half.
...
- Added THRUREFLECT, MIRRORREFLECT, and AIMREFLECT. All require REFLECTIVE to work.
- THRUREFLECT prevents missiles from changing course if reflected, and takes precedence over all reflective flags.
- MIRRORREFLECT causes missiles to perform a direct 180 turn-around.
- AIMREFLECT turns the missile back to the original shooter, and does not slow the missile down.
2014-12-09 12:09:36 -06:00
Christoph Oelckers
b2452b806e
- missed a return.
2014-12-08 12:01:20 +01:00
Christoph Oelckers
95bed868d3
- gcc warnings suck...
2014-12-07 14:46:53 +01:00
Christoph Oelckers
8a98be00dc
- fixed: ZDoom did not understand Boom's name for the Red Skull Key pickup message due to a typo.
...
Of course, just changing the name would break many old ZDoom mods so now Boom's name is explicitly being translated into ZDoom's before setting the string.
2014-12-07 09:30:16 +01:00
Christoph Oelckers
e6de24a7de
- turned out that the recent change to allow cancelling a powerup blend through a powerup giver did not work well so now there's an explicit 'Powerup.Color none' to do it that works a bit differently.
2014-12-06 22:08:39 +01:00
Christoph Oelckers
eaa82492e6
Merge branch 'bug-46152' of https://github.com/kevans91/zdoom
2014-12-04 09:37:47 +01:00
Kyle Evans
fcc491f735
Make the respawn invulnerability APowerInvulnerable persist through a ClearInventory by making it undroppable
2014-12-03 17:04:47 -05:00
Christoph Oelckers
fbe14d59bb
- fixed: All powerup blend colors with an alpha of 0 were treated as 'has no color' for PowerupGivers.
2014-12-03 13:05:50 +01:00
Kyle Evans
c631ffc5fd
Fixed SV_SAMESPAWNSPOT behavior -- When enabled, use the p->mo->z. Otherwise, rely on ONCEILINGZ/FLOATRANDZ/ONFLOORZ w/ or w/o UsePlayerStartZ as previously done
2014-12-03 00:50:05 -06:00
Christoph Oelckers
689b39ed30
Merge branch 'bug-47011' of https://github.com/kevans91/zdoom
2014-12-02 09:06:20 +01:00
Kyle Evans
3af08f1983
Fixed weapon drawing rules to account for the death camera [backported from gzdoom], also fixed drawing rules for crosshair
2014-12-01 22:03:22 -06:00
Kyle Evans
8b88f14c96
Destroy mod-created CVars when 'restart' is invoked
2014-12-01 21:04:50 -06:00
Christoph Oelckers
717c82ee4a
- On Intel, we have to disable shader storage buffers because their complier contains a bug disallowing unsized arrays.
2014-12-01 09:58:23 +01:00
Christoph Oelckers
ed5b0d902a
Merge branch 'BotFunctions' of https://github.com/ChillyDoom/zdoom
2014-11-29 20:22:21 +01:00
ChillyDoom
e7da849f77
- Moved bot specific functions into DBot.
2014-11-29 17:03:58 +00:00
Christoph Oelckers
020b02e073
- changed deprecated texture sampler access function names.
2014-11-28 12:28:45 +01:00
Edward Richardson
a418f564e9
Fixed message duplication in logs
...
- Any printed hud messages would have duplicate entries in logs.
2014-11-28 16:34:42 +13:00
Christoph Oelckers
3e2b0e4c71
Merge branch 'raise' of https://github.com/MajorCooke/zdoom
2014-11-27 22:37:36 +01:00
MajorCooke
94f08aa593
- Added: Boolean to specify if A_Raise functions should perform CopyFriendliness based upon who raised it. By default, this is false.
2014-11-27 15:12:33 -06:00
khokh2001
e1fdcdfb93
opl3 emulator update
2014-11-28 04:07:33 +09:00
Christoph Oelckers
ec627d94dd
- fixed: The depth clamp setting needs to be tracked per portal so that it can be properly restored afterward.
...
Regular skies need it off but SkyViewpoints need it on - and all others need to use the parent's setting.
So without engine side tracking we can end up rendering the sky with this setting off, resulting in omission of the fog layer.
2014-11-27 12:26:52 +01:00
Christoph Oelckers
eb753a0b7c
- fixed: We also should use the proper 'copied' info for the non-inverted planes.
2014-11-27 10:49:03 +01:00
Christoph Oelckers
99d81621f9
- fixed: The 'copied' information of a 3D floor plane should only apply to that particular plane, but never the opposite one of the same 3D floor.
2014-11-27 10:46:28 +01:00
Christoph Oelckers
1389cd03ca
Merge branch 'hqnx_intrinsics' of https://github.com/alexey-lysiuk/gzdoom
2014-11-27 10:10:25 +01:00
alexey.lysiuk
60d78bcdf6
- implemented hqNx image scaling algorithms using MMX and SSE2 intrinsics
2014-11-27 10:58:34 +02:00
Christoph Oelckers
b2fdd32b0a
Merge branch 'fade' of https://github.com/MajorCooke/zdoom
2014-11-25 20:56:54 +01:00
MajorCooke
08570ec48e
- Added flags for A_Fade functions:
...
- FTF_REMOVE: Removes the actor when the alpha hits a certain level.
- - A_FadeIn - 1.0
- - A_FadeOut - 0.0
- - A_FadeTo - Alpha target level reached
- FTF_CLAMP: Automatically fixes the alpha so it won't leave the range [0.0, 1.0].
2014-11-25 13:24:35 -06:00
Edoardo Prezioso
629f3c1a8a
- Oops comment typo.
2014-11-25 19:23:49 +01:00
Edoardo Prezioso
8fbed78c21
- Add new function for the new slope calculations.
...
Fixed also two MSVC warnings.
2014-11-25 19:15:25 +01:00
Christoph Oelckers
a67ac5d940
Merge branch 'slope64_comment' of https://github.com/edward-san/zdoom
2014-11-25 17:39:08 +01:00
Edoardo Prezioso
cc4e66f976
- Fix the division by 0, improve comments.
...
- Avoid doing the division if the result would be outside the ]0,1<<24[ range:
-- if the numerator is nonpositive, ie <=0, truncate the result to 0,
-- if the numerator is greater or equal than the denominator, the result will be outside the allowed range, hence truncate the result to 1<<24.
-- otherwise, the result will be inside the range. Knowing that the denominator is greater than the numerator, if the numerator has the last 24 bits non zero, the denominator can't be less than 1<<24, hence the denominator won't be truncated to 0.
- Add comment details to help who doesn't know math. Big deal!
2014-11-25 17:02:22 +01:00
Christoph Oelckers
29ecbac963
- fixed: The demo buffer was allocated with conflicting methods, because M_ReadFile used new whereas the rest of the demo code assumed malloc. Added a new M_ReadFileMalloc function to handle this case without rewriting other things.
2014-11-25 17:00:17 +01:00
Christoph Oelckers
6665ac5837
- fixed: With P_ExplodeMissile now working properly it is no longer valid to terminate a looping sound in a missile's death state because it now gets called after the death sound has been started.
2014-11-25 16:49:27 +01:00
Christoph Oelckers
a7a2d55695
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
src/sdl/iwadpicker_cocoa.mm
2014-11-25 16:39:56 +01:00
Christoph Oelckers
4a3427fe50
Merge branch 'opl3emu' of https://github.com/khokh2001/zdoom
2014-11-25 16:32:52 +01:00