Christoph Oelckers
c57cc91d7c
- cleaned up the RipLevel logic a bit to be less confusing.
2014-12-31 10:13:15 +01:00
MajorCooke
4ddfd0f46a
- Added 3 new properties and 3 functions to control them.
...
- Rippers will rip through anything with an equivalent ripper level, or if their level is between or on the min and max ranges.
- If no min or max is defined, it simply checks if the monster's ripper level is lower than the missiles.
- Functions: A_SetRipperLevel(int level), A_SetRipMin(int min), A_SetRipMax(int max)
- Properties: RipperLevel, RipLevelMin, and RipLevelMax.
- RipperLevel: Applicable to monsters and projectiles.
- RipLevelMin and RipLevelMax are only useful on monsters.
- By default, all are 0.
2014-12-30 19:59:31 -06:00
Christoph Oelckers
315827015c
- made aspect ratio correction factor configurable through MAPINFO.
2014-12-29 23:52:20 +01:00
Christoph Oelckers
45cf65afbd
- moved the aspect ratio correction factor from the projection to the view matrix where it should have been from the start.
...
- removed the mCameraPos variable in FGLRenderer because it was only used in one place where it is just as easy to use the global viewx/y/z variables directly.
2014-12-29 22:42:19 +01:00
alexey.lysiuk
68dbd56eab
Small cleanup in i_video.mm
2014-12-29 18:03:36 +02:00
Christoph Oelckers
045725de15
- use strncpy instead of sprintf tp init static char array to ensure that all elements get initialized.
2014-12-29 16:35:30 +01:00
alexey.lysiuk
5c88364300
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_refactor
2014-12-29 12:17:14 +02:00
alexey.lysiuk
1c102ef9c9
Internals of native OS X backend event processing are no longer exposed
2014-12-29 12:16:17 +02:00
alexey.lysiuk
21d557ee11
Further cleanup of i_main.mm
2014-12-29 12:10:18 +02:00
alexey.lysiuk
e3f92db395
Custom cursor in OS native backend without global variable
2014-12-29 11:34:57 +02:00
alexey.lysiuk
51afe8a541
Removed explicit release of window in Cocoa IVideo implementation
...
It caused a crash on older OS X like 10.5 and it absence doesn't lead to a memory leak
2014-12-29 10:29:16 +02:00
Christoph Oelckers
b5d0c5c357
- fixed: When a player drops his inventory, the dropped weapons must be checked for their class to ensure that they are not DehackedPickups which cannot be modified as intended.
2014-12-28 22:15:12 +01:00
alexey.lysiuk
4662069b94
Fixed compilation issues with GCC 4.2
2014-12-28 17:11:30 +02:00
alexey.lysiuk
a67dc4148b
Split implementation of native OS X backend into several files
2014-12-28 16:35:00 +02:00
alexey.lysiuk
40d4dc502e
Added comprehensive video modes iteration
...
Added letterboxing status for fullscreen modes
Brought back vid_listmodes console command
2014-12-28 12:48:08 +02:00
alexey.lysiuk
b66c712446
Moved out video handling from application controller
2014-12-28 11:58:21 +02:00
MajorCooke
519ff8b7d1
- HITTARGET/MASTER/TRACER now set the puff's pointer(s) within P_SpawnPuff.
...
- PUFFGETSOWNER, for the sake of compatibility, maintains override for target.
2014-12-27 14:15:54 -06:00
Christoph Oelckers
6f994cb3e7
Merge branch 'reflectfix' of https://github.com/MajorCooke/zdoom
2014-12-27 20:07:03 +01:00
MajorCooke
fdf2d6c493
- Cleaned up some of the reflective code.
...
- Added null checks to AIMREFLECT.
- The missile being reflected now corrects the z velocity to perfectly reflect towards the actor's middle.
2014-12-27 12:47:48 -06:00
Christoph Oelckers
5c658e98ec
Merge branch 'master' of https://github.com/rheit/zdoom
2014-12-27 19:20:12 +01:00
Christoph Oelckers
cef8ae5632
- fixed: The A_BossDeath code in P_MorphedDeath was missing a NULL pointer check.
2014-12-27 19:19:15 +01:00
alexey.lysiuk
d43b201de9
Yet another code beautification
2014-12-27 18:13:47 +02:00
alexey.lysiuk
613c3293ce
Further cleanup of native OS X backend video part
2014-12-27 17:47:21 +02:00
alexey.lysiuk
16965eb78a
Removed vid_listmodes console command from native OS X backend
...
There is a hard-coded set of resolutions independent from the hardware
2014-12-27 17:47:12 +02:00
alexey.lysiuk
8b6966dd36
Got rid of SDL emulation's last remnants in native OS X backend
2014-12-27 15:56:46 +02:00
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
alexey.lysiuk
fc8f260375
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-11-09 15:22:11 +02:00
Christoph Oelckers
62d72fb751
Merge branch 'master' of https://github.com/rheit/zdoom
2014-11-09 12:22:49 +01:00
Christoph Oelckers
5e6c375974
Merge branch 'DLevelScript-stack-fix' of https://github.com/Edward850/zdoom
2014-11-09 12:20:54 +01:00
Christoph Oelckers
22b5d0af8a
Merge branch 'hotfix' of https://github.com/MajorCooke/zdoom
2014-11-09 12:13:13 +01:00
Christoph Oelckers
d273cb414f
Merge branch 'BotNet' of https://github.com/ChillyDoom/zdoom
2014-11-09 12:12:51 +01:00
Christoph Oelckers
2ffff5763b
Merge branch 'empty_st_funcs' of https://github.com/edward-san/zdoom
2014-11-09 12:12:35 +01:00
Christoph Oelckers
d64a4a17ff
- fixed: PRINT_LOG no longer worked since replacing the console buffer.
2014-11-09 12:11:58 +01:00
Christoph Oelckers
b0a6c94fa4
- fixed: the translucency flag for the flags renderer was inconsistent between the light pass and the render pass on GL 3.x hardware, resulting in bad buffer indices being sent to the shader.
2014-11-09 12:10:33 +01:00
alexey.lysiuk
a5993c4e2d
Disabled usage of IOKit's HID Manager API on OS X prior to 10.5
...
Source code only, CMake needs to be updated too
2014-11-09 11:59:29 +02:00
Edward Richardson
5170abfeed
DACSThinker can exist with no scripts
2014-11-09 22:57:14 +13:00
alexey.lysiuk
d061adfbd6
Fixed all compilation issues with 10.4 SDK except for HID Utilities
2014-11-09 11:18:20 +02:00
Edward Richardson
e3640b5bf5
Stop DLevelScript from recursively Serializing
2014-11-09 21:06:50 +13:00
MajorCooke
87207bdb6d
- Fixed: The mask didn't incorporate RGF_MISSILES, causing it to fail.
2014-11-09 00:16:10 -06:00
Edoardo Prezioso
8b85e6d00b
- Port an empty version of 'A_FaceConsolePlayer'.
...
Hissies will be happy now.
2014-11-08 18:49:16 +01:00
ChillyDoom
8532b52ffb
- Bots are no longer removed when the net arbitrator disconnects.
2014-11-08 17:38:56 +00:00
ChillyDoom
a613da43dd
- Bot movement is now calculated locally.
2014-11-08 17:38:09 +00:00
alexey.lysiuk
d2d6d2a7f8
Lowered minimum OS requirement to 10.5 Leopard
2014-11-08 13:30:41 +02:00
alexey.lysiuk
f0f0f2a24d
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-11-08 10:42:44 +02:00
Christoph Oelckers
48fbab819b
Merge branch 'master' of https://github.com/rheit/zdoom
2014-11-08 09:40:17 +01:00
Christoph Oelckers
c28c0b8f0b
Revert "Backport 'A_FaceConsolePlayer' from zandronum."
...
This reverts commit eab971500b
.
As Edward850 pointed out, this feature is broken by design and therefore completely useless.
2014-11-08 08:53:32 +01:00
Edoardo Prezioso
eab971500b
Backport 'A_FaceConsolePlayer' from zandronum.
...
By Dusk, who authorized me to do this.
2014-11-08 00:31:16 +01:00
MajorCooke
71ce4bcf06
- Fixed: Rail attacks didn't properly respect FOILINVUL.
...
- Added: FOILBUDDHA support for rail attacks.
2014-11-05 23:16:01 -06:00
MajorCooke
95bd6bde9a
- Added FOILBUDDHA check for A_BFGSpray.
2014-11-05 23:06:28 -06:00
MajorCooke
c63adf920a
- Fixed: BUDDHA flag on a player wasn't considered.
2014-11-05 22:05:21 -06:00
Christoph Oelckers
88ff33c26e
Merge branch 'fix_acs_big_endian' of https://github.com/alexey-lysiuk/gzdoom
2014-11-02 17:30:48 +01:00
Christoph Oelckers
32cd4eb7c6
Merge branch 'LerpAdjustments' of https://github.com/Edward850/zdoom
2014-11-02 17:30:41 +01:00
alexey.lysiuk
eb98a999b2
Fixed color channels displacement on Big Endian targets, take two :(
2014-11-02 16:18:28 +02:00
alexey.lysiuk
63eedf9e26
Merge branch 'fix_acs_big_endian' into z_osx_clean
2014-11-02 16:01:18 +02:00
alexey.lysiuk
1074a031a2
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-11-02 16:00:53 +02:00
alexey.lysiuk
8f915c9dcc
Fixed broken ACS on Big Endian platforms
...
This fixes maps transition in Strife
http://forum.zdoom.org/viewtopic.php?f=2&t=36754
2014-11-02 15:58:47 +02:00
alexey.lysiuk
c0ec1d5114
Fixed color channels displacement on Big Endian targets
2014-11-02 15:56:22 +02:00
alexey.lysiuk
2f59a8792a
Use rectangle texture for render buffer
...
Game is rendered correctly even if hardware doesn't support non-power of two textures
The ARB_texture_rectangle extension is supported on almost all Macs running 10.4 Tiger
2014-11-02 15:50:43 +02:00
alexey.lysiuk
d8be168474
Set opaque clear color
2014-11-02 11:32:09 +02:00
alexey.lysiuk
0569acd5d6
Fixed compilation issues with GCC 4.0.1 PowerPC
2014-11-02 11:29:02 +02:00
Edward Richardson
043b28f4ba
Make Prediction lerping less pick + debug
...
- Lerping uses int rather than fixed/float comparisons
- Added debug information
2014-11-02 17:58:59 +13:00
Christoph Oelckers
147e05673d
Merge branch 'recordmap' of https://github.com/Edward850/zdoom
2014-11-01 17:43:59 +01:00
Christoph Oelckers
4c470ba5c1
Merge branch 'allowpain' of https://github.com/MajorCooke/zdoom
2014-11-01 17:43:39 +01:00
MajorCooke
2e085b2318
- Added ALLOWPAIN flag.
...
Monsters with this flag can enter pain states, regardless of
invulnerability or damage absorption.
- Fixed: god2 cheat wasn't being considered for drowning and thrusting.
2014-11-01 00:00:29 -05:00
Edward Richardson
eceb37aa64
Added recordmap for recording demos from console
...
recordmap <filename> <map name>
Starts a new game from the specified map recording to the specified
filename
2014-11-01 17:47:29 +13:00
MajorCooke
938b54ccb5
- Added TF_FORCED for A_Teleport. Forces the actor to move to the spot.
2014-10-31 15:51:15 -05:00
Christoph Oelckers
0ff65bb430
- fixed: AActor::Massacre must return true only when it actually kills a monster.
2014-10-31 21:08:13 +01:00
Christoph Oelckers
388454255d
Merge branch 'Secret-notify' of https://github.com/Edward850/zdoom
2014-10-31 11:29:25 +01:00
Edward Richardson
c85105f552
Added cl_showsecretmessage
...
Controls if secret notifications are displayed (def. true)
2014-10-31 22:50:23 +13:00
Christoph Oelckers
2f11a59be0
- fixed: UDMF ceiling plane properties set the map's floor plane values.
2014-10-31 08:57:43 +01:00
Christoph Oelckers
1a8da51857
Merge branch 'master' of https://github.com/rheit/zdoom
2014-10-29 22:53:58 +01:00
Christoph Oelckers
31611c17d5
- fixed RGF_NOSIGHT checking for A_RadiusGive.
2014-10-29 22:00:15 +01:00
Christoph Oelckers
301092217f
Merge branch 'experimental' of https://github.com/MajorCooke/zdoom
2014-10-29 20:12:01 +01:00
MajorCooke
165d2887fd
- Added: A_GiveToChildren
...
- Added: A_TakeFromChildren
- Added: A_GiveToSiblings
- Added: A_TakeFromSiblings
- Added the following flags for A_RadiusGive:
- RGF_NOSIGHT: Exclude sight check from distance.
- RGF_MISSILES: Missiles can take inventory items.
2014-10-29 14:01:31 -05:00
MajorCooke
5977cb04d9
- Fixed: A_Die didn't consider missiles for the function.
2014-10-29 12:33:25 -05:00
Christoph Oelckers
c1a0ee9623
- fixed last commit.
2014-10-29 10:40:08 +01:00
Christoph Oelckers
978667143c
- fixed: P_RemoveThing must not remove owned inventory items.
2014-10-29 08:54:14 +01:00
Christoph Oelckers
3fe8dbf660
Merge branch 'master' of https://github.com/Gaerzi/zdoom
2014-10-28 22:10:28 +01:00
Gaerzi
65cb662678
Missing break in case NAME_FillColor
...
This caused weirdness with invulnerable monsters when their fillcolor was changed.
2014-10-28 21:19:01 +01:00
Christoph Oelckers
6073adbeef
- renamed FULLMASS to DONTTHRUST.
2014-10-28 08:40:34 +01:00
MajorCooke
774db445ec
-Fixed: WhirlWind was still able to affect actors with the FULLMASS flag.
2014-10-27 22:40:25 -05:00
MajorCooke
c01d1a8003
- Added DMSS_NOPROTECT.
...
Bypasses PowerProtection inventory items.
2014-10-27 22:29:10 -05:00
MajorCooke
f802d7a44c
- Added +FULLMASS.
...
Actors will be excluded from damage/radius thrusting of all sorts by
explosions or damage of any kind. They will also never deal impact
damage to other enemies, nor will they damage themselves from being too
close to a wall.
2014-10-27 21:35:55 -05:00
Christoph Oelckers
3e50db9bf0
- fixed: When setting the object color for a shaded decal, the alpha channel must be forced to be 255. The decal's AlphaColor contains the palette index in those bits.
2014-10-26 15:11:04 +01:00
Christoph Oelckers
3c7664a460
- we don't really need a bBrightmap in a texture. All it did was duplicate some functionality of bMasked.
...
- renamed bBrightmapDisablesFullbright flag.
2014-10-26 08:41:52 +01:00
Christoph Oelckers
bd811bea87
Merge branch 'master' of https://github.com/rheit/zdoom
2014-10-25 18:26:42 +02:00
Christoph Oelckers
be4b253215
- use a separate sound for the net notches on the startup screen.
2014-10-25 18:18:35 +02:00
Christoph Oelckers
ebbaf2f1b7
Merge branch 'OldPlayer-Fix' of https://github.com/Edward850/zdoom
2014-10-25 17:38:48 +02:00
Christoph Oelckers
b58595734d
- removed accidental line duplication.
2014-10-25 17:37:45 +02:00
Edward Richardson
82ac6c999e
Destroy old player mobjs when starting new games
2014-10-26 04:14:52 +13:00
Christoph Oelckers
85fae623c8
Merge branch 'BotSpawnFix' of https://github.com/ChillyDoom/zdoom
2014-10-25 16:50:17 +02:00
ChillyDoom
1b7c07df65
- Fixed: Bots added by different setting controllers could be assigned the same player number.
2014-10-25 14:58:10 +01:00
alexey.lysiuk
d1c4215fb5
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-10-25 16:57:58 +03:00
Christoph Oelckers
fc0025963b
Merge branch 'master' of https://github.com/rheit/zdoom
2014-10-25 15:11:29 +02:00
Christoph Oelckers
0124d41931
Merge branch 'Bloodtype' of https://github.com/Edward850/zdoom
2014-10-25 15:07:06 +02:00
Christoph Oelckers
d4c50b1662
- fixed: AActor::IsTeammate must consider monsters friendly to a specific player as members of the same team as the owning player. Such monsters cannot be made members of a designated team, though, because their association needs to change if the player changes teams.
2014-10-25 14:59:30 +02:00
Edward Richardson
9435cdc5c9
Fixed NULL refrence in P_SpawnBlood
2014-10-26 01:09:19 +13:00
Christoph Oelckers
2e1fa70cbf
- some parentheses to silence GCC.
2014-10-25 13:12:57 +02:00
Christoph Oelckers
ad2e16576c
- fixed_ P_ExplodeMissile skipped most of its logic when the missile got destroyed by having no death state.
...
Apparently a band-aid fix was applied to this function because AActor::Destroy could not be called on an already destroyed actor again which could happen here due to incorrect ordering of actions.
Moving the state change to a later point in this function - after hitting a sky has been checked and decals have been spawned - returns everything to a safe state and ensures that nothing gets skipped.
2014-10-25 13:10:38 +02:00
Christoph Oelckers
edd53f22a1
- fixed: The buddha powerup set the wrong flag.
2014-10-25 12:34:46 +02:00
Christoph Oelckers
dcc318fdee
- print a warning when a state label can't be found. Preferably this would be an error but the oversight had been in the engine for too long so nobody knows
2014-10-25 12:33:08 +02:00
Christoph Oelckers
ef5707d73b
- added a compatibility option for stopping sounds when the owning actor is destroyed.
2014-10-25 12:12:06 +02:00
Christoph Oelckers
fc40e9723a
- fixed: CHANGELEVEL_RESETINVENTORY may not change the player's health.
...
APlayerPawn::GiveDefaultInventory altered the player_t's health value which was ok as long as this function was only called from G_PlayerReborn. For all other cases this initialization was wrong and G_PlayerReborn should do this itself.
2014-10-25 11:51:29 +02:00
Christoph Oelckers
cfe97b0f0f
- Fixed: Killing a morphed monster must trigger A_BossDeath on its unmorphed self.
2014-10-25 11:33:28 +02:00
Christoph Oelckers
0d3908a4f3
- fixed: Hitscan traces crossing a two sided line right at the height of the back sector's floor or ceiling must not be considered a hit.
2014-10-25 10:44:00 +02:00
Christoph Oelckers
8edace83c5
- made CheatKey and EasyKey vector graphics configurable through MAPINFO.
2014-10-25 10:19:14 +02:00
Christoph Oelckers
313245dd77
- added a Buddha powerup
2014-10-25 09:53:23 +02:00
MajorCooke
a19620968d
- Follow-up of the previous commit.
...
- Cleaned up the DoDamage and DoKill functionality.
- Added DMSS_FOILBUDDHA and KILS_FOILBUDDHA.
2014-10-25 09:39:10 +02:00
MajorCooke
d1dc6fd59a
- Added: BUDDHA and FOILBUDDHA.
...
- Fixed: mugshot didn't take the god2 cheat into account.
2014-10-25 09:39:00 +02:00
MajorCooke
b980069367
- Added GOD2 and BUDDHA2 cheats.
...
- Ensures that not even telefrag damage can kill the player.
- Fixed: Players with NODAMAGE could still hurt and kill themselves via
voodoo dolls.
2014-10-25 09:38:40 +02:00
Christoph Oelckers
1c500cead6
- fixed: A_Respawn did not restore the flags6 and flags7 fields.
2014-10-25 01:27:34 +02:00
Christoph Oelckers
aa338a4dc6
- fixed: G_FinishTravel must synchronize the CF_FLY flag with MF2_FLY.
2014-10-25 01:00:40 +02:00
Christoph Oelckers
83be901ad6
- fixed: damage of amount TELEFRAG_DAMAGE should not be reduced by armors absorbing some damage, it'd lose its magic-ness, that is needed to ensure a guaranteed kill. The same applies to autousing health items.
2014-10-25 00:52:27 +02:00
Christoph Oelckers
5ac7e4fc38
- added HARMFRIENDS flag.
2014-10-25 00:30:36 +02:00
Christoph Oelckers
b6f4862024
- fixed: A_Warp didn't initialize oldx/y/z in all situations.
2014-10-25 00:05:52 +02:00
Christoph Oelckers
e81c404b04
- fixed some bad logic operations.
2014-10-25 00:01:04 +02:00
Christoph Oelckers
6f7b83faa1
- fixed: EV_DoFloor was a bit too selective about which movement types were allowed to crush. Changed so that the crush parameter is always used. Also changed all non-crushing calls to explicitly pass -1 as crush damage instead of relying on EV_DoFloor to ignore the passed value.
2014-10-24 23:12:38 +02:00
Christoph Oelckers
15b1c71257
- use proper CheckCheatMode semantics for throwing players out of chasecam mode if DF2_CHASECAM gets unset.
2014-10-24 23:02:02 +02:00
Christoph Oelckers
e662e4321a
- fixed: Creating an OPL MIDI device can fail if no GENMIDI lump is found, and an exception is thrown. We need to handle this exception to prevent an abort.
2014-10-24 22:56:10 +02:00
Christoph Oelckers
9402bcf6cd
- fixed: The targeter must reset its HUD sprites when being reactivated during the blinking phase.
2014-10-24 22:47:40 +02:00
Christoph Oelckers
5a91fd0ad4
- fixed: DMD models didn't load their triangle data.
...
- fixed: MD2 models didn't handle the triangles' byte order.
2014-10-24 13:03:26 +02:00
Christoph Oelckers
f8016bef86
- fixed: voxels didn't set their index count.
2014-10-24 11:52:45 +02:00
Christoph Oelckers
e5cd90f323
- use separate vertex buffers per model to avoid large memory usage peaks. Also delete the geometry data for the models once it has been copied into the vertex buffer.
2014-10-24 11:43:25 +02:00
John Palomo Jr
4496885366
Added Inventory.AlwaysRespawn flag.
2014-10-24 04:46:43 -04:00
Christoph Oelckers
bca47bb9bc
- removed debug code.
...
- fixed: planes that are created by splitting translucent 3D-floors may never be rendered.
2014-10-23 17:35:58 +02:00
Christoph Oelckers
f907de15b0
Merge branch 'master' of https://github.com/rheit/zdoom
2014-10-23 17:34:30 +02:00
Christoph Oelckers
d6a33a601d
- fixed: The sorting of 3D floors was incomplete and missed cases where translucent volumes overlapped non-translucent ones only at their top. It also didn't account for one translucent volume being intersected by more than solid one.
2014-10-23 17:33:42 +02:00
Christoph Oelckers
36b35e85f3
- fixed: overflow checks for dynamic light buffer were not correct.
2014-10-23 12:06:00 +02:00
Christoph Oelckers
066e53ae4c
- fixed: sprites rendered as 'bright' should not be affected by dynamic lights.
2014-10-23 10:54:26 +02:00
Christoph Oelckers
618c23303f
- fixed: The interpolation factor for models was never passed to the shader.
2014-10-23 09:57:27 +02:00
Christoph Oelckers
5302a10a7d
- diable software lighting for textured automap.
...
* since it is designed for software-style light diminishing it doesn't work for 2D.
* additionally it left the lighting state in an unsuitable setting for further 2D rendering.
2014-10-23 09:19:30 +02:00
Christoph Oelckers
111205a0f5
Merge branch 'master' of https://github.com/rheit/zdoom
2014-10-23 08:51:16 +02:00
Christoph Oelckers
89ce0b8cb7
- test if GLSL version 1.4 can handle uniform buffers on old Intel hardware without making problems...
2014-10-22 16:54:26 +02:00
ChillyDoom
acd4a71de2
- Fixed: New DBot instances were missing write barriers.
2014-10-21 19:33:48 +01:00
ChillyDoom
6166e83d28
- Fixed: Only setting controllers should be able to remove bots.
2014-10-21 19:32:15 +01:00
ChillyDoom
c9bc9b427c
- Removed p_leader.
2014-10-21 19:31:11 +01:00
Christoph Oelckers
fafb0a672c
Merge branch 'handshake-hotpatch' of https://github.com/Edward850/zdoom
2014-10-21 14:28:50 +02:00
Christoph Oelckers
ccbdcfea81
Merge branch 'master' of https://github.com/j-palomo/zdoom
2014-10-21 14:28:31 +02:00
Christoph Oelckers
09e0758507
Merge branch 'fix_cmake_unix' of https://github.com/alexey-lysiuk/gzdoom
2014-10-21 14:27:37 +02:00
Christoph Oelckers
20b740d5fc
Merge branch 'DBot' of https://github.com/ChillyDoom/zdoom
2014-10-21 14:20:01 +02:00
Edward Richardson
ed51083572
Change u_short as well.
2014-10-21 23:44:14 +13:00
Edward Richardson
759f1bb81b
Fix handshakes between GCC and MSVC
...
u_long has two different sizes between Linux GCC and MSVC
Stopped netgames from starting up if player count wont fit
2014-10-21 23:38:45 +13:00
John Palomo Jr
82255c4dfd
Using PickActor will only set the TID if the picked actor doesn't have a TID already. An optional 8th parameter (bool forceTID) was added to revert to the old behavior.
2014-10-19 20:52:48 -04:00
alexey.lysiuk
b2110db1f5
Extended list of display resolutions
2014-10-18 14:55:27 +03:00
alexey.lysiuk
949325df68
Merge branch 'fix_cmake_unix' into z_osx_clean
2014-10-18 12:36:09 +03:00
alexey.lysiuk
1715b25a3e
Fixed Unknown CMake command "CHECK_LIBRARY_EXISTS" error on Unix targets
...
Previously it worked somehow but not with CMake 3.0.2
2014-10-18 12:33:39 +03:00
alexey.lysiuk
c29772de25
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-10-18 12:22:10 +03:00
Christoph Oelckers
a6f64500bf
Merge branch 'master' of https://github.com/rheit/zdoom
2014-10-16 08:59:49 +02:00
ChillyDoom
c400dcf736
- Made DBot inherit from DObject.
2014-10-15 17:54:12 +01:00
ChillyDoom
db323643f8
- Renamed FBot to DBot and made it inherit from DThinker.
...
- Fixed: Bots added by players other than the net arbitrator did not have their skill set.
2014-10-14 19:57:11 +01:00
Christoph Oelckers
c9252d1919
Merge branch 'multi' of https://github.com/Edward850/zdoom
2014-10-14 11:54:40 +02:00
Christoph Oelckers
57895d69f9
Merge branch 'master' of https://github.com/rheit/zdoom
2014-10-14 08:54:41 +02:00
Christoph Oelckers
9f1f17c306
- fixed: The PolyBSPs weren't fully initialized. Some GZDoom-only fields in the segs were skipped.
2014-10-14 08:54:08 +02:00
Edward Richardson
29cf6b0daa
Fixed PredictionActor size and typo
2014-10-14 12:54:03 +13:00
ChillyDoom
83d84eaae9
- Moved bot related variables from player_t into a new FBot class.
2014-10-13 18:40:25 +01:00
Christoph Oelckers
952d03da7c
Merge branch 'multi' of https://github.com/Edward850/zdoom
2014-10-13 10:37:51 +02:00
ChillyDoom
5de6b535ae
- Removed unnecessary 'id' variable from AActor.
...
- Removed unused 'backpack' variable from player_t.
- Removed duplicate code from b_move.cpp.
- General cleanup.
2014-10-13 08:45:36 +01:00
Edward Richardson
0cd736b487
Prevent lerping when tic duplication not 1
...
Network dup makes player prediction inaccurate
2014-10-13 17:09:29 +13:00
Edward Richardson
3e4446e46b
Moved prediction lerp reset to cover all cases.
2014-10-13 16:49:53 +13:00
Edward Richardson
98904039b7
Final work on prediction lerping
...
Added cl_predict_lerpscale and cl_predict_lerpthreshold
Added options in menudef
Made sure that lerping cannot extrapolate or run on small scales
Lerping gets reset when rendering interpolation does or respawn
2014-10-13 16:32:49 +13:00
alexey.lysiuk
25b808cd82
Merge https://github.com/rheit/zdoom into z_osx_clean
2014-10-12 15:19:11 +03:00
Edward Richardson
3e6ad8c1a8
Further work on prediction lerping
2014-10-13 00:29:15 +13:00
Christoph Oelckers
0f19356e24
Merge branch 'master' of https://github.com/MajorCooke/zdoom
...
Conflicts:
wadsrc/static/actors/constants.txt
2014-10-12 08:43:46 +02:00
Christoph Oelckers
2228dcb32f
Merge branch 'experimental' of https://github.com/MajorCooke/zdoom
2014-10-12 08:30:13 +02:00
Christoph Oelckers
e6f3007bef
Merge branch 'scoreboardtoggle' of https://github.com/ChillyDoom/zdoom
2014-10-12 08:27:35 +02:00
MajorCooke
f766a1ab38
- Added SXF_ORIGINATOR.
...
- Only useful for missiles.
By default, missiles cannot set themselves as the master when spawning
actors.
2014-10-11 16:15:42 -05:00
MajorCooke
47029a3efc
DoKill bug
...
-Fixed: DoKill did not target 'killtarget' for missiles, causing crashes and making the function not work properly.
2014-10-07 11:33:08 -05:00
Christoph Oelckers
3eaebabdf1
- fixed: EV_Teleport must not access the thing's player pointer before ensuring that 'thing' is a valid pointer.
2014-10-06 17:40:02 +02:00
Christoph Oelckers
5d032f3fcf
- fixed: Since the engine can no longer change renderers on the fly, thanks to ZDoom's messed up video startup code, we have to abort with a fatal error if we can't create a GL context. Otherwise the user will never see a meaningful message.
2014-10-06 10:00:02 +02:00
Christoph Oelckers
3e2a17538b
- fixed: HUD weapons were affected by dynamic lights even when the CVARs said that they shouldn't.
2014-10-06 09:05:42 +02:00
Edward Richardson
e1b8b4a871
Started work on prediction lerping
2014-10-06 15:27:13 +13:00
Christoph Oelckers
9fe2857dc1
Merge branch 'master' of https://github.com/rheit/zdoom
2014-10-05 18:49:48 +02:00
Christoph Oelckers
ead8a2874d
- fixed: The texture mode implied by render style did not work for models.
2014-10-05 12:03:55 +02:00
Christoph Oelckers
fd3128a164
- fixed: When changing enhanced nightvision mode the shaders need to have their fixed colormap state reset to ensure that the new settings get used.
...
- fixed: The shader code for handling special fixed colormaps did not use the color vertex attribute which was most evident with the 'shadow' render style on the spectre.
2014-10-05 09:40:36 +02:00
Edward Richardson
7175374350
Keep gateway sockets open during handshake
2014-10-05 19:46:34 +13:00
Edward Richardson
c9d603d1c3
Unreliable isn't exactly the problem
2014-10-05 18:52:56 +13:00
Edward Richardson
0c1fde81ad
Remove PacketServer auto select
...
PacketServer has the tendency to amplify netgame latency times, so it
really shouldn't be auto selected.
Added a notice in case it's used.
2014-10-05 18:32:32 +13:00
Edward Richardson
ae71f94ed2
Remove disconnecting players safely
...
Players who were disconnecting would be removed outside of the playsims
control, causing problems with sector lists.
2014-10-05 18:04:11 +13:00
Edward Richardson
0f9a8176f5
Unprediction needs to restore selected inventory
2014-10-05 16:57:31 +13:00
MajorCooke
f54a59fdf8
- Added JLOSF_CHECKTRACER for A_JumpIfTargetInLOS.
...
- CHECKTRACER doesn't need to be a missile or have the SEEKERMISSILE
flag.
2014-10-02 17:00:17 -05:00
ChillyDoom
20dea78ce9
Merge branch 'master' of https://github.com/ChillyDoom/zdoom into scoreboardtoggle
2014-10-02 21:13:54 +01:00
ChillyDoom
c6e1ea864f
- Added scoreboard toggling.
2014-10-02 21:03:15 +01:00
MajorCooke
5030832df0
- Added DMSS_NOFACTOR for all A_Damage functions.
2014-10-02 11:48:07 -05:00
Christoph Oelckers
c66c497811
Merge branch 'master' of https://github.com/crimsondusk/zdoom
2014-09-29 00:43:19 +02:00
Christoph Oelckers
cfb623d517
Merge branch 'master' of https://github.com/MajorCooke/zdoom
2014-09-29 00:42:59 +02:00
Christoph Oelckers
82656df8c8
Merge branch 'Get-linetarget-from-any-actor' of https://github.com/fdari/zdoom
2014-09-29 00:42:35 +02:00
Christoph Oelckers
81076abba2
Merge branch 'canraise' of https://github.com/GitExl/zdoom
...
Conflicts:
src/p_acs.cpp
2014-09-29 00:42:09 +02:00
Teemu Piippo
770547e661
- added udmf key midtex3dimpassible which causes the midtex to behave like a finite-height impassible line; practically this means the mid texture lets projectiles pass through it.
2014-09-28 17:17:19 +03:00
MajorCooke
96c6e7d9bf
Minor fix; didn't mean to include that flag check.
2014-09-28 08:20:27 -05:00
MajorCooke
43b86288c7
- Added A_Remove(int pointer, int flags).
...
- RMVF_MISSILES removes missiles.
- RMVF_NOMONSTERS ignores monsters.
- RMVF_MISC includes non-monsters and missiles.
- RMVF_EVERYTHING disregards all checks and remove it.
These flags now apply to the following in addition to the new function:
-A_RemoveTarget
-A_RemoveMaster
-A_RemoveTracer
-A_RemoveChildren
-A_RemoveSiblings
2014-09-28 08:15:00 -05:00
fdari
c4f0f95ec8
Get linetarget (aim target) from any actor (not just player): AAPTR_LINETARGET
2014-09-28 15:06:52 +02:00
fdari
a2f7b86a0f
IsPointerEqual (ACS and Decorate)
...
Decorate: IsPointerEqual(int aaptr_selector1, int aaptr_selector2)
ACS: IsPointerEqual(int aaptr_selector1, int aaptr_selector2, int tid1 = 0, int tid2 = 0)
Compare the pointers values returned by two pointer select operations. Returns true if they both resolve to the same value. Null values can be explicitly tested using IsPointerEqual(AAPTR_NULL, ...)
ACS: IsPointerEqual(int aaptr1, int aaptr2, int tid1 = 0, int tid2 = 0)
This function lets you compare pointers from other actors than the activator, using tids. Tid1 determines the actor used to resolve aaptr1, Tid2 does the same for aaptr2. If tid1 and tid2 are equal, the same actor will be used for resolving both pointers (that could always happen randomly; this way you know it will happen).
2014-09-28 11:52:37 +02:00
Christoph Oelckers
ee09f8c72d
Merge branch 'master' of https://github.com/rheit/zdoom
2014-09-28 01:06:04 +02:00
MajorCooke
97d5d614c4
- Fixed: SXF_NOPOINTERS didn't clear LastHeard, causing monsters to spawn with targets.
2014-09-27 16:50:24 -05:00
MajorCooke
68a5db3c8c
- Added SXF_NOPOINTERS for A_SpawnItemEx.
...
- Added WARPF_ABSOLUTEPOSITION for A_Warp.
2014-09-27 13:22:14 -05:00
Christoph Oelckers
68c481945a
- extended parameter list of A_BFGSpray.
2014-09-27 09:36:38 +02:00
Christoph Oelckers
e025f40902
- more redundancy removal: Consolidated the common part of the A_Kill* functions into a subfunction.
2014-09-27 08:54:18 +02:00
Christoph Oelckers
afaa88a460
- consolidated the common portion of the 6 different A_Damage* functions into a subfunction.
2014-09-27 08:48:36 +02:00
MajorCooke
0735cb9550
- Updated many functions.
...
- Added A_KillTarget(damagetype, int flags).
- Added A_KillTracer(damagetype, int flags).
- Added A_RemoveTarget.
- Added A_RemoveTracer.
A_Kill (Master/Target/Tracer/Children/Siblings):
- KILS_FOILINVUL: foils invulnerability.
- KILS_KILLMISSILES: destroys projectiles. Does not work on invulnerable
projectiles without KILS_FOILINVUL, and doesn't work at all on missiles
with NODAMAGE flag.
- KILS_NOMONSTERS: actors that are monsters will not be killed.
A_Damage (Self/Target/Master/Tracer/Children/Siblings):
- DMSS_FOILINVUL: foils invulnerability.
- DMSS_AFFECTARMOR: damages the actor's armor instead of bypassing it
entirely.
- DMSS_KILL: damages the actor by its remaining health (useful for
modular DECORATE programming).
- Added A_SpawnItemEx flags:
- SXF_SETTARGET: sets the calling actor as the target.
- SXF_SETTRACER: sets the calling actor as the tracer.
Both of these functions take priority similar to SXF_SETMASTER over
SXF_TRANSFERPOINTERS.
2014-09-27 00:10:31 -05:00
MajorCooke
5b71ce6dcb
- Added FDARI's A_JumpIfHealthLower patch.
...
Now with pointer accessibility.
2014-09-26 11:48:20 -05:00
Edoardo Prezioso
54ccf5d44d
- Fixed a possible uninitialized condition.
...
In the function R_RebuildViewInterpolation, the pointer 'iview' was not initialized when the player or its camera were NULL, hence 'iview == NULL' was garbage. Also, the function FindPastViewer does not return NULL, hence the mentioned check is not needed at all. Just return early if the player camera does not exist.
2014-09-26 11:11:35 +02:00
Christoph Oelckers
0f62983aee
Merge branch 'master' of https://github.com/Edward850/zdoom
2014-09-26 08:31:20 +02:00
Christoph Oelckers
80060cf1ac
Merge branch 'checkclass' of https://github.com/MajorCooke/zdoom
2014-09-26 08:30:33 +02:00
MajorCooke
6586fa29fd
- Added FDARI's A_JumpIf CheckClass submission.
...
- bool CheckClass(string classname, int ptr_select = aaptr_default, bool
match_superclass = false)
2014-09-25 23:56:10 -05:00
MajorCooke
422e83a1b9
- Added more A_Damage functions:
...
- A_DamageTarget
- A_DamageTracer
-Both take a number for how much damage to deal and the damagetype to
inflict. Negative numbers means healing.
2014-09-25 23:12:25 -05:00
Edward Richardson
e25b91d5a1
Cleanup
2014-09-26 16:11:52 +12:00
Edward Richardson
84cf799803
Final changes to balancing
2014-09-26 15:48:46 +12:00
Edward Richardson
8f82243f4c
Don't balance if already the slowest node
...
- Network balancing shouldn't be run if already too far behind
- Don't save network settings
- Added net_fakelatency for debug builds
2014-09-26 15:48:45 +12:00
Edward Richardson
9e68983b44
Added standard teleports to line prediction
...
- Added standard teleports to line prediction
- Menudef for line special prediction
2014-09-26 15:48:45 +12:00
Edward Richardson
53b6e7d4d5
Added silent line teleport prediction
...
- Allow activation of line teleport specials during prediction
- Moved prediction functions to improve uncapped framerates
2014-09-26 15:48:45 +12:00
Edward Richardson
ad0a1ad865
Readded -extratic for compatibility with launchers
2014-09-26 15:48:45 +12:00
Edward Richardson
530f474673
Shifted netmode reporting for guests
...
- The netmode is now reported after a guest has received it.
- Minor code cleanup
2014-09-26 15:48:44 +12:00
Edward Richardson
c661da2995
Stop negative tic counts from corrupting messages
2014-09-26 15:48:44 +12:00
Edward Richardson
42e6737803
Player prediction now updates listener
2014-09-26 15:48:44 +12:00
Edward Richardson
4db8b3e421
Made delay updates less erratic
2014-09-26 15:48:44 +12:00
Edward Richardson
c585eee82b
Don't need to MAX() mode 2
2014-09-26 15:48:43 +12:00
Edward Richardson
78f8bf19d2
Extratics mode 3 didn't work well
...
- Removed Extratics mode 3
- Fixed a typo
2014-09-26 15:48:43 +12:00
Edward Richardson
4041f56cc8
Bumped net version
2014-09-26 15:48:43 +12:00
Edward Richardson
ded3bc73be
New extratic method
...
- Extratic changed to server var, that can be changed at any time
(net_extratic)
- Added net_extratic 2 which resends all unconfirmed tics
- Corrected bad variable typo in delay reporting
2014-09-26 15:48:43 +12:00
Edward Richardson
97586c317e
Further refinements to network balancing
...
- Added delay times of all players to the scoreboard
- Removed balancing from packet-server (tried it, didn't work)
- Calculations remove an extra tic to account for possible bias
2014-09-26 15:48:42 +12:00
Edward Richardson
542b8a7171
Added network load balancing
...
- Guests can now attempt to match latency with the arbitrator.
(net_loadbalance)
- Added althud feature to show arbitrator and local latency.
(hud_showlag 1 is on for netgames, 2 is always on)
2014-09-26 15:48:42 +12:00
MajorCooke
b1f87295b8
- Added A_DamageSelf.
...
- A_DamageSelf(int amount, name damagetype)
2014-09-25 16:47:41 -05:00
John Palomo Jr
79d9a573bb
Added AProp_MeleeRange to SetActorProperty.
2014-09-24 03:56:20 -04:00
GitExl
bb3d2fa535
Add CanRaiseActor ACS function.
2014-09-23 12:10:39 +02:00
Chris Robinson
b8e3f99ce6
Merge remote-tracking branch 'zdoom/master' into openal
...
Conflicts:
src/s_sound.cpp
2014-09-22 18:24:55 -07:00
Christoph Oelckers
0b44b51b00
Merge branch 'master' of https://github.com/GitExl/zdoom
2014-09-21 22:13:16 +02:00
Christoph Oelckers
48da2f87bb
- fixed: The light buffer index must not be reset between rendering a camera texture and the main scene.
...
Since rendering is asynchronous, the camera texture scene may not be finished once the main scene's lights get filled in. Unfortunately forcing a synchronization with glFinisg has bad side effects on performance the only remaining option is to use separate parts of the buffer for both scenes, which in extreme cases may increase the light buffer's size - but on modern hardware that shouldn't be a problem.
2014-09-21 21:01:11 +02:00
GitExl
313b229319
Add PickActor ACS function.
2014-09-21 16:43:17 +02:00
Christoph Oelckers
b2cf7d6512
- fixed memory leak: The sector links for dynamic lights were never freed.
2014-09-21 12:40:08 +02:00
Christoph Oelckers
7359631a43
- fixed weapon drawing rules to account for the death camera.
2014-09-21 11:08:38 +02:00
Christoph Oelckers
4682736585
- fixed: non-tiled mid textures on a fog boundary require some special clamping to be performed in the shader.
2014-09-21 11:08:17 +02:00
Christoph Oelckers
da87a34a6f
- fixed: MODELDEF's FrameIndex command was case sensitive.
2014-09-21 09:40:41 +02:00
Christoph Oelckers
a93cb0bfab
- added a NULL check for GL resource context in init code.
2014-09-21 09:19:17 +02:00
Christoph Oelckers
e14756e810
Merge branch 'master' of https://github.com/rheit/zdoom
2014-09-21 09:18:23 +02:00
Christoph Oelckers
f92cdb0ce7
- fixed: When the SectorAction's TriggerAction method was renamed, the inherited one in the MusicChanger was overlooked. (Bit thanks to the C++ specs for allowing to override a non-virtual method with a virtual one without even showing a warning...)
2014-09-21 09:11:33 +02:00
Christoph Oelckers
cbf72fe992
- fixed: Since the serializing code cannot distinguish between user variables of the same name coming from different actors in an inheritance chain, this kind of name duplication must be prohibited.
2014-09-21 08:32:39 +02:00
Christoph Oelckers
cbf353ca52
Merge branch 'master' of https://github.com/rheit/zdoom
2014-09-21 08:12:32 +02:00
MajorCooke
44683657f2
- Added jpalomo's A_SetSpeed patch.
2014-09-20 17:34:57 -05:00
alexey.lysiuk
49dca4d9cb
Native Cocoa back-end is enabled by default
2014-09-20 11:56:15 +03:00
alexey.lysiuk
e8ca4fa94e
Applied fixes for timer to its thread-based implementation
2014-09-20 11:55:49 +03:00
alexey.lysiuk
0f602fb1ce
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-09-20 11:54:21 +03:00
Christoph Oelckers
43e2d704a3
- always use glPolygonOffset to render translucent geometry.
2014-09-20 09:04:36 +02:00
MajorCooke
16a380f82a
- Added Blue Shadow's DropInventory ACS function.
2014-09-19 17:27:18 -05:00
MajorCooke
5c4ad9be68
Added Blue Shadow's A_SpawnItemEx changes: (1/2)
...
SXF_TRANSFERALPHA and SXF_TRANSFERRENDERSTYLE
2014-09-19 14:15:31 -05:00
Christoph Oelckers
c2377ff8e1
Merge branch 'setmasterfix' of https://github.com/MajorCooke/zdoom
2014-09-19 09:15:33 +02:00
Christoph Oelckers
0787f73cd4
Merge branch 'clang_3_5_crash' of https://github.com/edward-san/zdoom
2014-09-19 09:14:44 +02:00
MajorCooke
7a62459c00
Allow SXF_SETMASTER to work on non-monsters.
2014-09-18 17:58:06 -05:00
Christoph Oelckers
92dcf2e5ef
- fixed some of those supremely annoying and supremely pointless GCC/Clang compiler warnings.
2014-09-17 11:03:05 +02:00
Christoph Oelckers
c5e00dbc53
fixed: The sampler object for camera textures was never initialized.
2014-09-17 10:52:34 +02:00
Christoph Oelckers
c773a500f2
- only activate shader storage buffers on modern drivers also supporting GL_ARB_buffer storage. Early adopters of this extension (i.e. older AMD drivers mainly) tend to implement this badly.
2014-09-17 09:01:16 +02:00
Christoph Oelckers
df1364e2d7
Merge branch 'master' of https://github.com/rheit/zdoom
2014-09-16 08:46:12 +02:00
Christoph Oelckers
134c9ade21
Merge branch 'master' of https://github.com/rheit/zdoom
2014-09-16 08:44:37 +02:00
Christoph Oelckers
8ef16b72ee
Merge branch 'master' of https://github.com/rheit/zdoom
2014-09-16 08:43:03 +02:00
Christoph Oelckers
864adde92e
- typo for savegame versioning of AActor::weaponspecial: it was introduced in savegame version 4512, not 4511.
2014-09-16 08:42:27 +02:00
Edoardo Prezioso
1c96039d7a
- Fixed miscompilation with Clang 3.5.0.
...
The optimizer miscompiles the function FBehavior::LoadScriptsDirectory and causes random crashes when zdoom is run with wads containing scripts.
As said in the comment, I just hope that the Clang devs fix it for the next patching release, ie 3.5.1.
2014-09-15 19:46:43 +02:00
Braden Obrzut
94123d5ef4
- Applied anonymous patch to fix uncapped stuttering in SDL backend.
2014-09-15 12:59:07 -04:00
Christoph Oelckers
a25ed3c807
- fixed: inverted rendering for fuzzy things with light powerup was switched off due to change of render style.
2014-09-15 12:15:19 +02:00
Christoph Oelckers
77c4533e4b
Merge branch 'v2.x'
2014-09-15 11:51:59 +02:00
Christoph Oelckers
2ed287428c
Merge branch 'master' of https://github.com/rheit/zdoom
2014-09-15 11:36:51 +02:00
Christoph Oelckers
4be9a71636
- fixed: The VOC reader didn't advance the read index correctly.
2014-09-15 11:32:40 +02:00
Christoph Oelckers
1b13e6be98
-. fixed:S_LoadSound passed the wrong value for the lump size parameter to LoadSoundVoc.
2014-09-15 11:24:48 +02:00
Christoph Oelckers
8e7e16f73a
- fixed: The light uniform buffer may not be mapped with GL_MAP_INVALIDATE_BUFFER_BIT, because it needs to be mapped for each portal in a scene but it must preserve the existing data for the remaining translucent objects.
2014-09-15 10:27:09 +02:00
Christoph Oelckers
07ef7d3d59
Merge branch 'master' into v2.x
2014-09-14 23:07:30 +02:00
Christoph Oelckers
60ff6c5f07
Merge branch 'master' of https://github.com/rheit/zdoom
2014-09-14 23:06:57 +02:00
Christoph Oelckers
32f08adaf3
- moved some code to better places.
...
- allow GL version 3.0 in Windows, too.
2014-09-14 23:01:57 +02:00
Ralgor
5cc43137a1
Only require OpenGL 3.0 compatibility profile.
2014-09-14 14:43:42 -05:00
Ralgor
cfc8f3dbbf
Global GL render context shouldn't be initialized inside of gl_PrintStartupLog, since it's not compiled in non MSC builds.
2014-09-14 14:42:14 -05:00
Ralgor
1a70a6aabc
The light buffer should check for shader_storage_buffer_object rather than buffer_storage.
2014-09-14 14:29:13 -05:00
Ralgor
ddf58b43c9
Fix compile errors on linux.
2014-09-14 14:28:05 -05:00
Chris Robinson
4b68891de7
Rename 'near', because microsoft
2014-09-14 11:15:32 -07:00
alexey.lysiuk
1529ff7730
Fixed compilation warning in HID name formatting
2014-09-14 09:51:55 +03:00
Chris Robinson
cd46f95902
Merge remote-tracking branch 'zdoom/master' into openal
2014-09-13 11:52:47 -07:00
Chris Robinson
ce678caab6
Include algorithm for std::min/max
2014-09-13 11:51:53 -07:00
alexey.lysiuk
c7fc44062e
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-09-13 16:12:14 +03:00
alexey.lysiuk
1e3e94f8ad
Fixed crash Apple's HID Utilities in x86_64 build
...
Only a small part of HID Utilities version 5.3, 2014-02-28 was merged in because of various issues it has
https://developer.apple.com/library/mac/samplecode/HID_Config_Save/
2014-09-13 15:46:32 +03:00
Christoph Oelckers
ee6e87d94b
- use a separate counter from AActor::special1 to count weapon use with some Hexen weapons. special1 is used for some other purposes as well, and when using a separate counter it can be reset to 0 when changing weapons, preventing counting errors.
2014-09-13 12:38:16 +02:00
Christoph Oelckers
de68361f27
- fixed: When a sprite is being renamed by Dehacked it also needs to be changed in the list of original sprite names, otherwise any subsequent attempt to use the altered sprite in a frame definition will fail.
2014-09-13 11:54:19 +02:00
Christoph Oelckers
2ada3fe00e
- remove debug stuff.
2014-09-13 11:40:06 +02:00
Christoph Oelckers
50a8297201
- fixed: G_ChangeLevel must resolve warptrans map links before getting the next level's levelinfo.
2014-09-13 11:00:25 +02:00
alexey.lysiuk
87472bf002
Use the same binary architecture to restart from IWAD picker
2014-09-13 11:44:24 +03:00
Christoph Oelckers
f0e9fde336
- fixed: In Raven games, don't chase after monsters in the titlemap or when actor has a goal.
2014-09-13 10:40:56 +02:00
alexey.lysiuk
7286ee9626
Renamed application delegate to controller
2014-09-13 11:23:38 +03:00
alexey.lysiuk
b6f829979a
Cleaned up software rendering internals in Cocoa back-end
2014-09-13 11:16:23 +03:00
Christoph Oelckers
2be3b776d8
- fixed: A_CustomMissile should not jump to the See state for dead monsters when using CMF_CHECKTARGETDEAD.
2014-09-13 10:15:09 +02:00
Christoph Oelckers
46ec364443
- fixed: When validating the crouch sprite it was assumed that both the regular and the crouch sprite were having full rotations.
2014-09-13 10:08:22 +02:00
Christoph Oelckers
1e82d72349
- fixed: G_FinishTravel must clear the MF2_BLASTED flag off the player pawn because this flag will result in damage from contact with other objects in the map.
2014-09-13 09:56:21 +02:00
Christoph Oelckers
a0f507d18f
- fixed: The crosshair setting code checked for existence of lumps, not textures and missed anything defined in a TEXTURES lump.
2014-09-13 09:51:49 +02:00
Chris Robinson
1baf355ecd
Use the properly-sized type for ssize_t
2014-09-12 19:36:13 -07:00
Christoph Oelckers
3c2f1952fd
Merge branch 'master' into v2.x
2014-09-12 21:01:55 +02:00
Christoph Oelckers
5a1ad75402
Merge branch 'master' of https://github.com/rheit/zdoom
2014-09-12 21:01:27 +02:00
Christoph Oelckers
109da206a6
Merge branch 'master' of https://github.com/rheit/zdoom
2014-09-12 20:59:41 +02:00
Christoph Oelckers
a2c81f1ca9
-fixed the file validity checks in MapData::GetChecksum.
...
They need to be done per lump, because MapData::Seek can alter the FileReader being used for a specific lump. Even worse, the FileReader will be NULL when the function as it was is called for a map inside a Zip-file.
2014-09-12 20:59:23 +02:00
alexey.lysiuk
1dab120e15
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-09-12 18:37:43 +03:00
alexey.lysiuk
0fd84bc853
Added ability to turn off hi-res backing surface rendering on Retina displays
...
High resolution backing surface is enabled by default and controlled via vid_hidpi CVAR
When it is set to false one pixel per point scale is used
2014-09-12 18:35:45 +03:00
Chris Robinson
628f2cd474
Merge remote-tracking branch 'zdoom/master' into openal
2014-09-12 05:02:05 -07:00
Chris Robinson
713846f27a
Fix use of ssize_t with MSVC
2014-09-12 04:26:54 -07:00
Braden Obrzut
27ebfa783e
- Added IfHealth based on Blue Shadow's patch.
2014-09-12 00:49:09 -04:00
Braden Obrzut
0223b7f460
- Fixed: InInventory didn't work quite right with multiple items.
2014-09-12 00:39:36 -04:00
Chris Robinson
ca22f2dd3f
Fix a PrintMidiDevice call
2014-09-11 14:16:56 -07:00
Christoph Oelckers
25951362fc
- fixed: When applying Boom's Transfer_Heights effect to a sector, gl_FakeFlat needs to remove all portals from the original sector planes that are being replaced in the sector copy.
2014-09-11 13:02:39 +02:00
Chris Robinson
77cce303ef
Fix merge conflict properly
2014-09-09 15:11:26 -07:00
Chris Robinson
ff6eb6df5c
Merge remote-tracking branch 'zdoom/master' into openal
...
Conflicts:
src/s_sound.cpp
2014-09-09 14:45:53 -07:00
Christoph Oelckers
acf6c259d8
- changed the handling of alpha textures. The only special case they need is with palette-less textures and this can be handled far more easily and robustly with a predefined translation instead of passing another parameter through all the layers of the texture management code. This also fixes problems with paletted PNGs that get used as an alpha texture because the old method clobbered the image's palette.
2014-09-09 13:21:36 +02:00
Christoph Oelckers
4bb320a27c
- route texture binding through the renderstate class for better control. Currently it's just a direct passthrough but this will change.
2014-09-09 12:00:42 +02:00
Christoph Oelckers
d5633701b4
- swapped order of textures in burn shader to avoid some problems with the texture samplers.
...
- fixed: texture sampler state for the burn texture was never set.
2014-09-09 10:17:44 +02:00
Christoph Oelckers
c6f4c0b6f0
- fixed: FMaterial's tex pointer could be accessed before it was set.
...
- allow more than two texture units in shaders.
2014-09-09 10:03:34 +02:00
Christoph Oelckers
62880f113b
- fix a render glitch with Back to Saturn X MAP06: Do not flood missing upper and lower textures with the backsector's flat if that backsector is malformed (i.e. has no area.)
2014-09-09 08:47:39 +02:00
Christoph Oelckers
9b8869e78d
Merge branch 'master' into v2.x
...
Conflicts:
src/gl/textures/gl_material.cpp
2014-09-09 01:30:11 +02:00
Christoph Oelckers
86d9c7ec8e
- add some compatibility settings to fix rendering glitches in BTSX_E1 MAP12.
2014-09-09 01:27:41 +02:00
Christoph Oelckers
e2c2f635ac
Merge branch 'master' of https://github.com/rheit/zdoom
2014-09-08 23:26:17 +02:00
Christoph Oelckers
5e34b78451
- missed a line.
2014-09-08 23:25:27 +02:00
Christoph Oelckers
0ff061b928
Merge branch 'master' of https://github.com/rheit/zdoom
2014-09-08 22:55:37 +02:00
Christoph Oelckers
580e580c42
- added option to set a sector's tag via compatibility.txt (needed by GZDoom)
2014-09-08 22:54:56 +02:00
Christoph Oelckers
3d2646cbae
Merge branch 'master' of https://github.com/rheit/zdoom
2014-09-08 13:02:39 +02:00
Christoph Oelckers
cfd24f438f
- jpalomo's A_Saw flags submission.
2014-09-08 13:02:05 +02:00
alexey.lysiuk
e29fce6951
Fixed missing transparency on upscaled textures
...
Textures with diagonal patterns were treated as opaque after resizing
Images upscaled by hqNx were affected mostly by this issue
http://forum.drdteam.org/viewtopic.php?f=24&t=5370
http://zandronum.com/tracker/view.php?id=269
http://zandronum.com/tracker/view.php?id=315
2014-09-07 11:52:51 +03:00
alexey.lysiuk
e60d181e87
Removed redundant #include's that broke build of native back-end
2014-09-06 10:22:37 +03:00
alexey.lysiuk
45a88780b0
Fixed build with GCC 4.x / Xcode 3.2.x
2014-09-06 10:18:33 +03:00
alexey.lysiuk
4d799cab70
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-09-06 10:17:41 +03:00
Braden Obrzut
49382a2a14
- Added detection for The Adventures of Sqaure (based off MTrop's submission).
...
- IWADINFO no longer requires a mapinfo to be specified.
2014-09-04 19:36:08 -04:00
Christoph Oelckers
b96dd6c421
- fixed: The missing fourth component of the texture coordinate must be filled with 1.0, not 0.0 before applying the texture matrix. Not doing so will cancel out the translation part of the matrix.
2014-09-02 10:31:48 +02:00
Christoph Oelckers
fa3a62e954
- fix a render glitch with Back to Saturn X MAP06: Do not flood missing upper and lower textures with the backsector's flat if that backsector is malformed (i.e. has no area.)
2014-08-31 23:01:53 +02:00
Christoph Oelckers
a280c20b4e
- fixed: If we want to cache texture binding state we have to reset it in all places where a texture becomes unbound.
2014-08-31 19:00:17 +02:00
Christoph Oelckers
12160bd29c
- remove some obsolete code from decal rendering.
...
- avoid rebinding the same texture multiple times, as there's considerable overhead in the texture manager.
- check gl_sort_textures only once per scene, not per draw list.
2014-08-30 15:34:14 +02:00
Christoph Oelckers
6a3cd6378a
- found out that reading the CPU's real time clock costs a not insignificant amount of time so this is now only done when either the benchmark command is running or the rendertimes are shown.
2014-08-30 14:33:06 +02:00
Christoph Oelckers
49ec7beb8f
- separate draw lists for walls and flats. This makes the sorting much more efficient because draw types no longer need to be checked in the compare function. This is a lot more important than having perfect texture order.
2014-08-30 13:04:41 +02:00
Christoph Oelckers
1d2aa3df0c
fixed: The wait console command waited one tic too many because it got 1 added to it twice instead of only once.
2014-08-25 10:51:50 +02:00
Christoph Oelckers
a903cbe12e
- sorting draw items by light level no longer makes sense so remove all corresponding code from dicmp.
2014-08-24 13:10:45 +02:00
Christoph Oelckers
bf03d02228
- print OpenGL profile type in startup log.
2014-08-24 01:09:44 +02:00
Christoph Oelckers
904cc2e158
- some code cleanup.
2014-08-23 18:54:24 +02:00
alexey.lysiuk
51d7340288
Fixed crash on music volume change when no track is played using FluidSynth device
2014-08-23 16:35:05 +03:00
Christoph Oelckers
5364116354
- fixed: APROP_Friendly did not manage monster counting correctly.
2014-08-23 13:24:15 +02:00
Christoph Oelckers
bf6079af46
- fixed incorrect check for overrideshader.
2014-08-23 00:47:05 +02:00
Christoph Oelckers
1050013017
major cleanup of the texture manager:
...
- use sampler objects to avoid creating up to 4 different system textures for one game texture just because of different clamping settings.
- avoids flushing all textures for change of texture filter mode.
- separate sprite and regular dimensions on the material level to have better control over which one gets used. It's now an explicit parameter of ValidateTexture. The main reason for this change is better handling of wall sprites which may not be subjected to such handling.
- create mipmaps based on use case, not texture type.
- allows removal of FCloneTexture hack for proper sharing of the same sprite for decals and other purposes.
- better precaching of skyboxes.
2014-08-22 23:50:38 +02:00
Christoph Oelckers
7a727b6807
Merge branch 'master' into v2.x
2014-08-21 13:44:41 +02:00
Christoph Oelckers
816999109e
Merge branch 'master' of https://github.com/rheit/zdoom
2014-08-21 13:42:43 +02:00
Christoph Oelckers
df0d3543a8
- fixed: *ALL* original ceiling crushers, not just type 49, require a distance of 8 to the floor for the destination height. For the silent types this required a new action special, Ceiling_CrushAndRaiseSilentDist. This change only affects the XLAT mapping, the Hexen format types behave as before.
...
- removed the redundant internal ceilCrushAndRaiseDist ceiling movement type. It was precisely the same as ceilCrushAndRaise in all details.
2014-08-21 13:01:12 +02:00
Christoph Oelckers
274a4216ea
- disabling inlining in the GL loader produces an executable that's 8kb smaller.
2014-08-21 11:47:53 +02:00
Christoph Oelckers
78815a9601
-we need this, too.
2014-08-21 11:29:43 +02:00
Christoph Oelckers
e132fc5eed
- replaced GLEW with GLLoadGen for GL access. This allows to have a header that only contains what's actually required, namely OpenGL 3.3 plus glBegin and glEnd which are the only compatibility functions needed for the fallback render path.
...
GLEW has two major problems:
- it always includes everything, there is no way to restrict the header to a specific GL version
- it is mostly broken with a core profile and only works if all sanity checks get switched off.
2014-08-21 11:02:46 +02:00
Edward Richardson
07d7f690e8
Non-wall sprites need their original depth checks
2014-08-21 20:03:17 +12:00
Christoph Oelckers
6f65bccf1c
- reinstated the far superior assembly HQnX version for Visual C++.
2014-08-20 12:45:33 +02:00
Christoph Oelckers
86d37e06f9
- lowered requirements of GL 2.x to OpenGL 3.3.
...
There was one issue preventing the previous 2.0 betas from running under GL 3.x: The lack of persistently mapped buffers.
For the dynamic light buffer today's changes take care of that problem.
For the vertex buffer there is no good workaround but we can use immediate mode render calls instead which have been reinstated.
To handle the current setup, the engine first tries to get a core profile context and checks for presence of GL 4.4 or the GL_ARB_buffer_storage extension.
If this fails the context is deleted again and a compatibility context retrieved which is then used for 'old style' rendering which does work on older GL versions.
This new version does not support GL 3.2 or lower, meaning that Intel GMA 3000 or lower is not supported. The reason for this is that the engine uses a few GL 3.3 features which are not present in the latest Intel driver.
In general the Intel GMA 3000 is far too weak, though, to run the demanding shader of GZDoom 2.x, so this is no real loss. Performance would be far from satisfying.
A command line option '-gl3' exists to force the fallback render path. On my Geforce 550Ti there's approx. 10% performance loss on this path.
2014-08-19 15:56:33 +02:00
Christoph Oelckers
a2dc4afe3f
- screwed by the editor's autocompletion... (wrong GL flag was used...)
2014-08-19 14:25:47 +02:00
Christoph Oelckers
00d7707aef
- allow reallocation of light buffer if more lights are needed.
...
- added a light preprocessing pass to the renderer so that a non-persistent buffer can be used with minimal mapping/unmapping. This only gets used if necessary because it adds some overhead to the renderer.
2014-08-19 14:18:21 +02:00
Christoph Oelckers
38796e7714
- removed some obsolete and useless GL calls.
2014-08-17 11:41:03 +02:00
alexey.lysiuk
9479a89b66
Fixed crash on Release targets
2014-08-16 13:55:05 +03:00
alexey.lysiuk
cbe6cf2d41
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-08-16 13:28:55 +03:00
Christoph Oelckers
5d6ef5cb16
Merge branch 'master' into v2.x
2014-08-11 13:19:42 +02:00
Christoph Oelckers
c30cfb3190
Merge branch 'master' of https://github.com/rheit/zdoom
2014-08-11 13:18:21 +02:00
Christoph Oelckers
f482dc094d
fixed: R_PointOnSideSlow had precision issues with very short lines.
...
When this function was originally written there was no possibility of fractional vertex coordinates so it threw away the fractional parts of the node's directional vector (which in the original nodes was always 0.)
Now, with UDMF and high precision vertices this no longer works and the loss of significant parts of their value caused this code to produce erroneous results if the linedefs were only a few map units long and using fractional positions.
2014-08-11 12:27:04 +02:00
Christoph Oelckers
48163de8e2
must include doomdef.h in cmdlib.h to get TICRATE.
2014-08-11 11:47:14 +02:00
Christoph Oelckers
f0eccb9d15
- BlueShadow's submission for keeping the max save amount of BasicArmorPickups around when picking up armor bonuses.
2014-08-11 10:08:49 +02:00
Christoph Oelckers
259466c3d4
fixed time printing.
...
- In ZDoom the timer runs a bit too fast because roundoff errors make 35 tics only last 0.98 seconds. None of the internal timing has been changed, only the places where a time value is printed it will get adjusted for this discrepancy.
2014-08-11 09:39:38 +02:00
alexey.lysiuk
96a3e0f729
Set more descriptive name for SDL source files list in CMake file
2014-08-10 12:30:19 +03:00
alexey.lysiuk
2649b4c26a
Moved render buffer options definition to own header file
...
This is needed for GZDoom
2014-08-10 11:22:20 +03:00
alexey.lysiuk
f8dfdbd4a4
Extracted fullscreen and windowed modes handling to separate methods
2014-08-10 11:12:35 +03:00
alexey.lysiuk
406ee9234a
Added two SDL functions needed for GZDoom
2014-08-09 16:27:07 +03:00
alexey.lysiuk
efdfeeec90
Distinguish SDL and Cocoa back-ends in startup log
2014-08-09 15:51:39 +03:00
alexey.lysiuk
b6404180bb
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-08-09 13:34:06 +03:00
alexey.lysiuk
18c9caf68d
Enhanced Cocoa version of IWAD picker window
...
Added ability to specify custom command line parameters
Added ability to browse for user files
Improved handling of restart console command
Improved layout for window
2014-08-09 13:32:32 +03:00
alexey.lysiuk
82e8c514e9
Renamed SDL specific source file with GUI related code
2014-08-09 13:20:52 +03:00
Christoph Oelckers
1fcde91298
- BlueShadow's GetArmorInfo submission.
2014-08-08 09:25:35 +02:00
Randy Heit
bf0856aef5
Remove DepthScale and DepthOrg from FWallTmapVals
2014-08-07 22:58:11 -05:00
Randy Heit
891b3da103
Remove extra magnitude from magic texture mapping values
...
- These used to be fixed point, but now they're floating point, so the
excess magnitude is unneeded.
2014-08-07 22:43:23 -05:00
Randy Heit
fefe6aa2c1
Specie -> Species
...
- specie: money in the form of coins rather than notes
- species: a group of living organisms consisting of similar individuals
capable of exchanging genes or interbreeding
2014-08-07 22:40:12 -05:00
Randy Heit
75dc7de632
Merge branch 'master' of github.com:rheit/zdoom
2014-08-07 22:28:35 -05:00
Randy Heit
46592f5f6d
Don't clamp SHADE2LIGHT
...
- Light levels aren't stored in bytes anymore, so there's no reason to
clamp it anymore when loading Build maps.
2014-08-07 22:27:48 -05:00
Randy Heit
fbb5689f29
Eliminate extra vars from FWallCoords
...
- cx1, cx2, cy1, and cy2 are not used anywhere, so get rid of them.
- Also annotated the comments to indicate the corresponding arrays in the Build engine.
2014-08-07 22:26:24 -05:00
Randy Heit
e6a1d6b516
Parse more info from Blood's map header
2014-08-07 22:00:02 -05:00
Randy Heit
9659b894a3
Skip neardepth/fardepth checking in R_DrawSprite
...
- Wall sprites now clip much, much better than before.
2014-08-07 20:43:09 -05:00
Randy Heit
7b02027ba7
Fixed: Wall sprites cut off one pixel short of the window's right border
2014-08-07 20:00:49 -05:00
Randy Heit
6303935ad6
Use wall sprite Y scale
2014-08-07 19:57:55 -05:00
Randy Heit
0aa67c68ab
Redo lighting for each wall sprite
...
- Because previously it just reused whatever the most recently drawn wall
used.
2014-08-07 17:23:06 -05:00
Randy Heit
e1ee80661e
Make FWallCoords' members lowercase
...
because they're kind of a pain to type when all uppercase.
- Also, make its sx1 and sx2 members shorts, so it takes less space, since
it's getting crammed into a vissprite now.
2014-08-07 17:12:04 -05:00
Leonard2
8c4c011ca2
MTHRUSPECIES on puffs
...
You were right it's cleaner that way
2014-08-07 18:05:39 +02:00
Leonard2
5400ce1a21
+MTHRUSPECIES on puffs
2014-08-07 15:50:21 +02:00
Christoph Oelckers
b9ffb51d0c
- small but important optimization: Two-sided lines with both sides in the same sector don't really require vertex splitting for precise rendering.
2014-08-04 23:00:40 +02:00
Christoph Oelckers
09a68e8c93
- fixed incorrect function call in shader compiler.
2014-08-03 18:14:19 +02:00
Christoph Oelckers
370582d2fa
- corrected versioning info for development branch.
2014-08-03 12:25:59 +02:00
Christoph Oelckers
19cfffebb3
- fixed: the WallTypes enum contained a value that no longer was valid. This was fixed orignally last week but it seems to have gotten lost.
2014-08-03 12:21:05 +02:00
alexey.lysiuk
313173aa32
Added support for clipboard operations on OS X
2014-08-03 12:40:14 +03:00
alexey.lysiuk
4fb1e7517c
Added support for VSync option in Cocoa back-end
2014-08-03 12:39:42 +03:00
Braden Obrzut
177112603d
Added support for Cocoa back-end in CMake build system
2014-08-03 12:38:56 +03:00
alexey.lysiuk
e12f860f1b
Added native Cocoa back-end implementation
2014-08-03 12:36:02 +03:00
alexey.lysiuk
fecd1b6401
Moved cursor and timer implementations into separate files
2014-08-03 12:33:29 +03:00
alexey.lysiuk
d6cc6ee452
Added notification dialog in case of fatal error
2014-08-03 12:26:17 +03:00
alexey.lysiuk
906102c3b6
Added HID Utilities source code
...
https://developer.apple.com/library/mac/samplecode/HID_Utilities/Introduction/Intro.html
https://developer.apple.com/library/mac/samplecode/HID_Utilities/HID_Utilities.zip
2014-08-03 12:23:08 +03:00
alexey.lysiuk
2efb62e8ef
Added work-around for vectorization issue in Apple's GCC 4.x
2014-08-03 12:21:00 +03:00
alexey.lysiuk
0a5dd94072
Fixed whole program (link-time) optimization build with Clang
2014-08-03 12:20:30 +03:00
alexey.lysiuk
39e2ebe425
Fixed GNU inline assembly for Clang
2014-08-03 12:19:07 +03:00
alexey.lysiuk
32af6cb0cf
Added support for Command/Meta key
2014-08-03 12:18:15 +03:00
Christoph Oelckers
c98e3ca99d
Merge branch 'master' into v2.x
2014-08-03 10:58:41 +02:00
Christoph Oelckers
b3e0d93385
- implemented rendering of wall sprites.
2014-08-03 10:57:58 +02:00
Christoph Oelckers
398d902e7e
- split off sprite clipping adjustment code into its own function.
2014-08-03 10:22:12 +02:00
Christoph Oelckers
1b55c17379
Merge branch 'master' of https://github.com/rheit/zdoom
2014-08-03 10:08:05 +02:00
Randy Heit
1d02ad3aa2
Merge branch 'master' of github.com:rheit/zdoom
2014-08-02 22:40:02 -05:00
Randy Heit
d0043bed78
Q&D port of decal code to draw generic wall sprites
...
- This still doesn't use all the sprite properties correctly. It also
looks like they're going to need different code to build the clipping
arrays. But at least wall sprites are drawn at the proper angle now!
2014-08-02 22:35:57 -05:00
Christoph Oelckers
eef4d1fac1
Merge branch 'fix_build_nonmsvc' of https://github.com/alexey-lysiuk/gzdoom
2014-08-03 01:17:15 +02:00
Christoph Oelckers
cd5e429d3b
- adjust version number.
2014-08-02 23:12:08 +02:00
Christoph Oelckers
a63871d170
- at least for Intel GMA we need shaders without 'discard' to render non-transparent stuff. The performance penalty is rather hefty here.
2014-08-02 21:06:34 +02:00
Christoph Oelckers
a97b58fa27
- added check for light uniform buffer overflows, because uniform buffers on Intel are rather small.
2014-08-02 20:41:13 +02:00
alexey.lysiuk
6ef67e1d3e
Fixed build on compilers other than MSVC
...
No more "Call to 'LittleShort' is ambiguous" error
2014-08-02 13:14:25 +03:00
Christoph Oelckers
e35fefdc06
- better rebind the active shader after updating the matrices.
2014-08-02 11:59:04 +02:00
Christoph Oelckers
b2860a1d63
- it looks like glProgramUniform is not working correctly with Intel drivers, so better forget about it for setting the view and projection matrices. Even on NVidia the time difference can only be measured in microseconds per frame so it's not a big loss.
2014-08-02 11:57:42 +02:00
Edward Richardson
9716a61219
Add CVar for drawing weapons in the althud
2014-08-02 19:34:16 +12:00
Christoph Oelckers
a8e9c1832f
- decided to restrict the 2.0 beta to OpenGL 4.x with GL_ARB_buffer_storage extension and removed all code for supporting older versions.
...
Sadly, anything else makes no sense.
All the recently made changes live or die, depending on this extension's presence.
Without it, there are major performance issues with the buffer uploads. All of the traditional buffer upload methods are without exception horrendously slow, especially in the context of a Doom engine where frequent small updates are required.
It could be solved with a complete restructuring of the engine, of course, but that's hardly worth the effort, considering it's only for legacy hardware whose market share will inevitably shrink considerably over the next years.
And even then, under the best circumstances I'd still get the same performance as the old immediate mode renderer in GZDoom 1.x and still couldn't implement the additions I'd like to make.
So, since I need to keep GZDoom 1.x around anyway for older GL 2.x hardware, it may as well serve for 3.x hardware, too. It's certainly less work than constantly trying to find workarounds for the older hardware's limitations that cost more time than working on future-proofing the engine.
This new, trimmed down 4.x renderer runs on a core profile configuration and uses persistently mapped buffers for nearly everything that is getting transferred to the GPU. (The global uniforms are still being used as such but they'll be phased out after the first beta release.
2014-08-01 22:42:39 +02:00
Christoph Oelckers
7967082e60
- use the light buffer to handle dynamic lighting.
2014-08-01 20:59:39 +02:00
Randy Heit
15251e7a21
Set face/wall/floor flags from Build sprites
2014-07-31 22:18:08 -05:00
Randy Heit
a600a816c3
Consolidate some common code for texture mapping setup
...
- R_AddLine() and R_RenderDecal() had nearly identical code for setting up
texture mapping. These have now been spun off into methods of
FWallCoords and FWallTmapVals.
2014-07-31 21:02:22 -05:00
Randy Heit
b0b9c57e85
Pass x1 and x2 to Prep(L)Wall as params
2014-07-31 20:32:21 -05:00
Randy Heit
fc63e9db3c
Pass WallC as a parameter to (O)WallMost instead of referencing it globally
2014-07-31 20:23:04 -05:00
Randy Heit
bc450808b2
Consolidate wall texturing vars into two structs
...
- All transformation and clipping values go into FWallCoords.
- All texture mapping values go into FWallTMapVals.
2014-07-31 20:17:23 -05:00
Randy Heit
bbc3b69a7c
Remove polymost stuff
...
- Maybe it will be back someday, but it's been essentially dead for nearly
10 years, so don't hold your breath.
2014-07-31 19:44:41 -05:00
Randy Heit
4cf468452c
Remove slopetype from line_t.
...
- Recomputing it in the only two places where it's used is trivial, so
it's basically a waste of space to precompute it.
2014-07-31 19:15:08 -05:00
Randy Heit
e55e7b9a38
Don't weed out wall and floor sprites when spawning Build sprites
2014-07-31 18:22:33 -05:00
Christoph Oelckers
01a1e10084
Merge branch 'master' into Glew_Version_For_Real
2014-07-31 00:59:56 +02:00
Christoph Oelckers
09ae52e26b
Merge branch 'master' of https://github.com/rheit/zdoom
2014-07-31 00:44:59 +02:00
Christoph Oelckers
1ec58011d2
- start of light buffer implementation so that we don't have to use uniform arrays which appear to be broken on AMD.
2014-07-31 00:44:22 +02:00
Christoph Oelckers
ef8f66c9a1
- removed the code for hardware alpha testing again because it didn't work anymore with how things are set up now.
...
- we need to check all GL versions when trying to get a context because some drivers only give us the version we request, leaving out newer features that are not exposed via extension.
- added some status info about uniform blocks.
2014-07-30 23:13:16 +02:00
Randy Heit
a922ae04cc
Use Blood player starts
...
- Blood's maps use thing types, much like Doom's, so getting its player
starts is easy. There's no need to synthesize a start from the editor
position like with other Build maps.
2014-07-29 21:39:05 -05:00
Randy Heit
449a17c2f4
Correctly assign the sample rate for all Blood SFX formats
...
- Blood can do 44100 Hz sounds!
2014-07-29 21:09:29 -05:00
Randy Heit
e0e00c4f8c
Fixed: None of the Blood ambient sounds were registered correctly
2014-07-29 20:56:20 -05:00
Randy Heit
4296e9caa2
Fix typo in comment
2014-07-29 20:51:23 -05:00
Randy Heit
d602b272b5
Never cache nodes for Build maps
2014-07-29 20:46:20 -05:00
Randy Heit
00854dd09e
Don't reopen the reader for encrypted maps
...
- Fixed: Memory leak when loading Blood maps.
2014-07-29 20:42:17 -05:00
Randy Heit
02e7c56c82
Move SpriteFrames.Clear() from R_InitSprites to FTextureManager::Init
...
- Fixed: Blood sprite rotations were overwritten by the Doom sprite
rotations.
2014-07-29 20:31:53 -05:00
Randy Heit
f3d8edb4d8
Fixed: No sprites were loaded for Build maps
2014-07-29 20:30:50 -05:00
Christoph Oelckers
a1dfdf0fc7
Merge branch 'master' of https://github.com/rheit/zdoom
2014-07-29 15:51:14 +02:00
Randy Heit
ea7ba9dba3
Add per-actor friction
...
- This is multiplied by the sector's friction.
- This is intentionally not serialized yet, while awaiting feedback.
2014-07-28 23:15:50 -05:00
Randy Heit
0f8a0020ed
Merge remote-tracking branch 'origin/master'
2014-07-28 21:08:21 -05:00
Randy Heit
7280d278d9
Fix VC2005 warning in F7ZFile::Open
2014-07-28 21:03:41 -05:00
Randy Heit
4c6edd5e58
Add script array support to ZDoom
2014-07-28 21:02:20 -05:00
Edward Richardson
6af441c4d7
Dup frames shouldn't adapt.
...
Adapting during a dup frame caused jittery network performance
(especially when using high dup values).
The demoplayback check also didn't need to be there anyway.
2014-07-29 11:09:46 +12:00
Christoph Oelckers
beabfad293
Merge branch 'master' into Glew_Version_For_Real
2014-07-28 22:23:56 +02:00
Christoph Oelckers
318aebc4ad
- fixed: the vertex collection code used incorrect indices for checking the checkmap array.
2014-07-28 22:23:17 +02:00
Christoph Oelckers
183d0ba82a
Merge branch 'master' into Glew_Version_For_Real
2014-07-28 19:56:17 +02:00
Christoph Oelckers
355dd1c2f5
- fixed some issues with setting the vertex dirty state. It was also called from several sector init functions and copy code for Boom deep water. The only case where SetPlaneTexZ should call it is from the interpolation code so this is a special case now.
2014-07-28 18:01:01 +02:00
Christoph Oelckers
993b6c3066
- fixed typo in FraggleScript item class list
2014-07-28 17:13:42 +02:00
Christoph Oelckers
192daf1d5a
Merge branch 'master' into Glew_Version_For_Real
2014-07-27 21:57:38 +02:00
Christoph Oelckers
ece10bb57f
- fixed several incorrect uses of abs instead of fabs.
2014-07-27 21:57:05 +02:00
Christoph Oelckers
c9c93a58a2
- fixed bad constant and potential use of uninitialized variable.
2014-07-27 21:55:25 +02:00
Christoph Oelckers
3d24f58bf0
- fixed conditions for disabling the flat vertex buffer.
2014-07-27 20:18:32 +02:00
Christoph Oelckers
29a56fe01c
Merge branch 'master' into Glew_Version_For_Real
2014-07-27 17:59:50 +02:00
Christoph Oelckers
925305aa05
- fixed: The code for updating vertex dirty state had been completely missing. I have no idea when it disappeared...
2014-07-27 17:58:51 +02:00
Chris Robinson
7e7219a84b
Merge remote-tracking branch 'zdoom/master' into openal
2014-07-27 06:59:26 -07:00
Christoph Oelckers
4904abfc1c
- forgot test stuff.
2014-07-27 13:47:37 +02:00
Christoph Oelckers
97341fcb31
- reenabled the flat vertex buffer for GL 3.x NVidia hardware. On AMD and Intel it'll stay off because past tests have shown that it won't improve performance at all.
2014-07-27 13:46:35 +02:00
Christoph Oelckers
c1d8f235c2
- renamed some stuff that clashed with gl function names.
2014-07-27 12:33:54 +02:00
Christoph Oelckers
77d9d9b2a5
- fixed: For updating the model VAO's attribute pointers it is necessary to first bind the vertex buffer we need to refer to, because this is not part of the VAO's state.
2014-07-27 11:53:18 +02:00
Christoph Oelckers
6d4eb7f62d
- changed handling of DF_NO_COOP_WEAPON_SPAWN dmflag so that weapons are not determined by class type but by a newly added flag WEAPONSPAWN, to allow CustomInventory replacements to act like weapons when being spawned.
2014-07-27 10:07:37 +02:00
Christoph Oelckers
e07d06fa2a
Merge branch 'master' into Glew_Version_For_Real
2014-07-26 22:26:58 +02:00
Christoph Oelckers
7ae25906fd
- fixed: fog must be disabled before drawing the HUD model, not after it.
2014-07-26 22:26:17 +02:00
Christoph Oelckers
bdf5bbd34e
- make the shader timer part of the render state.
2014-07-26 20:56:10 +02:00
Christoph Oelckers
637aa9d77e
- some adjustments to allow testing the different rendering methods.
2014-07-26 18:43:54 +02:00
Christoph Oelckers
0e647e0f2b
Merge branch 'master' into Glew_Version_For_Real
2014-07-26 10:37:00 +02:00
Christoph Oelckers
8465a5f5d7
Merge branch 'master' of https://github.com/rheit/zdoom
2014-07-26 10:23:41 +02:00
Christoph Oelckers
6c9a818220
- allow different render modes if persistent buffers are not available (untested!)
2014-07-26 10:23:07 +02:00
Christoph Oelckers
79f3984346
Merge branch 'upstream' of https://github.com/Edward850/zdoom
2014-07-26 10:17:47 +02:00
Christoph Oelckers
5576892c01
Merge branch 'redundant_offsetof_macro' of https://github.com/edward-san/zdoom
2014-07-26 10:17:25 +02:00
Christoph Oelckers
a21f01bc5f
- added jpalomo's submission to make freelook a 3-state setting, like crouch and jump. This required moving around the flags a bit so demo compatibility had to be bumped. It may also require adjustment for launchers that can set the dmflags.
2014-07-26 10:15:07 +02:00
Edward Richardson
0276760a2d
Animate switches when bumped
2014-07-19 21:00:12 +12:00
Edoardo Prezioso
ae2f7b8707
- Remove a duplicate of a custom offsetof macro.
...
It's already defined in cmdlib.h .
2014-07-19 00:53:18 +02:00
Edoardo Prezioso
484eb347ca
- Fixed: wrong FString empty string check.
...
Even when '+logfile' argument was omitted, the console would print 'Could not start log', because 'logfile != NULL' was used as a check for the presence of '+logfile' argument, but the internal buffer of FString is never NULL, so the right check is 'logfile.isNotEmpty()'.
While I'm at it, I fixed another bad check for 'pagename'.
2014-07-18 01:15:41 +02:00
Christoph Oelckers
e0b756e511
- fixed: The cubemapped skybox renderer did not set up the model matrix properly.
2014-07-17 10:04:20 +02:00
Christoph Oelckers
f64428dd2a
Merge branch 'master' into Glew_Version_For_Real
2014-07-17 09:31:18 +02:00
Christoph Oelckers
b78b566b0a
Merge branch 'master' of https://github.com/rheit/zdoom
2014-07-17 09:30:50 +02:00
Christoph Oelckers
eb9d2d9917
- reactivate compatibility profile so that immediate mode drawing can be used on older hardware not supporting persistently mapped buffers.
...
- reactivate alpha testing per fixed function pipeline
- use the 'modern' way to define clip planes (GL_CLIP_DISTANCE). This is far more portable than the old glClipPlane method and a lot more robust than checking this in the fragment shader.
2014-07-17 02:37:18 +02:00
Edward Richardson
f99a84b498
Changes to maketic/menu/console updates
...
- Console and Menu will now update cleanly during stalls.
- Moved net adaption so uncapped framerate will always use it.
2014-07-17 11:29:30 +12:00
Braden Obrzut
84cb49b074
- Fixed: Legacy render style array was in the wrong order.
2014-07-16 19:19:20 -04:00
Braden Obrzut
b6bbdf6195
- Call C_DeinitConsole in I_Quit so that we can be sure that Printf will work for as long as possible. Otherwise ZDoom will crash when ending a demo recording.
2014-07-16 18:59:49 -04:00
Chris Robinson
e8233d7e87
Merge remote-tracking branch 'zdoom/master' into openal
2014-07-16 08:31:12 -07:00
Chris Robinson
d43226631d
Set reverb density based on the environment size
2014-07-15 23:04:53 -07:00
Braden Obrzut
bd5bf2a40a
- Expand environment variables for autoload paths.
...
- Forgot to save the French translation file for the last commit, so a few more corrections there.
2014-07-15 21:26:26 -04:00
Braden Obrzut
fa5dfe79ae
- Disable cubic and spline resamplers on 64-bit with fmod 4.26 since they crash.
2014-07-15 21:07:07 -04:00
Braden Obrzut
2020769967
- Fixed: Player turned into a zombie if exiting telefragged in buddha mode.
...
- Fixed: Players could drop their inventory after dying.
2014-07-15 20:16:28 -04:00
Christoph Oelckers
6b9d6787d9
- move models into their own draw list to avoid frequent buffer changes.
...
- same for SKYHACK walls. Although rare, they would get in the way of optimizing the draw calls if not being separated out.
2014-07-15 21:16:59 +02:00
Christoph Oelckers
b8bcbe819b
- removed texture based dynamic lighting. For GL 3.x the shader approach is always better.
...
- fixed: sky fog was not unset.
2014-07-15 20:49:21 +02:00
Christoph Oelckers
fb6b4238ed
- fixed: glProgramUniform is only present from GL 4.1 or a specific extension so it may not be used on systems not supporting it.
2014-07-15 02:48:59 +02:00
Christoph Oelckers
fc0cf4f998
- GZDoom now runs on an OpenGL core profile. :)
...
It's probably still necessary to replace GLEW with another loader library. GLEW is pretty much broken on core OpenGL without some hacky workarounds...
2014-07-15 02:26:23 +02:00
Christoph Oelckers
6046b11b4f
- all shaders now compile in core profile.
2014-07-15 01:05:53 +02:00
Christoph Oelckers
eedc5a69be
- replaced builtin position vertex attribute.
2014-07-15 01:02:48 +02:00
Christoph Oelckers
1b7f5a2e6a
- replaced builtin texture coordinate vertex attribute.
2014-07-15 00:59:01 +02:00
Christoph Oelckers
5a322742c3
- remove use of builtin and deprecated color vertex attribute.
2014-07-15 00:37:13 +02:00
Christoph Oelckers
ed8a21fd86
- replaced deprecated alpha testing with shader code.
2014-07-14 21:14:43 +02:00
Christoph Oelckers
84a49e37ee
- handle normals for spheremapped mirror surfaces using non-deprecated features.
...
- move all WGL references out of global header files so that global wgl header include is no longer necessary
2014-07-14 19:54:07 +02:00
Christoph Oelckers
ed5ee4e8d1
- removed some obsolete init stuff and some deprecated constants.
2014-07-14 18:48:46 +02:00
Christoph Oelckers
4df25d951b
Merge branch 'master' into Glew_Version_For_Real
2014-07-14 16:51:41 +02:00
Christoph Oelckers
4297bd9a51
Merge branch 'master' of https://github.com/rheit/zdoom
2014-07-14 00:32:16 +02:00
Christoph Oelckers
1f2f7616e1
- remove timing of matrix application method
2014-07-14 00:31:10 +02:00
Christoph Oelckers
150135a07d
- reinstate drawcall timing.
2014-07-13 23:14:28 +02:00
Christoph Oelckers
ce3653f6e1
- remove all uses of builtin matrices.
2014-07-13 23:13:40 +02:00
Christoph Oelckers
2214c0ac06
- remove all uses of builtin matrix manipulation. Only glLoadMatrix for view and projection matrix are left.
2014-07-13 22:37:34 +02:00
Christoph Oelckers
dbb05c5f33
- remove use of builtin texture matrices.
...
- make matrix class single precision.
2014-07-13 20:41:20 +02:00
Christoph Oelckers
9230a20f18
- added some checks to the wall rendering code that will allow to disable the clip planes in many cases, even when a plane mirror portal is active. This also solves the precision issue with using world coordinates for clip checks.
2014-07-13 17:15:17 +02:00
Christoph Oelckers
00fcf4bc06
- for some reason using world coordinates for clipping in the shader is somewhat imprecise so the clip plane heights have to be adjusted a bit for it.
2014-07-13 13:25:42 +02:00
Christoph Oelckers
d868f60f6c
- since the clip planes for plane mirrors did not work anymore I reimplemented them using shader based logic. It still needs to be seen if this affects performance on older hardware.
2014-07-13 12:14:12 +02:00
Christoph Oelckers
004cf5748c
- fixed: FraggleScript's SpawnedThings array must always be checked for owned inventory items. The 'mapthingnumexist' function forgot to do that.
2014-07-13 09:43:28 +02:00
Christoph Oelckers
400a573e65
- fixed: ACS's LineAttack function with a valid tid still used the activator as the attack's source.
2014-07-13 09:12:46 +02:00
Edward Richardson
e1130b860e
Serialize FriendPlayer
2014-07-13 14:44:22 +12:00
Christoph Oelckers
7cbffc7c14
- test code removal.
2014-07-10 10:35:02 +02:00
Christoph Oelckers
a936629cec
- use default fragment shader for burn and stencil shader, with the time consuming parts disabled by a #define, to avoid code duplication.
2014-07-10 10:33:07 +02:00
Christoph Oelckers
e691341541
Merge branch 'master' of https://github.com/rheit/zdoom
2014-07-09 09:16:30 +02:00
Christoph Oelckers
e1729a9ec2
- fixed compilation with VC++2005 solution.
...
hu_stuff.h defined some callbacks for qsort without STACK_ARGS which causes problems with this solution's Release setting which uses __fastcall calling convention.
2014-07-09 09:15:51 +02:00
Chris Robinson
1aaaac900d
Merge remote-tracking branch 'zdoom/master' into openal
2014-07-01 22:14:49 -07:00
Edoardo Prezioso
d83f048858
- Miscellaneous CMakeLists.txt fixes.
...
- fixed a CMake warning about uninitialized use of the variable CROSS_EXPORTS in the tools subfolder when CMAKE_CROSSCOMPILING is off;
- fixed a variable typo: CMAKE_CURRENTY_BINARY_DIR instead of CMAKE_CURRENT_BINARY_DIR;
- in src/CMakeLists.txt, fixed a missing merge of a portion of code from maint branch to master.
2014-07-01 19:13:05 +02:00
Christoph Oelckers
92185f96eb
- fixed overflow with storing a sprite's dynamic light color in a PalEntry.
2014-07-01 09:52:41 +02:00
Christoph Oelckers
9a6bc64381
- use vertex array objects to manage vertex buffers.
2014-07-01 00:51:02 +02:00
Christoph Oelckers
5ee626459d
- use model vertex buffer to render voxels.
2014-06-30 18:57:24 +02:00
Christoph Oelckers
f710518903
- use a uniform array to store vertex data to render dynamic stuff on GL 3.x hardware without the ARB_buffer_storage extension.
...
Due to the way the engine works it needs to render a lot of small primitives with frequent state changes.
But due to the performance of buffer uploads it is impossible to upload each primitive's vertices to a buffer separately because buffer uploads nearly always stall the GPU.
On the other hand, in order to reduce the amount of buffer uploads all the necessary state changes would have to be saved in an array until they can finally be used. This method also imposed an unacceptable overhead.
Fortunately, uploading uniform arrays is very fast and doesn't cause GPU stalls, so now the engine puts the vertex data per primitive into a uniform array and uses a static vertex buffer to index the array in the vertex shader.
This method offers the same performance as immediate mode but only uses core profile features.
2014-06-30 18:10:55 +02:00
Christoph Oelckers
6efefd9b7f
- use vertex buffer to render MD3 models.
2014-06-30 18:02:52 +02:00
Christoph Oelckers
54297acde4
- removed obsolete gl_lightbuffer code.
...
This never worked properly and by now far better options are available to solve the problem of dynamic light data uploads.
2014-06-30 13:30:10 +02:00
Christoph Oelckers
9c5cec0056
- draw wipes with buffers
...
Only two things left that still use immediate mode directly: MD3 models and voxels.
2014-06-30 10:05:15 +02:00
Christoph Oelckers
1efc2938b7
- implement model vertex buffer and draw MD2 models using it instead of using the GLCommands from the model.
2014-06-29 23:24:16 +02:00
Christoph Oelckers
dd05e564cf
- this needed more fixes...
2014-06-29 14:32:50 +02:00
Christoph Oelckers
2cd1118aad
Merge branch 'master' into Glew_Version_For_Real
2014-06-29 14:11:03 +02:00
Christoph Oelckers
a33b49c2c2
Merge branch 'master' of https://github.com/rheit/zdoom
2014-06-29 14:09:55 +02:00
Christoph Oelckers
9d1dbf4eab
- fixed: FBufferedUniform1f didn'T work because it used an int as its buffered value.
2014-06-29 14:08:44 +02:00
Christoph Oelckers
d0e551060d
- fixed: When the 3D floor init code was updated 5 years ago for Vavoom's latest changes to its 3D-floor implementation it accidentally set the 3D-floor's alpha as its desaturation.
2014-06-29 12:50:42 +02:00
Christoph Oelckers
ffcb6cb70a
- added second vertex coordinate attribute for model interpolation.
2014-06-29 11:00:21 +02:00
Christoph Oelckers
08054ddc34
Merge branch 'master' into Glew_Version_For_Real
2014-06-29 08:53:43 +02:00
Chris Robinson
90fa215da2
Replace another std::vector with a TArray
2014-06-28 23:30:58 -07:00
Chris Robinson
48df515dd1
Merge remote-tracking branch 'zdoom/master' into openal
2014-06-28 23:29:48 -07:00
Christoph Oelckers
77277f4f75
Merge branch 'master' of https://github.com/rheit/zdoom
2014-06-29 01:10:51 +02:00
Christoph Oelckers
7d7f146ce1
- fixed: transferring a translation to a missile needs to check if the missile was spawned successfully.
2014-06-28 15:21:19 +02:00
Chris Robinson
ae95a2d5cf
Fix creating effect map entries
...
TMap apparently doesn't clear the memory for new entries like std::map...
2014-06-28 05:41:11 -07:00
Chris Robinson
6e64545725
Simplify some branching
2014-06-28 01:32:06 -07:00
Chris Robinson
7f3be7bf14
Show the name of unsupported sound formats with OpenAL
2014-06-28 01:25:25 -07:00
alexey.lysiuk
65203760a8
Fix incorrect actor flag handling on big endian platforms
2014-06-28 11:00:08 +03:00
alexey.lysiuk
7b69c60af1
Use correct 'true' keyword
2014-06-28 11:00:01 +03:00
alexey.lysiuk
e6d468eb38
Use byte swapping functions from <libkern/OSByteOrder.h> on OS X
...
Remove inclusion of Core Foundation headers to avoid type conflicts with LZMA SDK.
2014-06-28 10:59:56 +03:00
Chris Robinson
afcada4a3b
Remove an unused field
2014-06-28 00:46:45 -07:00
Chris Robinson
7908116fef
Use a separate function to update an openal stream's volume
2014-06-28 00:37:12 -07:00
Chris Robinson
c73d97af44
Use TArray and TMap instead of std::vector and std::map
2014-06-28 00:33:15 -07:00
Chris Robinson
a630c47e6a
Remove a redundant call
2014-06-27 22:09:03 -07:00
Chris Robinson
d55dfcdb1d
Pass the correct size to LoadSoundVoc
2014-06-27 22:05:11 -07:00
Chris Robinson
6f8545e694
Use a TArray for SoundDecoder::readAll
2014-06-27 21:51:05 -07:00
Chris Robinson
a16f9d061c
Work around a libsndfile bug related to converting float samples to shorts
...
Do the conversion ourselves to ensure it's properly clamped.
2014-06-27 01:29:34 -07:00
Braden Obrzut
d941203ab0
- Fixed edward-san's typo.
...
- Cleared a warning.
2014-06-26 20:37:11 -04:00
Chris Robinson
1a40c95f84
Rename some FMOD references to be generic sound system
...
Since they relates to other sound backends as well, there's no need to single
out FMOD in these places.
2014-06-26 16:58:18 -07:00
Christoph Oelckers
28afd04aef
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
src/CMakeLists.txt
2014-06-27 01:10:09 +02:00
Braden Obrzut
19415668ec
Merge branch 'gcc_aggressive_optimization' of github.com:edward-san/zdoom into edward-san-gcc_agressive_optimization
2014-06-26 18:11:32 -04:00
Braden Obrzut
1ae53473ff
Merge branch 'edward-san-cmake_gcc_compatible'
2014-06-26 17:54:48 -04:00
Braden Obrzut
cb9877e7ff
- Using USE_WINDOWS_DWORD on other platforms can cause problems.
2014-06-26 17:52:26 -04:00
Christoph Oelckers
0cb1547890
Merge branch 'master' of https://github.com/rheit/zdoom
2014-06-26 09:45:27 +02:00
Christoph Oelckers
270541f942
fixed compilation with latest LZMA SDK on Windows.
...
LZMA SDK recently added an #include <windows.h> to its headers, meaning it's no longer safe to include its headers globally in platform independent files.
The following changes were necessary:
- rename DWORD type in zipdir.c
- add USE_WINDOWS_DWORD and reorder includes in file_7z.cpp
- wrap LZMA decoder stream into a local struct that's declared anonymously in files.h and adjust files.cpp for this change.
2014-06-26 09:43:51 +02:00
Chris Robinson
0adfdf31dd
Fix calling SetPosition when not playing
2014-06-25 21:50:52 -07:00
Chris Robinson
a6900b48ba
Use AL_SOFT_deferred_updates to sync updates when availeble
2014-06-25 21:48:13 -07:00
Chris Robinson
c6bb52c866
Get the length from sounds when possible
2014-06-25 21:14:35 -07:00
Chris Robinson
fd25ec2a62
Implement GetPosition for OpenAL streams, and display it in the stats
2014-06-25 20:03:24 -07:00
Chris Robinson
d761dd1ff6
Merge remote-tracking branch 'zdoom/master' into openal
2014-06-25 17:37:20 -07:00
Chris Robinson
3d33f565a4
Use a proper, more unique, pointer formatter for the open callback
2014-06-25 17:10:17 -07:00
Edoardo Prezioso
1a3ac9d0b3
- Simplify CMake GCC and Clang checking.
...
Introduce the variable 'ZD_CMAKE_COMPILER_IS_GNUC(XX)_COMPATIBLE' and replace any occurrence of '"${CMAKE_C(XX)_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C(XX)_COMPILER_ID}" STREQUAL "Clang"' with it. This makes it possible to add more GCC compatible compilers in just one place.
2014-06-26 01:23:41 +02:00
Chris Robinson
7f5b538110
Implement SetPosition for OpenAL streams
2014-06-25 04:59:18 -07:00
Chris Robinson
9c12abeb2d
Better report the amount buffered in an OpenAL stream
2014-06-25 04:53:08 -07:00
Chris Robinson
0017e1e6e8
Use a FileReader to handle music resources and audio decoding
...
Instead of the previous method where there'd be a filename and offset, and/or a
memory pointer, this uses a class to access resource data regardless of its
underlying form.
2014-06-25 04:25:36 -07:00
Edoardo Prezioso
0e3bee6f30
- Enable 'language' feature on unix targets.
...
The sdl version of the function 'SetLanguageIDs' is very limited, comparing to the win32 counterpart, as it will try to accept only the language codes (ie 'enu', 'fr', 'ptb', etc). If a different string is provided, zdoom will default its language to English.
2014-06-23 20:02:40 +02:00
Christoph Oelckers
e15f80f640
Merge branch 'master' of https://github.com/rheit/zdoom
2014-06-23 09:27:30 +02:00
Christoph Oelckers
e2e71e072e
removed error suppression code from shader compilation.
...
With GL 2.x support the engine still had something to fall back on, with that removed it needs to abort.
2014-06-23 09:26:29 +02:00
Chris Robinson
075c5d872d
Always use the pitch multiplier when underwater
2014-06-22 22:22:45 -07:00
Chris Robinson
b2f9430fb1
Use the correct diffusion value for reverb
...
I don't know what the Density and Diffusion values correspond to, but
EnvDiffusion is the actual diffusion setting.
2014-06-22 19:38:47 -07:00
Chris Robinson
a434af92ee
Handle sounds marked as 'area sounds'
...
Note, the area radius is 128 units for it to actually do something, unlike FMOD
where it's only 32.
2014-06-22 19:35:09 -07:00
Christoph Oelckers
4f599b7b4d
Merge branch 'master' of https://github.com/binarycrusader/zdoom
2014-06-22 09:00:23 +02:00
Christoph Oelckers
e56e525d0f
- A_FireCustomMissile transfer tranlsation flag, code submission by jpalomo
2014-06-22 08:55:21 +02:00
Shawn Walker
6164807e97
- fix x64 visual studio linking for common controls
2014-06-21 22:49:42 -07:00
Christoph Oelckers
1f0c69a0e9
- some cleanup after GL 2.x code removal
...
- reinstated burn warp with shader based code.
2014-06-21 16:41:45 +02:00
Christoph Oelckers
2925c96b59
removed all GL 2.x code.
...
After thinking about it for a day or so I believe it's the best option to remove all compatibility code because it's a major obstacle for a transition to a core profile.
2014-06-21 15:50:32 +02:00
Christoph Oelckers
d5dceb6874
- changed alpha texture handling to avoid using the deprecated GL_ALPHA8 texture format unless we have a compatibility context of an older GL version.
2014-06-21 12:52:19 +02:00
Chris Robinson
845e369b87
Don't set a room rolloff factor
...
The reverb engine already handles an initial attenuation based on the
attenuation of the dry path.
2014-06-20 05:03:20 -07:00
Chris Robinson
f0c9aae670
Rework manual rolloff handling
...
For distance models OpenAL doesn't handle, alter the source's distance to get
the appropriate attenuation instead of the source's gain.
2014-06-20 04:38:48 -07:00
Chris Robinson
ef7ce41d07
Don't purge sources in an initial state
2014-06-20 01:17:48 -07:00
Chris Robinson
fb07f7ef07
Cast OpenAL IDs to/from void*
2014-06-20 01:12:47 -07:00
Chris Robinson
906b828d87
Partially implement OpenALSoundRenderer::SetInactive
2014-06-20 00:41:19 -07:00
Chris Robinson
42fdc3c059
Use structs to store available extensions
2014-06-19 23:49:46 -07:00
Chris Robinson
0f234fb36d
Remove an unused function
2014-06-19 23:10:36 -07:00
Chris Robinson
4f6861d798
Move specific decoder classes to separate headers
2014-06-19 23:03:13 -07:00
Chris Robinson
e2708c8b3e
Cleanup creating decoders
2014-06-19 22:46:46 -07:00
Chris Robinson
9f493fca5f
Move the generic DecodeSample implementation to the base class
2014-06-19 22:42:12 -07:00
Chris Robinson
72ddc0d935
Remove a non-existent friend class
2014-06-19 22:33:39 -07:00
Chris Robinson
a661797aa8
Be less noisey about loop points
2014-06-19 22:31:19 -07:00
Chris Robinson
73d8659f23
Remove an unnecessary cast
2014-06-19 22:21:05 -07:00
Chris Robinson
07a50c604e
Use the correct formatter type
2014-06-19 22:13:20 -07:00
Chris Robinson
e39165655d
Don't call the sfx volume cvar callback in the OpenALSoundRenderer constructor
...
I_InitSound already does that after creating it.
2014-06-19 21:51:16 -07:00
Chris Robinson
364065f121
Handle file sources with mpg123
2014-06-19 20:14:16 -07:00
Chris Robinson
1310a4a814
Fix libsndfile file handler
2014-06-19 18:35:12 -07:00
Chris Robinson
eeae36fbf7
Rename the decoder sources
2014-06-19 17:53:37 -07:00
Chris Robinson
b1c98acf33
Close the file handle in the sndfile decoder
2014-06-19 17:50:03 -07:00
Chris Robinson
73d51a4446
Check for ID3 tags in MPG123Decoder::open
2014-06-19 17:19:59 -07:00
Christoph Oelckers
ca76c2525e
- more vertex buffer stuff for models, still not tested.
2014-06-19 22:24:33 +02:00
Christoph Oelckers
5944894138
- create vertex buffer data for MD2/DMD models.
2014-06-19 17:06:26 +02:00
Chris Robinson
77b1febd0e
Add an mp3 decoder using libmpg123
...
Does not currently handle direct file sources
2014-06-19 06:40:27 -07:00
Christoph Oelckers
3e9b9c280b
- initialize model data at engine start, not at level start.
2014-06-19 15:22:00 +02:00
Christoph Oelckers
412d6499d9
- removed the voxel vertex buffer because it needs to be gone before implementing a model vertex buffer.
2014-06-19 14:46:55 +02:00
Christoph Oelckers
03916d75de
- cleaned up MD3 rendering and merged RenderFrame and RenderFrameInterpolated into one function.
2014-06-19 13:58:49 +02:00
Christoph Oelckers
59522f7065
- simplified MD2 drawing code as preparation for a buffer based implementation.
2014-06-19 13:37:30 +02:00
Chris Robinson
14618cbf30
Remove use of SDL_sound
2014-06-19 04:33:00 -07:00
Chris Robinson
b38589e2dc
Implement and use a libsndfile decoder
2014-06-19 04:13:42 -07:00
Christoph Oelckers
6457ced53f
Merge branch 'master' into Glew_Version_For_Real
2014-06-19 11:57:36 +02:00
Christoph Oelckers
7374cd34cf
Merge branch 'master' of https://github.com/darealshinji/gzdoom
2014-06-19 11:20:47 +02:00
Christoph Oelckers
d30bf6768e
Merge branch 'master' of https://github.com/rheit/zdoom
2014-06-19 11:20:38 +02:00
darealshinji
7757755e40
fix detection of libglew library on GNU/Linux
2014-06-19 10:43:37 +02:00
Chris Robinson
5370a1cb46
Add a SoundDecoder base class and a stub method to create one
2014-06-19 01:00:46 -07:00
Chris Robinson
b94a2949e5
Don't use air absorption for being underwater
2014-06-18 23:41:45 -07:00
Chris Robinson
34c9a47435
Fix some typos
2014-06-17 23:11:19 -07:00
Chris Robinson
cd550cf9b6
Merge remote-tracking branch 'origin/master' into openal
2014-06-17 22:08:03 -07:00
Edward Richardson
2d896d2b47
Added wi_autoadvance
...
- Prevents an absent player from stopping the intermission
2014-06-17 20:26:49 +12:00
Edward Richardson
a3a7ee569f
Multi-intermission waits for all players + changes
...
- Added a segment of code that now makes the intermission wait for all
players before advancing, instead of continuing on any player. A "ready
icon" shows to reflect this.
- The Deathmatch intermisson couldn't show the ready icon (because it
just used the ingame scoreboard), so a proper intermission was added,
which reflects the same design as the coop scoreboard.
- The colour column wasted more space then it should have needed, so it
was replaced with player colour backgrounds.
- Slight y offset adjustments to make everything fit in 320x200
properly.
2014-06-17 19:46:10 +12:00
Christoph Oelckers
13c4e993ba
Merge branch 'master' into Glew_Version_For_Real
2014-06-15 21:57:59 +02:00
Christoph Oelckers
5a0f1a882a
Merge branch 'master' of https://github.com/rheit/zdoom
2014-06-15 21:57:06 +02:00
Christoph Oelckers
965a2a2d79
definition for model vertex buffer.
2014-06-15 21:56:37 +02:00
Chris Robinson
7ff7c151a8
Merge remote-tracking branch 'origin/master' into openal
...
Conflicts:
src/CMakeLists.txt
2014-06-15 12:04:15 -07:00
Chris Robinson
82de7e6357
Convert line-endings
2014-06-15 11:36:49 -07:00
Christoph Oelckers
e6f14b055a
- use buffer based rendering for dynamic light pass and horizon portals.
2014-06-15 20:28:23 +02:00
Chris Robinson
0e21057a2a
Merge remote-tracking branch 'origin/openal' into openal
...
Conflicts:
src/sound/fmodsound.cpp
src/sound/oalsound.cpp
src/sound/oalsound.h
2014-06-15 09:59:24 -07:00
Chris Robinson
160e70f8f2
Fix getting the actual device name
2014-06-15 09:27:00 -07:00
Edward Richardson
2838c4b25b
Prediction was rebuilding too much thinglist data
...
- Stopped player prediction from rebuilding more sector list data then
the player originally had.
2014-06-16 03:34:33 +12:00
Christoph Oelckers
1aaa1b7bad
- removed gl_usevbo CVAR because with recent code changes it has become useless. If GL_ARB_buffer_storage is present, buffers will always be used.
2014-06-15 12:12:24 +02:00
Christoph Oelckers
ea332383a8
- convert skybox rendering to use the buffer interface.
2014-06-15 11:50:54 +02:00
Christoph Oelckers
6b038a5dae
- fixed: GLPortal::DrawPortalStencil must apply the render state before drawing anything.
2014-06-15 10:30:03 +02:00
Christoph Oelckers
2abf1644a4
- fixed: Plane height changes only updated the first buffered vertex for the respective plane.
2014-06-15 10:18:46 +02:00
Christoph Oelckers
1b91a8f88c
- removed old immediate mode path for generating stencils.
2014-06-15 10:15:44 +02:00
Christoph Oelckers
3644073bbd
- use a software buffer for immediate mode rendering. This allows using the regular buffer code to collect data for both render modes and allows removal of a lot of duplicated code.
2014-06-15 01:14:41 +02:00
Christoph Oelckers
5b302ed3a6
- added benchmarking calls for glDrawArrays to see how well issunig draw calls performs on different hardware.
2014-06-14 15:16:33 +02:00
Christoph Oelckers
0ce6b40672
- fixed compile error in gl_skydome.cpp
...
- disable GL_ARB_buffer_storage when a -glversion parameter less than 4.0 is given. According to the spec this extension requires 4.0 so if emulating something lower it should not be used.
2014-06-14 14:58:17 +02:00
Christoph Oelckers
5e22c82e79
- use buffer for rendering the sky on all GL versions since the differences for making GL2.0 work are rather small.
2014-06-14 10:38:30 +02:00
Christoph Oelckers
4ad1e0b4cb
Merge branch 'master' into Glew_Version_For_Real
2014-06-14 01:24:45 +02:00
Christoph Oelckers
8d9a90cd22
- rewrote sky dome rendering to use a static vertex buffer if not on OpenGL 2.x.
2014-06-14 01:24:28 +02:00
WChrisK
67c6690689
Added a check that doesn't print empty obituary strings, as wad's that hide obituary strings in multiplayer games end up spamming a lot of empty lines.
2014-06-11 23:30:25 -04:00
Christoph Oelckers
3c0ba494f9
Merge branch 'master' of https://github.com/rheit/zdoom
2014-06-11 18:58:42 +02:00
Edward Richardson
842ef86e73
Don't reset the inventory of dead players
2014-06-09 19:54:40 +12:00
alexey.lysiuk
20adcecb1d
Remove redundant saving of GL nodes if they were loaded from cache
2014-06-02 10:54:52 +02:00
alexey.lysiuk
3e7b0c2916
Fix crash when GL nodes file cannot be opened for writing
...
Report errors to console if nodes file cannot be opened or written
2014-06-02 10:53:29 +02:00
Christoph Oelckers
9cd074ddf3
- fixed: plane equation vectors must be normalized when being loaded from UDMF.
2014-06-02 10:51:17 +02:00
alexey.lysiuk
96e4cb90b7
Fix crash on attempt to save cached OpenGL nodes on OS X
...
Root permissions are required to be able to create directories inside /Library/Application Support
So user's ~/Library/Application Support is used to store cached nodes
2014-06-01 15:12:41 +03:00
Christoph Oelckers
2ad47935ef
Merge branch 'master' into Glew_Version_For_Real
2014-06-01 12:43:17 +02:00
Christoph Oelckers
7fedaf9221
Merge branch 'master' of https://github.com/rheit/zdoom
2014-06-01 12:39:13 +02:00
alexey.lysiuk
a26fbc74f0
Fix compilation errors in latest texture-related changes
...
GCC and Clang complain about non-POD type passed to variadic function.
2014-06-01 10:27:16 +03:00
Edward Richardson
3817bed0b3
Weap scroll could sometimes miss sameslot weapons
...
In rear cases, when using next/prevweap, defined weapons in the same
slot couldn't cycle when looping to another when you only had weapons in
1 slot.
2014-06-01 18:13:47 +12:00
Christoph Oelckers
d925279bef
- fixed texture name handling in GL related texture classes for recent changes in ZDoom to eliminate the 8 character name limit.
2014-06-01 00:04:28 +02:00
Christoph Oelckers
3c5d07e9c6
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-31 11:05:44 +02:00
Christoph Oelckers
c39318f406
- use vertex buffer and reuse of data for stencil drawing. A stencil needs to be drawn multiple times with the same polygons so this is a good place to optimize.
2014-05-31 09:32:17 +02:00
Christoph Oelckers
8f5683e23d
- moved secret found message to string table and removed the CVAR crutch that dates from a time when modifying string table content wasn't as easy as it is now.
...
- added 'showsecretsector' CVAR to show the sector number with the secret found message.
2014-05-29 17:50:14 +02:00
Christoph Oelckers
75cde0b221
- allow locks to check for a key's species so that newly defined keys can open previously defined locks without the need to redefine them.
2014-05-29 17:30:01 +02:00
Edoardo Prezioso
72bbb19cc7
- Shut up GCC aggressive optimizer warnings.
...
From what I can see, GCC would miscompile the involved loops, because the index variable is 'signed int' and the multiplication with an unsigned would cause signed overflow (undefined behavior). Change the index variable type to 'unsigned int' to expect unsigned overflow (conformant to standard).
2014-05-25 10:11:09 +02:00
Edoardo Prezioso
b285cbebe4
- Fixed compiler errors in latest TEXTURES code.
2014-05-25 01:12:16 +02:00
Christoph Oelckers
9d846395bc
- replaced console buffer with a significantly more efficient new version that also can hold a lot more data.
2014-05-24 21:05:00 +02:00
Christoph Oelckers
a1ec6ab1ba
- fixed some Linux warnings.
2014-05-24 16:53:57 +02:00
Christoph Oelckers
e813ddf251
- fixed bad comparison.
2014-05-24 16:47:34 +02:00
Shawn Walker
01e909070a
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-23 19:08:56 -07:00
Christoph Oelckers
12c038a234
Merge branch 'master' into Glew_Version_For_Real
2014-05-21 15:26:22 +02:00
Christoph Oelckers
360e7d17f2
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-21 15:25:56 +02:00
Christoph Oelckers
54425ee2ef
- fixed: Desaturation factor was applied incorrectly.
...
- Also fixed some very strange thing in the shader's desaturate function. For unknown reasons using the 'mix' function there did not work.
- fixed: The fog boundary special shader could not be used.
2014-05-21 13:40:46 +02:00
Christoph Oelckers
0cf37f2e51
- fixed problem with selecting special shaders.
2014-05-21 12:36:29 +02:00
Christoph Oelckers
f5ea31b518
- use vertex buffer for all the common 2D rendering functions.
2014-05-21 00:36:04 +02:00
Christoph Oelckers
09ba62fbef
- put all the common part of buffer based drawing into a separate method of the vertex buffer.
2014-05-20 22:37:38 +02:00
Christoph Oelckers
23fbd69963
- 4 more places where immediate mode drawing has been substituted with a buffer-based alternative.
2014-05-20 22:20:15 +02:00
Christoph Oelckers
261bc77846
- fixed: when bringing up a new weapon the current flash state needs to be removed.
...
Especially when dropping the current weapon it can still be active, this is most easily observed with Strife's crossbow which loops the flash state, but it also can happen with other weapons, right after shooting.
2014-05-20 10:29:27 +02:00
Christoph Oelckers
8ec95dc58e
- fixed a few places in the savegame code where map names were still truncated to 8 characters.
2014-05-20 10:14:44 +02:00
Shawn Walker
582b1990b7
- restore original line endings
2014-05-18 16:00:31 -07:00
Shawn Walker
d2b0596cd4
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-18 15:39:41 -07:00
Shawn Walker
59885b856d
- remove texture name length limits for udmf maps
2014-05-18 15:38:46 -07:00
Christoph Oelckers
6e6be8ed5b
Merge branch 'master' into Glew_Version_For_Real
2014-05-18 12:47:48 +02:00
Christoph Oelckers
e84dc99475
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-18 12:46:28 +02:00
Christoph Oelckers
4acc04ce68
- don't truncate map names stored in demos.
2014-05-18 10:05:35 +02:00
Christoph Oelckers
cfef894867
This can be done better...
2014-05-18 09:41:13 +02:00
Edward Richardson
26b1abe3da
Fix netgame arbitration with long map lump names
2014-05-18 18:38:54 +12:00
Christoph Oelckers
ff7913ace8
- fixed: When a level gets loaded the renderer's sky variables need to be set.
2014-05-17 09:46:58 +02:00
Shawn Walker
ae8995e65b
Merge branch 'master' of https://github.com/rheit/zdoom
...
# By Christoph Oelckers (2) and Edward Richardson (1)
# Via Christoph Oelckers
* 'master' of https://github.com/rheit/zdoom :
- fixed: The map setup code was still truncating texture names in several places.
Fix nettic run-out at end of demo playback
- fixed: ACS's check...Texture functions must use the same search flags as the texture initialization code in p_setup.cpp and p_udmf.cpp. It also should not create textures that don't exist yet. We are only doing a comparison so it's not relevant if the texture exists or not.
2014-05-16 20:27:57 -07:00
Christoph Oelckers
8443de3f33
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-16 22:50:12 +02:00
Christoph Oelckers
e92032e8ff
- fixed: The map setup code was still truncating texture names in several places.
2014-05-16 22:48:37 +02:00
Christoph Oelckers
76b4ff143f
Merge branch 'upstream' of https://github.com/Edward850/zdoom
2014-05-16 15:56:32 +02:00
Edward Richardson
d3dcc04666
Fix nettic run-out at end of demo playback
2014-05-17 00:36:43 +12:00
Christoph Oelckers
25f4af734f
- fixed: ACS's check...Texture functions must use the same search flags as the texture initialization code in p_setup.cpp and p_udmf.cpp. It also should not create textures that don't exist yet. We are only doing a comparison so it's not relevant if the texture exists or not.
2014-05-16 10:56:23 +02:00
Shawn Walker
49e0eb03cc
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-15 22:55:35 -07:00
Christoph Oelckers
bf6a193e5b
- fixed: The episode parser was still truncating its map names to 8 characters.
2014-05-15 20:29:36 +02:00
Christoph Oelckers
03d4f23a6e
- made adjustments to the texture loading code to account for the recent changes to handle long texture names.
2014-05-15 19:27:22 +02:00
Christoph Oelckers
4e64ad847b
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-15 09:46:47 +02:00
Shawn Walker
bfb5944517
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-15 00:11:52 -07:00
Christoph Oelckers
e3cd144af9
- one last GCC compile problem.
2014-05-14 17:27:22 +02:00
Christoph Oelckers
adcdc11360
- GCC compile fix.
2014-05-14 15:44:05 +02:00
Christoph Oelckers
2944e4f6ae
- fixed some Linux issues with recent changes.
2014-05-14 14:08:14 +02:00
Christoph Oelckers
85fb8c4326
- fixed: _M_X64 macro was misnamed _M_IX64.
2014-05-14 13:04:47 +02:00
Christoph Oelckers
388f09f786
- fixed: In Heretic corpses do not get crunched to gibs, they just get their size reduced to 0. Handled by a new gameinfo flag. This also gets set for Chex quest which has the gib sprite replaced by something different. Using a Crush state will override this global flag.
2014-05-14 12:54:03 +02:00
Christoph Oelckers
47a9dab56d
- allow setting sector planes' plane equations directly from UDMF.
2014-05-14 12:16:33 +02:00
Christoph Oelckers
8c052818b7
- fixed: long texture name lookup did not work with TEXMAN_TryAny.
2014-05-14 10:27:40 +02:00
Shawn Walker
fdfcb728a9
- make it easier to spot patch definition errors in console log
2014-05-13 22:50:39 -07:00
Christoph Oelckers
a375454474
- removed 8 character limit for map names.
2014-05-14 00:52:16 +02:00
Christoph Oelckers
24886b6734
- removed the last static character arrays from FLevelLocals.
2014-05-13 23:16:13 +02:00
Christoph Oelckers
e49e926bd9
- added option to ASectorAction to remove itself upon triggering by setting the STANDSTILL flag on the map thing.
2014-05-13 21:26:51 +02:00
Christoph Oelckers
30f57c0b8e
- added new renderstyles AddStencil and AddShaded.
2014-05-13 21:16:06 +02:00
Christoph Oelckers
ca4179caa3
- allow texture lookup by full path names. Due to technical limitations this may result in double textures if the same graphics lump is also referenced by its short texture name.
2014-05-13 20:51:16 +02:00
Christoph Oelckers
ebd6c18bef
- missed one texture name field in level_info_t.
2014-05-13 15:32:54 +02:00
Christoph Oelckers
a22670626c
- expanded names for view border elements. Also fixed the horribly bad implementation of custom borders which modified the DoomBorder elements without ever checking the game being used.
2014-05-13 13:40:02 +02:00
Christoph Oelckers
a05e62f3f7
- changed storage of lump and texture names in gameinfo to allow long names (with the exception of view border elements.)
2014-05-13 12:44:17 +02:00
Christoph Oelckers
a05e584b81
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-13 12:00:37 +02:00
Christoph Oelckers
60f0ab5f1b
- fixed Linux warning with type cast.
2014-05-13 12:00:11 +02:00
Christoph Oelckers
e718a72b4d
fixed: skies should be loaded into the FLevelLocals struct not into the global variables of the renderer.
2014-05-13 11:53:08 +02:00
Christoph Oelckers
fedf9c6a5b
fixed: if we allow long names for the fade table we must also check for them when the colormap gets loaded.
2014-05-13 11:39:25 +02:00
Christoph Oelckers
65e8563cf4
replaced all character arrays for lump/texture names in the level_info_t and FLevelLocals structures with FStrings as first preparation for allowing long texture names.
2014-05-13 11:33:59 +02:00
Christoph Oelckers
579eff5b96
- add vertex buffer based rendering for decals.
2014-05-12 22:46:30 +02:00
Christoph Oelckers
cf45f2d718
- added missing shader files.
2014-05-12 22:24:26 +02:00
Christoph Oelckers
b514a815f4
- enable use of vertex buffer for sprite rendering.
2014-05-12 20:23:54 +02:00
Christoph Oelckers
9c659b948c
- reactivated texture warping.
2014-05-12 15:13:07 +02:00
Christoph Oelckers
55d4c89753
- fixed: fog density calculation for fixed function was not correct.
2014-05-12 14:58:37 +02:00
Christoph Oelckers
4d005bdfa0
shader rework
...
All those special shaders have been merged together.
Mostly working but the non-shader lighting seems a bit broken.
2014-05-12 14:45:41 +02:00
Christoph Oelckers
98cc7eeb99
pass softlightlevel through render state.
2014-05-12 00:13:19 +02:00
Christoph Oelckers
b9a6fe80a4
Do not use the shader to handle STYLEF_RedIsAlpha.
...
Turns out that the name doesn't accurately describe what it does.
It is correct for images that come with their own palette or are true color.
But for images using the game palette it doesn't use the red channel to determine translucency but the palette index! Ugh...
This means it cannot be done with a simple operation in the shader because it won't get a proper source image. The only solution is to create a separate texture.
2014-05-11 23:56:53 +02:00
Christoph Oelckers
506798f134
allow brightmaps and fullbright objects in fog. The reasons why they were disabled no longer exist.
2014-05-11 23:12:28 +02:00
Christoph Oelckers
c47c7421a3
- route all glColor calls through render state.
...
- add sector links to dynamic lights.
2014-05-11 22:57:42 +02:00
Christoph Oelckers
978ace241c
- removed all code that mixes together the different lighting methods. Now everything goes through the 3 different light parameters in the render state.
...
- removed cm parameter from many functions.
2014-05-11 21:47:54 +02:00
Christoph Oelckers
887d35d559
- remove colormap from texture generation parameters. The one remaining special case, alpha texture on old hardware is now handled by the currently set texture mode at the time of use.
...
- use the cleaned up decal lighting code from the first GLEW branch.
2014-05-11 19:44:19 +02:00
Christoph Oelckers
7793bbbcc9
Further cleanup of lighting code.
...
- remove thing color from lighting calculations.
- implement alpha textures and inverse sprites for infrared as texture modes. This still requires some handling for the alpha texture mode for non-shader rendering because there is no way in the fixed pipeline to do it. The inverted texture effect can be done with a texture combiner.
- fixed: ThingColor for sprites was set in the wrong place. It must be in the Process function, not in the lighting calculation.
- added functions for isolated calculation of sprites' dynlight color.
2014-05-11 17:56:38 +02:00
Christoph Oelckers
607be91c48
- bad copy.
2014-05-11 16:54:11 +02:00
Christoph Oelckers
8ae97bc3e1
-looks like we still need this...
2014-05-11 16:51:33 +02:00
Christoph Oelckers
52056a05bd
- changed handling of DynLight in shader to serve as a global dynamic light color for all lighting modes.
2014-05-11 16:49:17 +02:00
Christoph Oelckers
53f4cd0108
- added objectcolor uniform. This will be used to hold the thingcolor for shader based rendering.
2014-05-11 16:06:25 +02:00
Christoph Oelckers
f3a9cb0cfa
remove special texture creation for fullscreen colormaps.
...
On GL 3.x+ this isn't needed at all and on older hardware it causes performance issues, in particular with hires textures due to impossibility of precaching.
In addition it forces some really awkward handling of lighting for things that have their own color, like stenciled sprites or particles.
With this special case gone it will be possible to handle this case in a saner manner than it is right now.
As compensation for older hardware a fullscreen blend will be drawn over the entire screen. This won't be 100% accurate but it's preferable to keeping the current method.
2014-05-11 14:46:37 +02:00
Christoph Oelckers
5947584bff
Merge branch 'master' into Glew_Version_For_Real
2014-05-11 13:29:37 +02:00
Christoph Oelckers
cd6d653b59
- fixed: the delayed state changer for the alpha function called glBlendFunc instead of glAlphaFunc.
2014-05-11 13:29:06 +02:00
Christoph Oelckers
09f4071436
Ok, it had to be done: Removed shader support for pre GLSL 1.3/GL 3.0 hardware. The compromises needed to accomodate these are just too bad and would block any attempt at streamlining the code.
2014-05-11 13:27:51 +02:00
Christoph Oelckers
92b9814460
Merge branch 'master' into Glew_Version_For_Real
2014-05-11 09:17:46 +02:00
Christoph Oelckers
a42cde0837
- removed #include of glxew.h because it's not used.
...
- removed some unused functions from gl_interface.cpp which were causing problems when compiling on Linux.
2014-05-11 09:17:18 +02:00
Christoph Oelckers
f7404d20fb
- add vertex buffer based drawing for all walls and flats.
2014-05-11 01:23:27 +02:00
Christoph Oelckers
7d3beb665b
- rewrote vertex buffer code to require GL_ARB_BUFFER_STORAGE extension.
...
This means it won't work anymore on anything that doesn't support OpenGL 4.0, but I don't think this is a problem. On older NVidia cards performance gains could not be seen and on older AMDs using the vertex buffer was even worse as long as it got mixed with immediate mode rendering.
2014-05-10 21:47:07 +02:00
Christoph Oelckers
b09405a8bd
- changed rendering of glowing walls so that it doesn't require an additional vertex attribute, just pass the floor and ceiling planes as uniforms.
2014-05-10 17:09:43 +02:00
Christoph Oelckers
64d991b9b3
Merge branch 'master' into Glew_Version_For_Real
2014-05-10 15:29:06 +02:00
Christoph Oelckers
7c180e5094
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-08 11:30:12 +02:00
Christoph Oelckers
458e1b1be2
- changed sound lookup for ZSDF dialogues so that it first checks the svox/ namespace before using the global one.
2014-05-08 11:29:45 +02:00
Christoph Oelckers
a7f8f7c18b
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-08 10:35:10 +02:00
Christoph Oelckers
ea7fb936a8
- fixed: memory allocation for file names in 7z archives was broken. Changing it to use TArray instead of alloca makes it work.
2014-05-08 10:33:32 +02:00
Christoph Oelckers
6988156d0f
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-08 09:49:00 +02:00
Christoph Oelckers
1d4ea9f162
- removed the __asm nop breakpoints for debugging. They not only do not work on non-MSVC but also not on 64 bit.
2014-05-08 09:48:39 +02:00
Christoph Oelckers
2223c12938
- added new ChangeActorAngle/ChangeActorPitch ACS functions because the new required 'interpolate' parameter cannot be added to the existing SetActorAngle/SetActorPitch functions without breaking old scripts.
2014-05-08 09:43:58 +02:00
Christoph Oelckers
63a0e01c6a
Merge branch 'interpview_optin'
2014-05-08 09:17:00 +02:00
Christoph Oelckers
67ebbe3ed4
made some changes to turn the CF_INTERPVIEW flag when changing angles into an op-in feature instead of making it automatic.
2014-05-08 09:15:56 +02:00
Christoph Oelckers
890e9ecddd
- typo in resurrection code.
2014-05-07 17:18:44 +02:00
Christoph Oelckers
fcbb72a4d4
- removed redundant variable.
2014-05-06 09:59:56 +02:00
Edward Richardson
90e9937b71
Stop NetUpdate from corrupting demo playback
2014-05-05 22:47:48 +12:00
Christoph Oelckers
93aa1ea2c4
fixed some issues with reviving monsters
...
- fixed: Thing_Raise didn't properly set the spawn health.
- fixed: Thing_Raise did not the CanRaise state flag.
- fixed: Reviving a monster must also reset the damage type.
- fixed: Thing_Raise reset the actor after calling the raise state, but it should be before, just as the Archvile code is doing.
- consolidated some common code of Thing_Raise and Archvile resurrection into AActor methods.
2014-05-05 11:24:20 +02:00
Christoph Oelckers
a4076ffe38
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-03 12:29:18 +02:00
Christoph Oelckers
a9f1b54d2d
- fixed: since A_LightGoesOut alters a sector's floor plane it must also alter the TexZ for that sector's floor.
2014-05-03 10:12:25 +02:00
Christoph Oelckers
34360e7975
Merge branch 'upstream' of https://github.com/Edward850/zdoom
2014-05-02 17:31:02 +02:00
Edward Richardson
104a07d461
Make sure use_staticrng is false if not needed
2014-05-03 03:27:14 +12:00
Edward Richardson
6183f8125f
Don't change RNG in demos incase they are static
2014-05-03 03:01:49 +12:00
Edward Richardson
d6af8dc352
Added static RNGseed control
2014-05-03 03:01:40 +12:00
Christoph Oelckers
314225f1b0
- don't depend on stdint.h because older MSVC versions do not have it.
2014-05-01 12:30:56 +02:00
Christoph Oelckers
cc4305e86c
Merge branch 'master' of https://github.com/rheit/zdoom
2014-04-30 01:29:26 +02:00
alexey.lysiuk
3af7d8a245
Added support for LZMA2 compression method in .7z archives
...
Updated LZMA SDK to version 9.20
http://www.7-zip.org/sdk.html
http://downloads.sourceforge.net/sevenzip/lzma920.tar.bz2
2014-04-27 13:05:40 +03:00
alexey.lysiuk
6b26b710b8
Added simple check for unsupported compression method in .7z files
2014-04-27 10:23:20 +03:00
alexey.lysiuk
3fa89b4e9f
Fixed crash on attempt to load corrupted data file
...
Instance of FileReader is no longer destructed when header of data file is valid but complete loading of file fails
Loading of truncated .zip file is the simplest test case
2014-04-27 10:18:50 +03:00
Gaerzi
a0d4bc0a89
Merge branch 'master' of https://github.com/rheit/zdoom
2014-04-25 01:30:03 +02:00
Christoph Oelckers
3f8c7239af
Merge branch 'master' of https://github.com/Gaerzi/zdoom
2014-04-24 09:41:54 +02:00
Gaerzi
7c3660087e
Restore shadow renderstyle.
...
It was accidentally lost in r3085.
2014-04-22 13:32:33 +02:00
Gaerzi
265917c923
Add shadow and subtract styles to ACS.
...
There is a matching pull request for rheit/acs.
2014-04-22 13:31:55 +02:00
alexey.lysiuk
1c50b5dd6f
Fixed initialization of Hexen-style things
...
Recently added pitch and roll members were not initialized with zeroes when loading Hexen-style maps
At least, hitscan attack can be fired in random direction because of this
2014-04-20 13:37:59 +03:00
Christoph Oelckers
c7354c571f
Merge branch 'master' into GLEW_VERSION
2014-04-18 12:16:12 +02:00
Christoph Oelckers
97c7f2c5ce
Merge branch 'master' of https://github.com/rheit/zdoom
2014-04-18 12:13:29 +02:00
Christoph Oelckers
7cb828d763
Merge branch 'slowstate' of https://github.com/Gaerzi/zdoom
2014-04-18 09:46:23 +02:00
Christoph Oelckers
584dd78ba9
Merge branch 'master' of https://github.com/Edward850/zdoom
2014-04-16 16:42:43 +02:00
Edward Richardson
897d87a6a3
Invisibility would could P_LookForPlayers early
2014-04-17 01:13:18 +12:00
Edward Richardson
d855bd66b3
Fixed P_LookForPlayers scanning redundancies
...
- Players could be scanned multiple times, repeating expensive tests
- Players could be skipped completely and become invisible as a result
2014-04-17 00:46:33 +12:00
Christoph Oelckers
29231fa3b7
Merge branch 'master' of https://github.com/rheit/zdoom
2014-04-16 11:34:32 +02:00
Christoph Oelckers
48b926e5b4
- check +logfile explicitly at the start of execution. Due to the custom CVAR rewrite it would get called so late that it'd miss half of the log.
...
- added version check for Windows 8. I also would have liked to add 8.1 but due to some incredibly stupid changes in the version API it's no longer possible to reliably retrieve the correct Windows version for later builds.
2014-04-16 09:53:07 +02:00
Gaerzi
83182b703d
Added slow monsters, the inverse of fast monsters
...
This is a skill setting only, no "always slow" or "never slow" actor
flags, and no DM flags.
2014-04-15 21:01:49 +02:00
Gaerzi
c54f5571ea
Typo.
2014-04-15 17:24:01 +02:00
Gaerzi
6f2fd8edbf
Hexen also needs to init 0 fields.
2014-04-15 17:22:56 +02:00
Gaerzi
8e3360453f
Hexen too.
2014-04-15 17:18:55 +02:00
Gaerzi
e5578934ad
Init new non-0 fields for non-UDMF maps.
2014-04-15 17:16:33 +02:00
Christoph Oelckers
94b06900cb
- got rid of a lot of stuff that's no longer required with GLEW.
...
- replaced GLUs texture scaling with our own function. This is only used to scale down textures larger than what the hardware can handle so we do not need a dependency to an essentially deprecated library for it.
2014-04-15 11:59:41 +02:00
Christoph Oelckers
6a3a159e09
Merge branch 'master' into GLEW_VERSION
2014-04-15 09:37:58 +02:00
Christoph Oelckers
dbefac81d8
Merge branch 'master' of https://github.com/rheit/zdoom
2014-04-15 09:26:05 +02:00
Christoph Oelckers
4e683d360d
Merge branch 'master' of https://github.com/Edward850/zdoom
2014-04-15 09:22:50 +02:00
Christoph Oelckers
2205ca606f
Merge branch 'master' of https://github.com/rheit/zdoom
2014-04-15 09:18:04 +02:00
Edward Richardson
4270838613
CANRAISE state definition
...
CANRAISE state for allowing a monster to be resurrected without an
infinite frame
2014-04-12 22:02:19 +12:00
Gaerzi
101107b1e5
Updated documentation
2014-04-12 10:55:10 +02:00
Gaerzi
4cac599b88
Less flags, more generic properties
2014-04-11 00:58:59 +02:00
Gaerzi
580094a792
More editing flags
...
PSX-inspired flags to change the render styles of monsters (and other
things).
2014-04-10 12:32:23 +02:00
Christoph Oelckers
bbb41e869c
Merge branch 'master' of https://github.com/Edward850/zdoom
2014-04-07 19:54:30 +02:00
Edward Richardson
ca93e04de3
Added GetActorPowerupTics ACS function
2014-04-07 23:23:55 +12:00
Christoph Oelckers
69af73d9b9
- alternative configuration using GLEW to get extension functions. This requires GL 2.0, though so it won't be promoted to the mainline for the time being.
...
- removed all pre GL 2.0 support.
2014-04-06 14:35:44 +02:00
alexey.lysiuk
878dcdc0a4
Fix loading of lumps from directory on OS X
...
Use POSIX-compliant opendir() / readdir() functions instead fts_open() / fts_read()
Unlike Linux version, on OS X fts_read() inserts extra slash character between source directory and traversed entry paths
2014-04-06 12:56:51 +03:00
Christoph Oelckers
d74f045004
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
game-music-emu/game-music-emu.vcproj
2014-04-05 15:37:10 +02:00
Randy Heit
940794929c
Remove more VC++ warnings
2014-04-03 17:51:15 -05:00
Randy Heit
fc97584c69
Disable warning C4200 on VC++
...
- This warning is about using zero-sized arrays in structs (aka flexible
member arrays). It's standard-enough for our purposes, so don't warn
about it, since neither GCC nor Clang do.
2014-04-03 16:50:20 -05:00
Randy Heit
43fe317dbe
Use flexible array members for structs that end with var-sized arrays
...
- Since Clang++, G++, and VC++ all support this extension (even though it's
technically officially only part of C99), use it. It lets Clang's array-
bounds checker know that these are meant to be accessed out of their so-called
"bounds".
2014-04-03 16:33:33 -05:00
Christoph Oelckers
47406a3406
- I don't think it's a good idea to put a 64 MB lookup table into the static data segment, if it's for a piece of code most people will never use...
2014-04-03 23:02:43 +02:00
Christoph Oelckers
e446a8eb30
Merge branch 'master' of https://github.com/coelckers/gzdoom
2014-04-03 22:56:50 +02:00
Gaerzi
0aba6e09f3
Disambiguate which abs type we want.
2014-04-03 20:14:38 +02:00
Christoph Oelckers
072db7920d
Merge branch 'master' of https://github.com/rheit/zdoom
2014-04-02 23:51:24 +02:00
Christoph Oelckers
59eede6e6c
Merge branch 'master' of https://github.com/coelckers/gzdoom
2014-04-02 23:49:34 +02:00
Gaerzi
7261af1d9f
Don't define HQX_API to anything on Windows
2014-04-02 20:23:17 +02:00
Edward Richardson
546ae759fd
Cleanup old prediction fix development code
2014-04-02 21:25:45 +13:00
Edward Richardson
be33d2894a
Fixed prediction thinglist order restoration
...
Prediction didn't take sector_thinglist and thinglist order into
account.
This notably broke the order in which things were damaged.
2014-04-02 21:25:12 +13:00
Gaerzi
3e41685536
Merge pull request #6 from galtgendo/for-upstream
...
use portable hqx code
2014-04-01 23:57:42 +02:00
Christoph Oelckers
a9bea7d774
Merge branch 'getsectorz_take2' of https://github.com/crimsondusk/zdoom
2014-03-31 19:12:47 +02:00
Christoph Oelckers
edcc257667
fixed: APROP_StencilColor was not implemented for CheckActorProperty.
2014-03-31 16:39:34 +02:00
Christoph Oelckers
bd3bd0ed22
Merge branch 'upstream' of https://github.com/Edward850/zdoom
2014-03-31 16:36:54 +02:00
Christoph Oelckers
e983649731
Merge branch 'master' of https://github.com/rheit/zdoom
2014-03-31 16:02:43 +02:00
Edward Richardson
016cc7ba96
Missed space in flags7 line.
2014-03-31 23:57:43 +13:00
Edward Richardson
79f6e77e2b
Remove garbage characters from info CCMD
2014-03-31 23:51:18 +13:00
Christoph Oelckers
6e87ee80e4
Merge branch 'for-upstream' of https://github.com/galtgendo/gzdoom
2014-03-29 12:04:38 +01:00
galtgendo
8f97e96af1
silence a noisy warning
2014-03-28 01:54:42 +01:00
galtgendo
4909aa750f
Use more portable hqx code from googlecode hqx
...
Conflicts:
src/CMakeLists.txt
2014-03-28 01:49:53 +01:00
crimsondusk
d7a2435703
- the ACS functions GetSectorFloorZ and GetSectorCeilingZ now interpret tag=0 as 'any sector' and return the z height of whatever sector is at those coordinates.
2014-03-27 16:34:32 +02:00
Edward Richardson
697ef02871
Added StencilColor to Set/GetActorProperty
2014-03-28 00:23:12 +13:00
Edoardo Prezioso
5789ac6245
- Fixed new[]/delete mismatch in FNodeBuilder
...
Found with address sanitizer.
2014-03-16 13:21:08 +01:00
Christoph Oelckers
f96f4cb0a2
Merge branch 'master' of https://github.com/rheit/zdoom
2014-03-15 12:24:16 +01:00
alexey.lysiuk
6aa56202b6
Fix two issues with GL nodes handling
...
Fix inability to load GL nodes for maps with names longer than 5 characters.
Fix inability to load GL nodes from external GWA files.
2014-03-15 13:17:22 +02:00
Edward Richardson
40771d22a5
Player prediction fixes in PIT_CheckThing
...
Player prediction could end up executing functions for TOUCHY things or
modify velocities when BLASTED, among other things.
2014-03-15 04:15:30 +13:00
Edward Richardson
55362d2296
Merge remote-tracking branch 'upstream/master'
2014-03-14 20:59:24 +13:00
Edward Richardson
9dad8bdbbe
Clear old camera from previous level
...
The sound code could accidentally reference an old invalid camera during
level spawn
2014-03-13 18:27:39 +13:00
Christoph Oelckers
f44dc926e6
- fixed uniqueTid logic - patch by Edward-San.
2014-03-09 10:02:07 +01:00
Edward Richardson
79abe2d4e9
Made onground a player property
...
"onground" was a global, despite being treated as a player property and
crossed with instances from other players or prediction.
2014-03-03 01:00:47 +13:00
Edoardo Prezioso
1fb757f6f1
- Fixed useless 'array != NULL' check.
...
- 'notranslate != NULL' is completely useless, because 'notranslate' is an array, hence removed.
- I interpreted 'SbarInfoScript != NULL' as a typo, since 1)in the next expression inside the condition there's a dereference to 'SBarInfoScript[SCRIPT_CUSTOM]' and 2)'SBarInfoScript[SCRIPT_CUSTOM]' is checked against 'NULL', in line 352, and then dereferenced when introducing 'cstype'.
2014-03-01 22:27:40 +01:00
Christoph Oelckers
4a23b97963
Merge branch 'master' of https://github.com/rheit/zdoom
2014-03-01 14:41:00 +01:00
Randy Heit
e7f427aa60
Merge branch 'maint'
2014-02-24 19:26:50 -06:00
Randy Heit
1d4f4b25d7
Don't free replaced textures that are used as patches.
...
- Fixed: If a part of a multipatch texture is replaced by a HIRESTEX
version, the original patch must not be deleted, since the multipatch
texture still needs it for compositing.
2014-02-24 19:01:36 -06:00
Randy Heit
5a5fb9b3d1
Clamp xy angle range in P_SetSlope()
...
- This function just assumed that every xy angle passed to it was within
the range [0,360). This is obviously bad, since anything outside that
range can result in accessing data outside the range of the finecosine
and finesine tables.
2014-02-24 18:16:18 -06:00
Randy Heit
a60918f601
Add NoPushWindowCheck compatibility flag
...
- For maps like xtheateriii that expect non-blocking push lines to
activate when you are standing on them and run into a completely different
line, there is now this compatiblity.txt-only flag.
2014-02-24 17:43:28 -06:00
Randy Heit
db4763b14a
Delay skin setting on save load until player class is known.
...
- Fixed: Loading players from savegames set the skin before their current
class was retrieved, so they could not validate their skins with the
correct class.
2014-02-24 16:27:57 -06:00
Randy Heit
7052d4e14e
Fixed: userinfo_t::SkinChanged() was unaware of player classes
2014-02-24 16:18:10 -06:00
Randy Heit
0f7ad00d9a
Ignore the minor version number when checking for DRO v1 files
...
- There exist files where the first word of the version number for DRO v1
files is not 0 but something else completely. (Maybe it's not actually a
version number?) Assume they are valid v1 files as long as the second
word is a 1.
2014-02-24 15:48:41 -06:00
Gaerzi
d430c18574
The wrong value was used here.
...
This caused crashes on some files (notably MBELLS from Cosmo and NUBC
from Body Count) in my port of this code to SLADE 3.
2014-02-24 15:37:59 -06:00
Gaerzi
c7301a0fbb
Some DOSBox Raw OPL v2 indices were off by one.
...
This caused access violation errors on perfectly fine DRO files. For
reference, scoredata[20] is the hardware type (OPL2, dual OPL2, or
OPL3).
2014-02-24 15:37:42 -06:00
rheit
3437b08c1a
Merge pull request #27 from Gaerzi/master
...
Some DOSBox Raw OPL v2 indices were off by one.
2014-02-24 15:22:20 -06:00
rheit
d0782d779d
Merge pull request #22 from edward-san/cmake_uninitialized_fix
...
- Fixed some cmake --warn-uninitialized messages
2014-02-24 15:20:56 -06:00
rheit
78f85340d8
Merge pull request #20 from edward-san/cmake_clang_flags_fix
...
- Remove clang check from GCC-related workaround
2014-02-24 15:19:35 -06:00
rheit
3111f8f93d
Merge pull request #19 from edward-san/unix_no_gtk_iwadpicker_fix
...
- Fixed scanf in IWAD picker without GTK
2014-02-24 15:18:24 -06:00
Gaerzi
9dacc9cc8d
The wrong value was used here.
...
This caused crashes on some files (notably MBELLS from Cosmo and NUBC
from Body Count) in my port of this code to SLADE 3.
2014-02-24 05:07:37 +01:00
Gaerzi
732ee11da1
Some DOSBox Raw OPL v2 indices were off by one.
...
This caused access violation errors on perfectly fine DRO files. For
reference, scoredata[20] is the hardware type (OPL2, dual OPL2, or
OPL3).
2014-02-23 23:07:10 +01:00
Christoph Oelckers
3e318e4555
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
.gitignore
src/CMakeLists.txt
2014-02-16 21:08:44 +01:00
Christoph Oelckers
861a0f0f09
Merge branch 'master' of https://github.com/Gaerzi/zdoom
2014-02-16 18:59:02 +01:00
Gaerzi
02cd6eebf4
A_Log formatted text
...
Make DECORATE version of Log consistent with ACS version.
2014-02-16 18:29:01 +01:00
Alex Qyoun-ae
dd5f273128
Added possibly missing brackets
2014-02-14 05:10:48 +04:00
Edward Richardson
0db82f02cf
P_HitWater ignore extra floors below real floor
...
P_HitWater incorrectly assumed extra floors were always above the real
floor.
2014-02-12 20:30:37 +13:00
Randy Heit
3cff307e77
Add Get/SetLineActivation ACS functions
2014-02-04 19:53:10 -06:00
Randy Heit
8b02bb55aa
Fix compiling with FMOD 4.36
...
- That stuff I thought that went poof in FMOD Ex 4.37 was apparently
already gone in 4.36.
2014-01-30 20:30:40 -06:00
Christoph Oelckers
4e53df8bca
- fixed: The 'load' command in GAMEINFO only worked if the filename contained a slash.
2014-01-26 14:32:44 +01:00
Braden Obrzut
efa9e0c3ee
Merge branch 'maint'
2014-01-18 18:10:48 -05:00
Braden Obrzut
811a75ebf6
- Minor adjustments to SDL joystick code so that all axes have at least a small deadzone so that button mapping works properly.
2014-01-18 17:54:46 -05:00
Braden Obrzut
27f6b3c9f3
Merge branch 'maint' of github.com:rheit/zdoom into maint
2014-01-18 16:23:06 -05:00
Braden Obrzut
75fd674d31
- If the player doesn't have ` bound to open the console, don't close it with that key.
2014-01-18 16:20:52 -05:00
Braden Obrzut
919b928300
- Fixed: Taking an item in a Strife dialog didn't account for items that have the keep depleted flag set.
2014-01-18 15:45:11 -05:00
Braden Obrzut
ebcd0e9c49
- Removed redundant expression in R_FindPlane.
2014-01-18 15:40:48 -05:00
Braden Obrzut
7af8b78b9f
- Applied Chilly's patch to fix excessive name change notifications.
2014-01-18 15:18:35 -05:00
Braden Obrzut
e5d7077d74
- Fixed: Shareware games couldn't bother with the actor has no frames errors since we don't load mods.
...
- Fixed: Heretic shareware used a different border for the statusbar.
2014-01-18 15:09:12 -05:00
Braden Obrzut
6f7885210b
- Fixed: Some setups require the dynamic linking library to be linked explicitly, so specify it when using DYN_FLUIDSYNTH
2014-01-18 14:58:39 -05:00
Edoardo Prezioso
70717cd2fa
- Cover the ASM_SOURCES fix for NO_ASM users too
2014-01-18 02:21:49 +01:00
Christoph Oelckers
7954263f5c
Merge branch 'master' of https://github.com/rheit/zdoom
2014-01-18 01:19:36 +01:00
Christoph Oelckers
dc8f81c2a7
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
src/sdl/iwadpicker_cocoa.mm
2014-01-18 01:18:21 +01:00
Christoph Oelckers
6824e8c931
Merge branch 'maint'
2014-01-18 01:12:06 +01:00
Christoph Oelckers
1fd1ac9bab
Merge branch 'cmake_uninitialized_fix' of https://github.com/edward-san/zdoom into maint
2014-01-18 01:10:33 +01:00
Edoardo Prezioso
b329a34a58
- Fixed some cmake --warn-uninitialized messages
2014-01-17 23:36:59 +01:00
Christoph Oelckers
e126c3ec2f
Merge branch 'maint'
2014-01-17 20:45:20 +01:00
Christoph Oelckers
9a74f96702
Merge branch 'viewpitch_overflow_fix' of https://github.com/edward-san/zdoom into maint
2014-01-17 20:43:03 +01:00
Christoph Oelckers
2d3a80fbd9
Merge branch 'cmake_clang_flags_fix' of https://github.com/edward-san/zdoom into maint
2014-01-17 20:43:00 +01:00
Edoardo Prezioso
884928687d
- Fixed overflow checking in some viewpitch code
2014-01-17 19:27:12 +01:00
Edoardo Prezioso
aafea851f0
- Remove clang check from GCC-related workaround
...
It caused a clang warning/error regarding the non-existing flags '-fno-tree-dominator-opts' and '-fno-tree-fre'.
2014-01-17 19:11:29 +01:00
Edoardo Prezioso
f51fcd90b3
- Fixed scanf in IWAD picker without GTK
...
If you try to kill the program with Ctrl-C, it would run the first IWAD available in the list instead of closing it.
2014-01-17 18:57:52 +01:00
Christoph Oelckers
af3e619232
Merge branch 'uniquetid_overflow_fix' of https://github.com/edward-san/zdoom
2014-01-16 11:38:53 +01:00
Edoardo Prezioso
2501dc6df6
Fixed signed overflow issue, which caused a non-intended aggressive optimization by GCC 4.8. Also, negative values of the 'limit' parameter in both ACS UniqueTID() and in 'utid' CCMD are ignored and replaced by 0.
2014-01-13 01:48:31 +01:00
Christoph Oelckers
725d3e3f53
Merge branch 'master' of https://github.com/Edward850/zdoom
2014-01-12 10:53:34 +01:00
Edward Richardson
6db974918a
Treat packets from unknown nodes differently
...
Instead of trying to decompress packets from unknown connections (and
failing them anyway), they are now reported and discarded without doing
anything else.
2014-01-12 18:39:19 +13:00
Braden Obrzut
db4a23e3c4
Merge branch 'origin/maint'
2014-01-10 02:19:14 -05:00
Braden Obrzut
44c4736de3
- Ignore unknown properties in the GAMEINFO lump instead of throwing an error.
2014-01-10 02:16:41 -05:00
Braden Obrzut
fa516c5ee6
- For some reason __MAC_10_6 is defined in the 10.5 SDK so use MAC_OS_X_VERSION_MAX to check SDK version instead.
2014-01-07 00:55:32 -05:00
Braden Obrzut
bbd3106cbb
Merge commit 'b3f5de356f14e2026cc9e5738e8b58e22e7daa44'
2014-01-06 04:04:51 -05:00
Braden Obrzut
d8ff4ec281
- Fixed: All clang 5.0 warnings.
...
- Renamed autostart/autozend since Xcode’s build process links in strictly alphabetical order.
2014-01-05 19:50:09 -05:00
Braden Obrzut
b3f5de356f
- Fixed: SBarInfo's gamemode command used to ignore unknowns (for cross compatibility). On top of restoring the old behavior, generate a warning for only the first ignored instance.
2014-01-05 15:46:11 -05:00
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
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
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
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
Christoph Oelckers
9ac3b6aa1b
- fixed: IsVisibleToPlayer needs to be checked for the owner of owned dynamic lights.
2013-11-30 13:15:22 +01:00
Christoph Oelckers
992994239b
- changed rules for drawing HUD sprites to match the software renderer.
2013-11-30 13:01:48 +01:00
Christoph Oelckers
228c6f976f
- fixed: the size limit for dynamic light uniforms was not checked properly, causing artifacts when there were too many dynamic lights.
2013-11-30 12:53:34 +01:00
Christoph Oelckers
12985cf635
- fixed: Particle drawing needs to apply the current fixed colormap to the particle's color.
2013-11-30 12:35:38 +01:00
Christoph Oelckers
e4282d3554
- added error check to GL getProcAddress calls to spot driver errors.
2013-11-30 12:34:55 +01:00
Christoph Oelckers
cdd0aef1ce
- fixed: HQnX must be excluded on Win64 builds.
2013-11-30 10:20:24 +01:00
Christoph Oelckers
3fbcfa7551
Merge branch 'master' of https://github.com/rheit/zdoom
2013-11-30 01:34:10 +01:00
Braden Obrzut
c04a800e2b
- When doing OLDSTYLE builds we can use the RUNTIME_OUTPUT_DIRECTORY_<CONFIG> properties to force the output location properly.
2013-11-29 17:10:29 -05:00
Christoph Oelckers
cbed4624fa
- added a user-settable factor for earthquake intensity. Value can be between 0 (no shaking) and 1 (normal shaking.)
2013-11-29 13:24:38 +01:00
Christoph Oelckers
5624b1ace0
Merge branch 'master' of https://github.com/rheit/zdoom
2013-11-29 12:53:31 +01:00
Christoph Oelckers
b9c032461e
- add a CMake option to enable/disable SSE2 with Visual C++. This is necessary because since VC 2012 SSE2 is the default instruction set.
2013-11-29 12:35:45 +01:00
Christoph Oelckers
bac9303fe4
Merge branch 'master' of https://github.com/rheit/zdoom
2013-11-29 10:09:12 +01:00
Braden Obrzut
a8090dc22c
- Remove a hardcoded "zdoom" so that the name passed into the copy operation should always match that passed to /MAP.
2013-11-29 02:09:27 -05:00
Braden Obrzut
c21beb0b6c
- Fixed: Some versions of Visual Studio put the map file in a different location.
2013-11-29 01:54:46 -05:00
Christoph Oelckers
45070114e8
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
.gitignore
CMakeLists.txt
2013-11-28 12:44:27 +01:00
Christoph Oelckers
7cb70f60b3
- removed duplicate #define warning in fmodsound.cpp.
...
- commented out output of Cr0NpxState for floating point state because this variable was renamed in most recent Windows headers.
- added CMAKE option to generate assembly output for release builds.
- added my CMake-based project directory to .gitignore.
2013-11-28 11:03:19 +01:00
Braden Obrzut
0c1d92834a
- Fixed: Some setups require the dynamic linking library to be linked explicitly, so specify it when using DYN_FLUIDSYNTH
2013-11-26 17:58:55 -05:00
Christoph Oelckers
40d4ebcbc5
Merge branch 'master' of https://github.com/rheit/zdoom
2013-11-26 22:12:18 +01:00
Braden Obrzut
c7632174d8
- Fixed error in manifest embedding that stopped the binary from working on Windows XP.
...
- Tweaked PK3 copying commands so that it shouldn't be possible to end up with files named Debug/Release.
2013-11-26 12:49:23 -05:00
Christoph Oelckers
8bf5872fc0
- always add DelayImp.lib for MSVC.
2013-11-24 10:27:08 +01:00
Christoph Oelckers
4122e4041a
Merge branch 'master' of https://github.com/rheit/zdoom
2013-11-20 09:16:12 +01:00
Randy Heit
fe67ae5e54
Merge branch 'maint'
2013-11-19 21:01:15 -06:00
Randy Heit
f4e9edccb9
Don't display the cost in dialogues twice
...
- Fixed: Commit 75dd5503
, which was to enable the use of LANGUAGE
substitutions for conversation items with a cost attached, neglected to
remove the original code that attached the cost to the end of the item,
so the cost got added twice.
2013-11-19 19:55:57 -06:00
Randy Heit
d4304c3bde
Change tspeed += 2 to *= 2
...
- Fixed: The initial keyboard turn rate used the running initial rate whether
+speed was down or not.
2013-11-19 19:49:17 -06:00
Braden Obrzut
c7099744bd
- Minor changes to the CMake since it looks like VS2005 doesn't support a few things that were added.
2013-11-11 23:56:58 -05:00
Christoph Oelckers
0b1ccfb582
Merge branch 'master' of https://github.com/rheit/zdoom
2013-11-11 09:58:55 +01:00
Edward Richardson
a967b05290
Improvements to restoring stalled netgames
...
- The waiting message is now always cleared, regardless if it needed to
be in the first place. It's a rather simple for-loop so I doubt it
matters.
- Nodes are also cleared from the list if they catch up while other
nodes are still behind.
- "lastglobalrecvtime" is now bumped after the waiting loop if a tic was
successful, rather then bumping it every time a packet was received. It
appears that you can receive a packet before the game knows it stalled,
thus stalling it anyway.
- Instead of comparing the nettics to the local node, all nodes are
tested against gametic+counts (the real reason why the game has
stopped).
- More then one node can be marked as late at any one time.
- In a packet-server game, the arbitrator is now assumed slow, rather
then testing it. There is no point, seeing as we already know the game
has stalled because of it.
2013-11-11 20:42:54 +13:00
Braden Obrzut
34457ce737
- Applied VoidMage's patch to strip color codes from system console on SDL platforms.
2013-11-06 13:42:05 -05:00
Braden Obrzut
f0b946c3cf
- Allow use of system GME library. It defaults to forcing the use of the internal library at least for now though.
2013-11-06 13:37:34 -05:00
Christoph Oelckers
b91d5d5eb5
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
CMakeLists.txt
src/CMakeLists.txt
2013-11-03 16:55:00 +01:00
Braden Obrzut
2142e857a9
- Applied VoidMage's OpenAL patch.
2013-10-23 19:41:58 -04:00
Braden Obrzut
97d7b1e59e
Merge branch 'origin/maint'
...
Conflicts:
src/sound/fmodsound.cpp
2013-10-23 19:39:22 -04:00
Braden Obrzut
7dbf4ec38f
- Slight cleanup and I accidentally inverted the map generation flag.
2013-10-12 01:58:39 -04:00
Braden Obrzut
0759a4b438
- Actually, lets not use /Gm since it's incompatible with /MP which will be much faster on multi-core machines.
...
- Added ZDOOM_GENERATE_MAPFILE which enables linker map file generation.
2013-10-12 01:44:57 -04:00
Braden Obrzut
03b75ae7c1
- Fixed a few flags for Visual Studio compilation.
2013-10-12 00:56:49 -04:00
Christoph Oelckers
ac0c07a51b
- fixed: Since model skins are managed by the texture manager, the model code may not delete them itself.
2013-10-11 12:57:46 +02:00