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

67 commits

Author SHA1 Message Date
Christoph Oelckers
792cad89b3 Merge commit '3849cb86231ce24131a86e9c29795a8cf3706a3d' into scripting 
Conflicts:
	src/g_hexen/a_clericstaff.cpp
	src/g_hexen/a_hexenspecialdecs.cpp
	src/p_acs.cpp
	src/p_enemy.cpp
	src/p_interaction.cpp
	src/thingdef/thingdef_codeptr.cpp
	src/thingdef/thingdef_expression.cpp

(Scripting branch update part 4)
 2015-04-28 11:59:33 +02:00
Randy Heit
a41af2de73 Make SBARINFO's HasWeaponPiece recognize removed pieces 
- Fixed: HasWeaponPiece assumed that once a piece was given, it would not
  be removed. The easiest way to break this assumption is by loading an
  earlier save where you had fewer pieces. (The catch being that if you
  removed all pieces, it would notice that.)
 2015-02-24 20:01:39 -06:00
Randy Heit
b5e4153c78 Merge branch 'master' into gonesolong 
Conflicts:
	src/CMakeLists.txt
	src/b_think.cpp
	src/g_doom/a_doomweaps.cpp
	src/g_hexen/a_clericstaff.cpp
	src/g_hexen/a_fighterplayer.cpp
	src/namedef.h
	src/p_enemy.cpp
	src/p_local.h
	src/p_mobj.cpp
	src/p_teleport.cpp
	src/sc_man_tokens.h
	src/thingdef/thingdef_codeptr.cpp
	src/thingdef/thingdef_function.cpp
	src/thingdef/thingdef_parse.cpp
	wadsrc/static/actors/actor.txt
	wadsrc/static/actors/constants.txt
	wadsrc/static/actors/shared/inventory.txt

- Added register reuse to VMFunctionBuilder for FxPick's code emitter.
- Note to self: Need to reimplement IsPointerEqual and CheckClass, which
  were added to thingdef_function.cpp over the past year, as this file no
  longer exists in this branch.
 2014-12-21 21:15:11 -06:00
Randy Heit
2d87eb0ba2 Merge branch 'master' into gonesolong 
Conflicts:
	src/CMakeLists.txt
	src/actor.h
	src/g_heretic/a_hereticmisc.cpp
	src/g_heretic/a_hereticweaps.cpp
	src/g_heretic/a_ironlich.cpp
	src/info.h
	src/namedef.h
	src/p_buildmap.cpp
	src/p_enemy.cpp
	src/p_map.cpp
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
	zdoom.vcproj
 2014-12-20 19:13:14 -06: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
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
Christoph Oelckers
24886b6734 - removed the last static character arrays from FLevelLocals. 2014-05-13 23:16:13 +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
Braden Obrzut
bbd3106cbb Merge commit 'b3f5de356f14e2026cc9e5738e8b58e22e7daa44' 2014-01-06 04:04:51 -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
Braden Obrzut
ffae34c5fd - Changed the new default alignment keyword for drawimage from topleft to none in order to allow a potential topleft without image offsets. 2013-09-30 20:02:05 -04:00
Braden Obrzut
f73275ad88 - Applied Tesseract's patch for drawimage extensions. (Extended icon support and maximum width/height.) 2013-09-21 12:46:19 -04:00
Randy Heit
459ad5abff - Updated scripting branch to latest version in trunk. 
SVN r4337 (scripting)
 2013-06-07 03:31:30 +00:00
Braden Obrzut
7fd0950ab9 - Changed the way DrawSelectedInventory is casted so that clang doesn't warn about it. 
SVN r4275 (trunk)
 2013-05-20 21:27:50 +00:00
Randy Heit
2668988870 - Switched to a genericly extensible representation for userinfo. 
- Fixed: The playerinfo CCMD did not range check the player number.

SVN r4253 (trunk)
 2013-05-12 18:27:03 +00:00
Braden Obrzut
18bf56d3d7 - Fixed: NULL pointer dereference in DrawGem. 
SVN r4186 (trunk)
 2013-03-18 21:56:15 +00:00
Braden Obrzut
5965c45932 - Fixed: Using interpolation on drawbar would sometimes result in the last pixel hanging longer than it should. 
- Improved draw bar clipping fix from last commit.

SVN r4057 (trunk)
 2013-02-01 02:16:02 +00:00
Randy Heit
aab12c6b0c - Fixed: Crash when using an inventory bar with the Strife style but no INVCURS graphic. 
SVN r3931 (trunk)
 2012-11-03 00:12:38 +00:00
Randy Heit
562cf04db2 - Update scripting branch to trunk. 
SVN r3758 (scripting)
 2012-07-14 03:04:41 +00:00
Braden Obrzut
df7c03b933 - Also allow string constants on font names. 
SVN r3678 (trunk)
 2012-06-04 22:39:49 +00:00
Braden Obrzut
9b7e44c026 - Fixed: Allow string constants in SBarInfo whenever an actor name is required. The only exception is drawing the inventory icon with drawimage since it would be ambiguous, so I would advise using valid identifiers for class names even if it isn't required. Parenthesized syntax is required to use this feature where applicable. 
SVN r3677 (trunk)
 2012-06-04 22:26:26 +00:00
Braden Obrzut
4753be45fc - The SBarInfo AspectRatio command should treat 17:10 ratios as 16:10 for better compatibility with existing status bars unless the statusbar explicitly checks for it. 
SVN r3663 (trunk)
 2012-05-19 08:44:58 +00:00
Braden Obrzut
c07eaa4d31 - Fixed typo in SBarInfo WeaponIcon code. That said, I do wonder if the new behavior might break some existing status bar since it might be intended that weapons such as the fists draw no icon. 
SVN r3604 (trunk)
 2012-04-28 03:13:39 +00:00
Christoph Oelckers
b2e5e15d3c - changed icon lookup for weapons in SBARINFO so that it uses the alternative HUD's method if the weapon does not have an icon defined. 
SVN r3587 (trunk)
 2012-04-22 09:41:06 +00:00
Randy Heit
23e88c88c9 - Add 17:10 aspect ratio, for 1024x600 screens. 
SVN r3482 (trunk)
 2012-03-25 02:57:28 +00:00
Christoph Oelckers
e4880d162f - added Xaser's submission for accessing accuracy and stamina from DECORATE and ACS. 
- added DECORATE properties for accuracy and stamina.
- Since these changes move properties from player_t to AActor all savegame compatibility code was removed and the min. savegame version bumped.


SVN r3427 (trunk)
 2012-03-11 09:08:35 +00:00
Braden Obrzut
9cd0e48ea3 - Fixed: Forgot to initialize inventoryItem to NULL in DrawBar. 
SVN r3370 (trunk)
 2012-02-18 02:01:28 +00:00
Braden Obrzut
da974c3444 - Allow any parameterized SBarInfo value to use parentheses to help make the syntax a little more consistent. 
SVN r3361 (trunk)
 2012-02-16 05:01:17 +00:00
Braden Obrzut
25b73ac023 - Added ability to use a constant for the maximum comparator for health and armor drawbars. 
SVN r3360 (trunk)
 2012-02-16 04:21:43 +00:00
Braden Obrzut
3b8f5e0d39 - Fixed: levellump for drawstring should be all uppercase for consistency. 
SVN r3330 (trunk)
 2011-12-09 00:59:38 +00:00
Braden Obrzut
ba4630f0df - Added ammo1capacity and ammo2capacity to drawnumber. 
SVN r3277 (trunk)
 2011-08-13 20:30:59 +00:00
Braden Obrzut
c8b8cdd13b - Fixed: SBarInfo string center alignment didn't work with non-monospace fonts. 
SVN r3271 (trunk)
 2011-07-14 09:31:39 +00:00
Braden Obrzut
c8e8edb1c5 - Added a prefix option to drawnumber. 
- Added a flag to remove the cap on drawnumber (this means on the lower length numbers will be drawn).

SVN r3165 (trunk)
 2011-03-12 02:20:31 +00:00
Christoph Oelckers
898b0d679d - added a new 'playertype' command for SBARINFO that checks by class type not display name. 
- fixed: Status bar display for Hexen's fourth weapons only worked when they were obtained by picking up the weapon pieces.


SVN r3080 (trunk)
 2010-12-27 16:14:26 +00:00
Braden Obrzut
9e2e9262a4 - Fixed: Crash in Linux due to passing FStrings as character arrays. 
- Fixed: More places where SBarInfo used the unscaled information from graphics.

SVN r2948 (trunk)
 2010-10-16 17:04:18 +00:00
Braden Obrzut
45f3ef91d3 - Fixed: If a log popup is defined, it should not draw the default log message. 
- Fixed: The counters in draw(selected)inventory(bar) should not have been limited to 3 characters.
- Added: drawshadow() to drawinventorybar.
- Added: itemflash to drawselectedinventory to use Strife's cursor fade.
- Added: time and logtext to drawstring.  In addition a linebreaks(size) flag was added.

SVN r2928 (trunk)
 2010-10-09 15:57:04 +00:00
Braden Obrzut
5f8c2f6310 - Added: keys, accuracy, stamina, and savepercent to drawnumber. (Savepercent is also available for drawbar.) 
SVN r2924 (trunk)
 2010-10-08 23:09:27 +00:00
Christoph Oelckers
16fa8cc249 - Am I the only one who thinks that static_casts can create really clunky code? (Thanks, GCC, for your overly paranoid warning settings that necessitate such ugliness. :( ) 
SVN r2844 (trunk)
 2010-09-22 06:52:48 +00:00
Braden Obrzut
1e83634089 - Fixed: The aspectratio SBarInfo command never ticked its contents. 
SVN r2842 (trunk)
 2010-09-21 20:07:03 +00:00
Christoph Oelckers
583cbd49a6 - try to encapsulate access to the player class's display name for printing purposes. 
SVN r2839 (trunk)
 2010-09-21 09:43:54 +00:00
Braden Obrzut
0619a2677e - Fixed: SBarInfo couldn't print extended ASCII characters. 
SVN r2838 (trunk)
 2010-09-20 23:00:27 +00:00
Randy Heit
99670b708c - Sync scripting branch with what was in trunk on Sunday. I believe that would be revision 2739. 
SVN r2790 (scripting)
 2010-09-16 03:14:32 +00:00
Braden Obrzut
31754a582d - Fixed: when using the border property of drawbar, interpolation didn't work quite right. 
SVN r2705 (trunk)
 2010-09-06 20:12:44 +00:00
Braden Obrzut
230178bf98 - Added drawshadow flag to drawstring. 
SVN r2656 (trunk)
 2010-08-31 21:36:30 +00:00
Randy Heit
b2d018eccd - Made SBARINFO more tolerant of certain error conditions. (Why is there so much duplication of 
code? It felt like I was changing the same lines over and over and over.)

SVN r2486 (trunk)
 2010-08-01 20:05:52 +00:00
Braden Obrzut
006fb343b0 - Added Pink Silver's DrawString/Number alignment patch (with one minor change). 
SVN r2460 (trunk)
 2010-07-25 20:46:14 +00:00
Christoph Oelckers
e1e7cebd01 - fixed: The SBARINFO parser insisted that all player classes being specified have to exist. This, however, made it impossible to redefine the player classes in Hexen. 
SVN r2401 (trunk)
 2010-07-01 20:57:11 +00:00
Braden Obrzut
afd9bcb59a - Fixed: drawstring didn't properly align itself when variable strings were used. 
SVN r2360 (trunk)
 2010-06-07 15:45:09 +00:00
Braden Obrzut
d7686d0c26 - Added optional offset parameters to the drawshadow flag. 
- Added character alignment parameter to font monospacing.
- Fixed: character shadows were not scaled.
- Heretic keys now have an icon associated with them so that they can be drawn through drawkeybar.
- Replaced the built in Heretic and Hexen status bars with SBarInfo equivalents.

SVN r2353 (trunk)
 2010-06-02 20:26:27 +00:00