zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-14 22:41:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
4622 commits 86 branches 139 tags 124 MiB
Commit graph

4180 commits

Author SHA1 Message Date
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
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
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
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
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
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