Christoph Oelckers
aac1ce4eb7
Merge branch 'master' of https://github.com/rheit/zdoom
2014-12-27 11:52:32 +01:00
Randy Heit
1aa00f1b0e
Draw player setup cursor equivalently to options menu cursors
...
- Explicitly size and position the text cursor in
FListMenuItem::DrawSelector() the same way that the options menu does it
using M_DrawConText(): By sizing it to a scaled 8x8 cell.
2014-12-26 19:22:09 -06:00
Braden Obrzut
84afd2252f
- Fixed missing right paren on the first _Pragma from last commit.
2014-12-26 20:10:41 -05:00
Randy Heit
f76d137d33
Be less ugly when hiding warnings for using the %B formatter
...
- Take advantage of the new _Pragma operator to hide the printf warning
suppression inside of macros instead of needing to litter the code
around Printfs with a bunch of junk.
2014-12-26 18:58:59 -06:00
Randy Heit
bce7d12379
Change clipping in DSBarInfo::DrawGraphic()
...
- Fixed: When DSBarInfo::DrawGraphic() is used scaled, without fullscreen
offset, if one of the top and left clip locations was 0 and the other
was non-0, the 0 one would be clipped to the edge of a 4:3 box centered
on the screen instead of the edge of the screen.
2014-12-26 18:40:15 -06:00
Randy Heit
798267d223
Remove memcpy from "Unknown command" error printing
2014-12-26 17:29:13 -06:00
Randy Heit
4017a6d864
Retry setting unknown cvars after CVARINFOs are processed.
...
- Fixed: Using +set cvarname and +cvarname on the command line would not
work if cvarname was defined in CVARINFO. This should be the proper way to fix
it. Rather than move all command line execution after loading CVARINFO,
keep command line execution before wads are loaded. If an attempt is
made to set an unknown cvar or to run an unknown command (which could
potentially be shorthand for setting an unknown cvar), save it and try
running it again after all CVARINFOs have been handled.
2014-12-26 17:21:57 -06:00
Randy Heit
f00c8e1943
Revert "Move C_ExecCmdLineParams() call slightly later in the startup process."
...
This reverts commit 3c376aa342
.
- I was wrong. It breaks pullin and complete logging (at the very least).
2014-12-26 16:34:38 -06:00
Randy Heit
b30571b18e
Merge branch 'master' of github.com:rheit/zdoom
2014-12-26 15:17:20 -06:00
Randy Heit
e0667544d2
Clamp chase_dist and chase_height because integer overflow is a thing.
2014-12-26 15:15:42 -06:00
Christoph Oelckers
f054f626d2
Merge branch 'master' of https://github.com/rheit/zdoom
2014-12-26 21:55:47 +01:00
Randy Heit
ec98937c88
Read script number as signed when parsing SARY chunks
...
- Fixed: Script arrays didn't work in named scripts because the loader
read the script number as an unsigned word, hence it would never find
named scripts, since they are stored with negative numbers.
2014-12-26 14:41:01 -06:00
alexey.lysiuk
0d1c954bc0
Fixed crash in game controller support code
...
Joystick's startup and shutdown (of Native OS X backend) can be called more than once
2014-12-26 22:11:03 +02:00
Christoph Oelckers
4f383e5aa7
- Nash's force fake contrast submission.
2014-12-26 13:43:49 +01:00
Christoph Oelckers
fbfe0f1e7a
- fixed: y-clamped textures with negative scale need to shift their texture coordinates into the proper [0..1] range.
2014-12-26 11:53:38 +01:00
Christoph Oelckers
c39e962fd5
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
src/CMakeLists.txt
src/posix/sdl/hardware.cpp
Please note that this will NOT(!!!) compile on Linux without adjusting sdlglvideo.cpp!
2014-12-25 22:50:15 +01:00
Christoph Oelckers
c66a211200
- fixed: The sky renderer must not only alter the light mode but also reset the software light level to a 'disabled' value.
2014-12-25 22:45:40 +01:00
Christoph Oelckers
14d7b8b777
- fixed: Since no DrawText calls actually use the non-functional DTA_DestWidth, DTA_DestHeight or DTA_Translation and GCC cannot handle the fudging of the varargs, these will now trigger an assertion. No need to try to make something work that's always a programming error.
2014-12-25 21:08:31 +01:00
Christoph Oelckers
a5a17e45cf
- fixed: Checking the terrain for any texture that was created after initializing the terrain data either returned random garbage or could even create an access violation. Added a range check to the array access function to prevent this.
2014-12-25 20:43:40 +01:00
Christoph Oelckers
1a39ac9243
- forgot to save this before committing...
2014-12-25 19:56:38 +01:00
Christoph Oelckers
6fd70ff320
- fixed: Trying to rotate a polyobject into its actual position during loading of a savegame still inflicted damage on all touching actors - including incomplete player pawns - and also got blocked by them.
...
Similar code already existed for the MovePolyobj function but apparently was overlooked here.
2014-12-25 18:46:50 +01:00
Christoph Oelckers
ffa069205f
- fixed: For fullbright sprites, a weapon's extra light must be ignored because it can be negative.
2014-12-25 18:30:34 +01:00
MajorCooke
f2551dceda
- Corrected the species checking.
2014-12-24 17:49:58 -06:00
ChillyDoom
7d628a8c03
- Fixed: FCajunMaster::End() was missing a bot check.
2014-12-24 19:41:49 +00:00
Christoph Oelckers
23009bddb5
Merge branch 'hotfix2' of https://github.com/MajorCooke/zdoom
2014-12-24 10:46:52 +01:00
Christoph Oelckers
4384811745
Merge branch 'NetFix' of https://github.com/ChillyDoom/zdoom
2014-12-24 10:45:38 +01:00
MajorCooke
62a4945ca4
- Fixed: CAUSEPAIN didn't work with A_Explode calls featuring no damage.
2014-12-23 23:30:00 -06:00
Randy Heit
3fb9e754f1
Rename 'Pick' to 'RandomPick'
...
... because 'pick' is way too generic a name to spend a keyword on.
2014-12-23 21:46:27 -06:00
rheit
bfb94f13d2
Merge pull request #198 from MajorCooke/filters
...
- Added name filtering to all A_Damage/Kill/Remove functions.
2014-12-23 21:42:31 -06:00
rheit
39adff5e9e
Merge pull request #200 from ChillyDoom/BotFixes
...
Bot fixes
2014-12-23 21:34:57 -06:00
Randy Heit
5caadeba4c
Use a null check instead of strlen in ShoveChatStr
2014-12-23 21:33:47 -06:00
Randy Heit
d3272f75e7
Merge branch 'chat-len-fix' of git://github.com/Edward850/zdoom into Edward850-chat-len-fix
2014-12-23 21:31:53 -06:00
Randy Heit
d7d022144e
Call A_Face() directly from A_CustomBullletAttack
2014-12-23 21:30:24 -06:00
Randy Heit
c13f1551e6
Merge branch 'custommissileptr' of git://github.com/MajorCooke/zdoom into MajorCooke-custommissileptr
2014-12-23 21:27:05 -06:00
rheit
0bd331b34b
Merge pull request #203 from Edward850/ps-disconnect
...
Allow players to be popped in packet-server
2014-12-23 21:19:17 -06:00
Edward Richardson
dfa6a44402
Ignore 0 length chat messages
...
- There is no reason to send empty messages, and they just produced
strange output anyway
2014-12-23 22:38:12 +13:00
Edward Richardson
b24f173d03
Allow players to be popped in packet-server
2014-12-23 22:20:39 +13:00
alexey.lysiuk
bf2a6dbc05
Merge branch 'z_osx_pure' into cocoa_no_sdl
2014-12-23 07:15:12 +02:00
ChillyDoom
f7405a1d24
- Changed two loops from using doomcom.numnodes back to MAXPLAYERS as nodeingame[i] is not necessarily the same as playeringame[playerfornode[i]].
2014-12-22 20:48:27 +00:00
Braden Obrzut
d4bac5776a
Merge branch 'SDL2'
2014-12-22 15:25:22 -05:00
Randy Heit
2b323d01ed
Reorder pick parsing to require one parameter.
...
- This function is pointless without any parameters, so don't allow that.
2014-12-21 21:22:14 -06:00
ChillyDoom
aebf0e7526
- Fixed: Adding multiple bots at the same time could cause the game to crash if there were too few bots defined.
...
- The 'loaded_bots' variable no longer needs to be stored.
2014-12-21 19:21:51 +00:00
MajorCooke
91bfe4cceb
- Added pointers for A_CustomMissile and A_CustomBulletAttack.
2014-12-21 12:29:19 -06:00
MajorCooke
2c7a3f2eba
- Optimized DoDamage and DoKill.
...
- Do a filter and species check first to save time.
- Added DMSS/KILS/RMVF_EITHER, which means if the actor is of type or species, it counts.
- A_DamageTarget(20,"Normal",DMSS_EITHER,"DoomImp","CyberdemonSpecies")
- This affects actor DoomImp, and anything that's of species CyberdemonSpecies.
- Added a little more documentation via comments.
2014-12-21 10:38:51 -06:00
MajorCooke
5a472e815b
- Added species checking.
...
- Added two more flags for each of the functions, EXFILTER and EXSPECIES.
- Stands for "exclude filter/species" and makes the function not take them into account.
- Cleaned up the code and placed all the checking in their own subfunctions.
2014-12-21 09:31:24 -06:00
Christoph Oelckers
58a3b86813
Merge branch 'master' of https://github.com/rheit/zdoom
2014-12-21 13:49:23 +01:00
alexey.lysiuk
18c7709007
Cleanup video part of native OS X backend, phase 4
2014-12-21 12:35:43 +02:00
MajorCooke
c168761eda
- Couple additional fixes:
...
- The wiki said the minimum distance to teleport defaults to 0, actor.txt on the other hand said otherwise. I was wondering why it was still broken somewhat...
- Prevent stickiness from happening, a.k.a. getting stuck in ceiling or floor and letting the engine unstick the actor. This caused velocity loss.
2014-12-20 22:51:43 -06:00
Randy Heit
549ba3d817
Merge branch 'master' of github.com:rheit/zdoom
2014-12-20 19:20:19 -06:00
MajorCooke
e5a41a1358
- Added name filtering to all A_Damage/Kill/Remove functions.
...
- A_DamageChildren(20,"Normal",0,"DoomImp") for example will only target actors of DoomImp specifically.
2014-12-20 16:57:00 -06:00
Blue-Shadow
9446edc068
Fixed a case of an undeclared variable with A_Saw.
2014-12-21 01:10:54 +03:00
alexey.lysiuk
ebc0916bc6
Cleanup video part of native OS X backend, phase 3
2014-12-20 17:20:45 +02:00
Christoph Oelckers
2a53ebb6b9
- fixed state checking in A_Teleport.
2014-12-20 14:48:22 +01:00
alexey.lysiuk
797cf624df
Cleanup video part of native OS X backend, phase 2
2014-12-20 15:03:36 +02:00
alexey.lysiuk
41c949f8ac
Cleanup video part of native OS X backend, phase 1
2014-12-20 13:18:47 +02:00
Christoph Oelckers
48b65f3c76
Merge branch 'osx_x360_gamepad' of https://github.com/alexey-lysiuk/gzdoom
2014-12-20 11:43:36 +01:00
Christoph Oelckers
3ecc5d494f
Merge branch 'hitbounce' of https://github.com/MajorCooke/zdoom
2014-12-20 11:38:47 +01:00
Christoph Oelckers
a19f0219c5
Merge branch 'master' of https://github.com/Blue-Shadow/zdoom
2014-12-20 11:36:10 +01:00
alexey.lysiuk
08cd03dbb7
Fixed hanging on startup in native OS X backend when Xbox 360 gamepad is connected
...
Apple's HID Utilities has a issue with device elements enumeration while using unofficial drivers from here:
http://tattiebogle.net/index.php/ProjectRoot/Xbox360Controller/OsxDriver
2014-12-20 11:49:19 +02:00
MajorCooke
31ad642843
- HITTARGET, HITMASTER and HITTRACER now apply to actors that bounce off of other actors.
2014-12-19 13:43:24 -06:00
MajorCooke
86b0065c0b
- Added a multitude of flags for A_Teleport.
...
- TF_KEEPVELOCITY: Keep the velocity after teleporting.
- TF_KEEPANGLE: Don't use the special spot's angle.
- TF_USESPOTZ: Normally, this function
- TF_NOSRCFOG: Don't leave fog at the previous location.
- TF_NODESTFOG: Don't leave fog at the arriving location.
- TF_USEACTORFOG: Use the actor's TeleFogSourceType and TeleFogDestType properties.
- TF_NOJUMP: Don't require or cause a jump. In this case, put 0 (or "") in for the jump destination when using CustomInventory items to teleport actors around.
2014-12-19 12:37:02 -06:00
Christoph Oelckers
0bc2c0094a
- fixed: For cubemapped skies with one texture for all 4 sides the texture was never set before rendering.
2014-12-19 16:35:34 +01:00
MajorCooke
7bc2e5c67e
- Tiny fix to ACS.
2014-12-19 06:21:37 -06:00
Blue-Shadow
a150e0686c
Added 'lifestealmax' parameter and STEALARMOR flag to A_Saw and A_CustomPunch.
2014-12-18 23:05:59 +03:00
MajorCooke
2747f9a9f3
- Make ACS SetTeleFog follow the same format as the DECORATE version too.
2014-12-18 09:29:23 -06:00
MajorCooke
ba346616e5
- Fixed: ACS version of SetTeleFog and SwapTeleFog targeted the caller despite TID.
2014-12-18 09:24:35 -06:00
MajorCooke
dcab57b236
- Allow NULL.
...
- Instead of reverting the teleport fog back to defaults, if there wasn't a class or if the class failed to be found, set it to NULL.
- P_SpawnTeleportFog will not spawn anything if it's NULL.
- Added "" so it can be used to mean 'don't change anything' for A_SetTeleFog.
2014-12-18 09:19:39 -06:00
alexey.lysiuk
1433bf3f78
Put all non-Windows source code into posix directory and its subdirectories
2014-12-18 11:52:29 +02:00
MajorCooke
753eae4b68
- Went one up too high on the save count.
2014-12-17 21:51:47 -06:00
MajorCooke
93ca8502dd
- Rewrote a bunch of things for stability.
2014-12-17 21:47:00 -06:00
MajorCooke
160ded99a9
- A few more checks to be safe.
2014-12-17 17:42:16 -06:00
MajorCooke
6f7c9f1f34
- Small adjustment for parameters here too.
2014-12-17 17:22:47 -06:00
MajorCooke
dd3d7789d5
- Always allow replacement.
2014-12-17 17:16:56 -06:00
MajorCooke
b255e5d67d
- Thought I was forgetting something.
2014-12-17 17:12:33 -06:00
MajorCooke
30acb72006
- Added per-actor teleport fog modifications.
...
- New properties include TeleFogSourceType and TeleFogDestType.
- TeleFogSourceType is the fog left behind where the actor teleported away from.
- TeleFogDestType is the fog the actor sees when it arrives at its destination.
- Added A_SetTeleFog(<oldpos>,<newpos>) -- oldpos sets TeleFogSourceType, newpos sets TeleFogDestType.
2014-12-17 16:11:07 -06:00
alexey.lysiuk
84b12d23b5
Native OS X backend no longer requires SDL
2014-12-16 23:20:54 +02:00
alexey.lysiuk
3c76e5689a
Fixed path to SDL specific Obj-C++ file
2014-12-16 23:20:14 +02:00
alexey.lysiuk
9f01384bc5
No more SDL dependency in native OS X backend
2014-12-16 22:58:39 +02:00
alexey.lysiuk
7d231c3008
Removed unnecessary SDL #include's
2014-12-16 22:56:09 +02:00
alexey.lysiuk
b9d83e88c9
Added missing #include
2014-12-16 22:46:24 +02:00
MajorCooke
24f1bfae99
- Need to set it on the puff itself, not the defaults.
2014-12-16 12:48:52 -06:00
MajorCooke
fc05a3bb2f
- Added HIT* flag detection for bullet and rail attacks.
2014-12-16 12:37:31 -06:00
Christoph Oelckers
4f00aa3957
Merge branch 'master' of https://github.com/rheit/zdoom
2014-12-16 17:38:37 +01:00
alexey.lysiuk
83c8f44cc4
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_pure
2014-12-16 10:25:34 +02: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
alexey.lysiuk
8bc890c995
Rearranged files to avoid usage of symbolic links
2014-12-15 17:40:30 +02:00
alexey.lysiuk
ce70a7c66e
Video part of native OS X backend as a copy-paste of SDL one
...
Dependency from SDL still exists, pending major refactoring
2014-12-14 17:08:47 +02:00
alexey.lysiuk
9d135a0586
Get rid of SDL in more parts of native OS X backend
2014-12-14 16:28:31 +02: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
alexey.lysiuk
8d16c2e3c0
OS X native backend no longer use files from src/sdl directly
...
Cocoa backend is compiling but failed to link
Some files are referenced using symbolic links
Apple's HID Utilities were moved to own directory
2014-12-14 11:57:08 +02: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
alexey.lysiuk
9837721d7f
Added several missing video resolutions
...
All feasible display dimensions are in the list except with 21:9 aspect ratio
2014-12-13 12:32:29 +02:00
alexey.lysiuk
6241f047a8
Removed no longer used SDL wrapper functions from OS X native backend
2014-12-13 12:32:20 +02: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
Braden Obrzut
da8f2185d8
- Adapt SDL2 changes for the Mac (both using SDL2 backend and Cocoa).
2014-12-11 16:54:38 -05:00
Braden Obrzut
965d602d26
- Improve letterboxing in fullscreen by taking into account animorphic ratio settings.
...
- Added more resolutions to the hard coded table (up to 5K).
- Since we're using scaling for fullscreen, we should probably just use the hard coded table for fullscreen resolutions as well.
- Fixed: Resolution menu used fake aspect ratio to determine which aspect to file a resolution under.
- Added a way to use SDL surface blitting instead of accelerated textures.
2014-12-11 01:35:27 -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
Braden Obrzut
a7b33a8ce3
- Removed XCursor code since SDL2 has proper color cursor support.
...
- Improved international keyboard support by falling back to scan codes if we don't recognize a keycode.
- Clear out any residual mouse movement when entering relative mouse mode.
2014-12-10 01:53:22 -05: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
Braden Obrzut
4aef696007
- Enabled vid_vsync for SDL2 although just turning it on doesn't perform right.
...
- Improved fullscreen a bit.
2014-12-08 22:47:40 -05:00
Braden Obrzut
d625caf03c
- Ported SDL backend to SDL 2.0. Still needs a little bit of polish, but it works.
2014-12-08 18:46:10 -05: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
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
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
Christoph Oelckers
b6ccc79ca3
Merge branch 'fixes' of https://github.com/MajorCooke/zdoom
...
Conflicts:
src/p_interaction.cpp
2014-11-25 16:32:42 +01:00
Christoph Oelckers
7f8c0b4f64
Merge branch 'ACS_check' of https://github.com/Edward850/zdoom
2014-11-25 16:29:02 +01:00
Christoph Oelckers
64d88166cc
Merge branch 'APROP_DamageMultiply' of https://github.com/Edward850/zdoom
2014-11-25 16:28:36 +01:00
Christoph Oelckers
5ae5d2e7eb
Merge branch 'master' of https://github.com/rheit/zdoom
2014-11-25 16:14:49 +01:00
Christoph Oelckers
ad5c5af6f2
Merge branch 'BotThinker' of https://github.com/ChillyDoom/zdoom
2014-11-25 16:13:10 +01:00
Braden Obrzut
46eb5ce265
- Move cursor variables again due to shared code with Cocoa and SDL backends.
2014-11-24 23:26:38 -05:00
Braden Obrzut
0123279a1f
- Work around an i386 specific optimizer bug in Apple's GCC 4.2 (GCC 4.0 has worse bugs).
...
- Fixed: zdoom-info.plist used some non-existant/wrong variables.
2014-11-24 22:22:29 -05:00
MajorCooke
7e579a0a2a
- Fixed: Godmode didn't stop ALLOW/CAUSE/FORCEPAIN because the code execution always ended prematurely.
...
- Optimized checks for fake pain and forced pain. Fake pain now calls a subfunction so the code is cleaner.
2014-11-24 18:30:17 -06:00
Braden Obrzut
eacb9aa105
- Fixed more non-OSX issues.
2014-11-24 19:18:07 -05:00
alexey.lysiuk
877bfcd328
Cleaned up support for older OS X SDKs
2014-11-23 22:18:41 +02:00
alexey.lysiuk
b4ff34dae5
Use recently added OS version detection to check for HID Manager API availability
2014-11-23 12:48:05 +02:00
alexey.lysiuk
e9b24a10a1
OS version detection without deprecated API
2014-11-23 12:47:04 +02:00
khokh2001
5ed70d97a6
New OPL3 emulator.
2014-11-23 02:18:40 +09:00
khokh2001
88f4305e7e
new opl3 emulator
2014-11-23 00:39:26 +09:00
khokh2001
e9075334a3
new opl3 emulator
2014-11-23 00:36:22 +09:00
alexey.lysiuk
3e1bb9017b
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-11-22 12:09:50 +02:00
Edward Richardson
c494063eb9
Forgot version bump
2014-11-21 17:53:33 +13:00
Edward Richardson
3437f4fcab
Check ACS module size in saved games
2014-11-21 17:49:57 +13:00
Edward Richardson
e303833e5f
Inventory damage needs multiplying first
2014-11-20 22:12:16 +13:00
Edward Richardson
99b2cfa147
Added APROP_DamageMultiply
...
- Used with Set/GetActorProperty, adds a generic multiplier for damage a
source deals.
2014-11-20 18:57:40 +13:00
Christoph Oelckers
52acaa07a2
Merge branch 'master' of https://github.com/rheit/zdoom
2014-11-19 00:40:54 +01:00
Braden Obrzut
601852d224
- Fixed: fixrtext isn't needed with Win64 builds.
2014-11-17 21:56:16 -05:00
alexey.lysiuk
64e34d883b
Fixed build on UNIX systems other than OS X
2014-11-17 14:54:46 +02:00
alexey.lysiuk
1bda54f3cd
Fixed a few endian issues in ACS system
...
KDiZD Intro, a.k.a. Title Map, is now played correctly; camera on Z1M1 is functional
2014-11-16 13:15:56 +02:00
Edoardo Prezioso
4b2af7074e
- Improve the 64 bit incompatibility patch.
...
- Reorder the operands. First the numerator, then the denominator :) .
- Add a comment regarding the motivations for this change.
2014-11-16 11:29:16 +01:00
alexey.lysiuk
fd85e116e5
Fixed another potential crash in word expansion API
...
Calling wordfree() may lead to a crash when wordexp_t instance is not zero-initialized
This happened usually on older OS X like 10.5 or 10.6
2014-11-16 10:29:03 +02:00
alexey.lysiuk
93a732f0ca
Fixed empty application menu on 10.5 and earlier
2014-11-16 10:25:25 +02:00
Christoph Oelckers
a7f4185981
- now that we don't have to care anymore about SVN-related merging problems, let's save the 3 global variables of the GL renderer unconditionally, even if the software renderer is running.
2014-11-16 09:08:47 +01:00
Christoph Oelckers
c25325efa4
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
wadsrc/static/compatibility.txt
2014-11-16 09:02:17 +01:00
alexey.lysiuk
bcdf22b910
Fixed potential crash in word expansion API
...
10.5.8 PPC crashed 100%, some versions of 10.6 i386 were affected too
2014-11-16 09:30:57 +02:00
Edward Richardson
9ccb839ae2
Fix slope inconsistency for 64bit
...
- Fixed: Slope logic would change between 32bit and 64bit due to float
math.
2014-11-16 16:23:15 +13:00
alexey.lysiuk
bccfdaacf7
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-11-15 22:17:41 +02:00
alexey.lysiuk
65ce06f274
Added ability to run without application bundle
...
You just need executable, zdoom.pk3 and IWAD
2014-11-15 19:11:01 +02:00
alexey.lysiuk
398b36064b
Added usage of OpenGL client storage extension
...
This improves performance significantly of 10.4
2014-11-15 17:27:23 +02:00
alexey.lysiuk
cc8d8928ae
Removed explicit set of activation policy for application
...
Bundle is used anyway but this method requires 10.6 or higher
2014-11-15 17:07:27 +02:00
Edward Richardson
92143f90fa
Yet another pointer
2014-11-16 02:59:37 +13:00
Edward Richardson
2d5cbe1d8b
Missed a save
2014-11-16 02:44:17 +13:00
Edward Richardson
21e7beb21b
Fixed missing NULL pointer checks
2014-11-16 02:39:16 +13:00
alexey.lysiuk
06764c6aae
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-11-15 13:35:29 +02:00
alexey.lysiuk
b63bd56da8
Removed .xib file and, therefore, dependency from ibtool
...
Menu is now created in code
2014-11-15 13:32:37 +02:00
alexey.lysiuk
4b5d7361cd
Fixed exiting when window is closed by clicking close button
...
This happened on 10.6 and later when fullscreen mode was used before windowed
2014-11-15 11:47:05 +02:00
ChillyDoom
e38aee070c
- Changed TThinkerIterator loops back to MAXPLAYERS loops.
...
- Added STAT_BOT.
2014-11-15 08:58:29 +00:00
Christoph Oelckers
23bb12b0b8
Merge branch 'cpf_noturn' of https://github.com/edward-san/zdoom
2014-11-15 08:58:36 +01:00
ChillyDoom
ee977f94d7
- Moved bot thinking logic into DBot.
2014-11-14 16:54:56 +00:00
Edoardo Prezioso
fd354dbe9a
- Added CPF_NOTURN flag for A_CustomPunch.
2014-11-14 12:18:46 +01:00
alexey.lysiuk
9e4a262c87
Enabled building with SDK 10.4
...
Game controllers support will disabled in this case
2014-11-12 23:03:59 +02:00
MajorCooke
b54b18c8c5
-Added: CAUSEPAIN. Actors which deal damage (even if 0) while having this flag can cause other actors to trigger pain chances.
...
-Fixed: ALLOWPAIN should not trigger pain states if the damage is 0, but still allow for infighting to occur.
-Fixed: an unneeded logic call was processing damage modification when it was 0 to begin with.
2014-11-12 14:08:26 -06:00
alexey.lysiuk
d53e860d28
Moved supported by OS features checks to runtime
...
No more compile time checks via preprocessor macro definitions
This introduces dependency from Carbon framework, see SetSystemUIMode() function. It's available in 64-bit, and so, it's not deprecated
2014-11-10 22:59:40 +02:00
alexey.lysiuk
936ee41e41
Removed executable permission from HID Utilities source files
2014-11-10 22:37:53 +02:00
Edward Richardson
ad33afb8c1
Added text showing who paused a game in multiplayer
2014-11-11 02:19:24 +13:00
Edward Richardson
16e0f79fd7
Fix alt-tabbed desync with demos
...
- Fixed: Stop the game timer if the window looses focus
2014-11-11 02:18:52 +13:00
Edward Richardson
b08fcbf6b3
Added compat profile for TNT MAP31
2014-11-10 18:37:14 +13:00
alexey.lysiuk
a37459af2c
Removed all code to support compilation using 10.4 SDK
...
10.5 is minimum version of OS X SDK to build. Deployment target can be 10.4 though
This reverts significant part of d061adf
2014-11-09 18:00:36 +02:00
alexey.lysiuk
c024b30e9d
Availability of game controller API is now determined on runtime
2014-11-09 17:13:03 +02:00
alexey.lysiuk
660ebf2c6c
Added auto-release pools to decrease memory fragmentation on older OS X like 10.5 or 10.6
2014-11-09 16:53:25 +02:00
alexey.lysiuk
70bb80e2bf
Removed OS X version check
...
It didn't work correctly and .plist should set minimum OS version to run on
2014-11-09 16:49:26 +02:00
alexey.lysiuk
a40eb3443b
Fixed infinite recursion when setting window style on OS X 10.6 or newer
2014-11-09 15:34:04 +02:00
alexey.lysiuk
fa1d62ffbf
Fixed random junk that may appear in transparency (alpha) channel of mouse cursor image
2014-11-09 15:23:34 +02:00