zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-29 07:22:05 +00:00
Code Issues Projects Releases Packages Wiki Activity
7708 commits 86 branches 139 tags 124 MiB
Commit graph

107 commits

Author SHA1 Message Date
Christoph Oelckers
2e882a41a3 - removed some redundancy. 2016-10-14 23:13:08 +02:00
FishyClockwork
08504dcbe2 Added a small check just in case... 2016-10-14 23:11:58 +02:00
FishyClockwork
ecffd0bea6 Done the code changes. 
This time only nulls I've added are nullptrs
 2016-10-14 23:11:57 +02:00
Christoph Oelckers
af6404f763 - all DObjects converted. 
- cleaned out some old cruft that's no longer needed.
 2016-09-20 10:27:53 +02:00
Christoph Oelckers
e04055dbb2 - added multiple message levels for 'developer' CVAR so that the important stuff won't get drowned in pointless notification spam that's of no use to anyone. 
- made 'developer' CVAR persist across launches and added some menu entries for it.
- added checks for 'developer' to ACS's CheckInventory function.
 2016-08-28 09:55:04 +02:00
Edoardo Prezioso
6aca7604eb - Clean the code by using AActor::GiveInventory. 
This fixes also a bug in FraggleScript GiveInventory, which tried to access the 'SaveAmount' member of 'ABasicArmorBonus' with the wrong cast.
 2016-04-21 16:02:43 +02:00
Christoph Oelckers
f1602882c8 - added a no-parameter Spawn function for inventory items that never show on the map, because the coordinate and replacement parameters will always be 0 for them. 
- started converting g_hexen.

Most importantly this removes CHolyWeave as it is just a specialized version of A_Weave with far more convoluted use of parameters.
 2016-03-21 14:00:05 +01:00
Christoph Oelckers
4e60ea0252 - made AActor::alpha a floating point value 
- replaced some uses of FRACUNIT with OPAQUE when it was about translucency.
- simplified some overly complicated translucency multiplications in the SBARINFO code.
 2016-03-21 12:18:46 +01:00
Christoph Oelckers
51b05d331d - replaced AActor::vel and player_t::Vel with a floating point version. 
- Converted P_MovePlayer and all associated variables to floating point because this wasn't working well with a mixture between float and fixed.

Like the angle commit this has just been patched up to compile, the bulk of work is yet to be done.
 2016-03-20 00:54:18 +01:00
Christoph Oelckers
aa09cbdada - renamed some functions and fixed a few more conversion errors. 2016-03-17 00:07:37 +01:00
Christoph Oelckers
b140d71c49 - several fixes. 2016-03-16 22:29:35 +01:00
Christoph Oelckers
671291227e - first stage of converting actor angles to float complete 
Patched up everything so that it compiles without errors again. This only addresses code related to some compile error. A large portion of the angle code still uses angle_t and converts back and forth.
 2016-03-16 12:41:26 +01:00
Christoph Oelckers
651817fad7 - made AActor::velx/y/z and player_t::velx/y fixedvec's. 
(This commit is 95% search & replace with only a few places where velz was used as a local variable changed.)
 2016-03-12 14:11:43 +01:00
Randy Heit
55142078d8 Normalize line endings 2016-03-01 09:47:10 -06:00
Randy Heit
b3b0886b64 Merge branch 'scripting' 
Conflicts:
	src/actor.h
	src/g_doom/a_doomweaps.cpp
	src/g_hexen/a_blastradius.cpp
	src/p_enemy.cpp
	src/p_enemy.h
	src/thingdef/thingdef.h
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/constants.txt
 2016-02-04 15:17:22 -06:00
Christoph Oelckers
7c6e070244 - fixed: line spacing was taken from a different variable in conversation display and mouse coordinate code. 2016-01-27 11:19:30 +01:00
Randy Heit
9744b9e0d9 Merge branch 'master' into scripting 
Conflicts:
	src/actor.h
	src/dobject.h
	src/dobjgc.cpp
	src/p_local.h
	src/thingdef/thingdef_codeptr.cpp
 2016-01-21 12:45:06 -06:00
alexey.lysiuk
598bccbe93 Added warning when next dialog page is incorrect 2016-01-21 15:53:58 +02:00
alexey.lysiuk
673ac1295c Fixed broken 'closedialog' property in Strife dialogs 
See http://forum.zdoom.org/viewtopic.php?t=50524
 2016-01-21 15:53:35 +02:00
Christoph Oelckers
bf747075e8 Merge branch 'master' into scripting 
Conflicts:
	src/actor.h
	src/g_hexen/a_clericstaff.cpp
	src/p_enemy.cpp
	src/p_interaction.cpp
	src/p_local.h
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
 2016-01-17 20:57:55 +01:00
Christoph Oelckers
cfcd2668cc Merge commit '772a5724313f2ad0bd6828fcc28545a9ee5e6068' into scripting 
Conflicts:
	src/p_pspr.cpp
	src/thingdef/thingdef_codeptr.cpp
 2016-01-17 20:00:45 +01:00
alexey.lysiuk
a8e5b90667 Fixed stuck Strife dialogs 
See http://forum.zdoom.org/viewtopic.php?t=50451 and http://forum.zdoom.org/viewtopic.php?t=48470
 2016-01-15 18:32:49 +02:00
Christoph Oelckers
2c0f64cf9f - refactoring of R_PointToAngle2 when used to calculate direction between two actors. 2016-01-10 20:46:26 +01:00
Christoph Oelckers
400038643c - fixed: Strife dialogues could crash on invalid links. 2015-12-26 15:31:59 +01:00
Christoph Oelckers
646c135eff Merge branch 'master' into scripting 
Conflicts:
	src/m_cheat.cpp
	src/p_acs.cpp
	src/thingdef/thingdef_codeptr.cpp
	src/thingdef/thingdef_properties.cpp
 2015-04-28 23:04:10 +02:00
Edoardo Prezioso
b51fac344d Little TakeInventory refactoring. 
Introduce AActor::TakeInventory, which unifies DoTakeInv from ACS and DoTakeInventory from Decorate, and AInventory::DepleteOrDestroy, which is extracted from the DoTakeInv core function, and use both where they're needed.
I don't know if the differences between DoTakeInv and DoTakeInventory were intentional, so I kept both behaviors.
 2015-04-28 15:45:11 +02:00
Christoph Oelckers
f7834061df Merge commit 'b6a4511dd1e74440fad99bc673c1f2b3680dba48' into scripting 
Conflicts:
	src/dobjtype.cpp
	src/p_conversation.cpp
	src/p_local.h
	src/p_things.cpp
	src/thingdef/thingdef_properties.cpp

(This is just the conversationID to MAPINFO stuff to keep the conflicts as small as possible)
 2015-04-28 13:08:18 +02:00
Christoph Oelckers
b6a4511dd1 - move conversation ID definition to MAPINFO as well. Uses the newly added filter feature to handle the teaser differences. 2015-04-05 00:31:15 +02:00
Randy Heit
fd7ed2bc25 Undo most of ZzZombo's changes 
- "If it ain't broke, don't fix it."
- Some of the changes were downright wrong and some were pointless, so undo
  everything that doesn't look like an actual improvement.
 2015-02-08 20:44:18 -06:00
ZzZombo
c4b742ebf0 - Part 2 of the sanity crusade. 2015-02-08 17:03:49 +08: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
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
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
Christoph Oelckers
251cdacf26 Merge branch 'master' into scripting 
Conflicts:
	src/g_shared/a_randomspawner.cpp
	src/g_strife/a_strifeweapons.cpp
	src/thingdef/thingdef_parse.cpp
	wadsrc/static/actors/constants.txt
 2013-09-03 09:01:28 +02:00
Christoph Oelckers
75dd5503cf - fixed: Cost strings for dialogues must not be added in the dialogue parser but while displaying the message to properly handle stringtable entries. 2013-09-03 08:24:47 +02:00
Christoph Oelckers
bba092cc0b Merge branch 'master' into scripting 
Conflicts:
	src/d_player.h
	src/g_doom/a_archvile.cpp
	src/thingdef/thingdef.h
	src/thingdef/thingdef_properties.cpp
 2013-08-09 13:03:28 +02:00
Braden Obrzut
7e76fb0078 - Fixed: Disable ifitem jumping if a link isn't specified since an invalid value can cause a crash. 2013-08-09 00:25:29 -04:00
Christoph Oelckers
909ec2e35a Merge branch 'maint' into scripting 2013-07-28 10:47:17 +02:00
Christoph Oelckers
6dd956c0dc - fixed: Speaker names in dialogues were not able to use the string table. 2013-07-25 15:58:47 +02:00
Randy Heit
e7efa1d802 - Update to latest version in trunk. 
SVN r3890 (scripting)
 2012-10-17 04:24:54 +00:00
Randy Heit
10f1281977 - Remove LabelOffset from menus entirely and just compute things so that the console font and 
small font, when mixed on the same line, align at their baselines.

SVN r3786 (trunk)
 2012-07-26 05:27:37 +00:00
Randy Heit
562cf04db2 - Update scripting branch to trunk. 
SVN r3758 (scripting)
 2012-07-14 03:04:41 +00:00
Randy Heit
849d6724d8 - Moved "Go away!" text into language.enu. 
SVN r3449 (trunk)
 2012-03-17 01:27:12 +00:00
Randy Heit
a12729670b - Fixed: The user could interact with the conversation menu during demo playback and mess up the 
demo.
- Fixed: The conversation menu stayed up during demo playback even after the conversation was
  over.

SVN r3419 (trunk)
 2012-03-10 01:24:59 +00:00
Randy Heit
6d59fb3e9f - Fixed: If the dialogues are freed while a dialogue menu is open, we need to close that menu, 
or it will crash because the dialogue node it refers to no longer exists.

SVN r3418 (trunk)
 2012-03-10 00:38:38 +00:00
Randy Heit
fcb0840246 - Fixed: The DConversationMenu constructor is not the appropriate place to set menuactive to 
MENU_OnNoPause.

SVN r3396 (trunk)
 2012-02-28 02:07:06 +00:00
Christoph Oelckers
463c276014 - removed more r_ header dependencies from the rest of the code. 
SVN r3260 (trunk)
 2011-07-06 15:31:05 +00:00
Christoph Oelckers
17ed7aaabd - moved the code from r_data.cpp to some better fitting places and deleted this file and r_data.h because the remaining parts of it were just a random collection of unrelated functions. 
SVN r3248 (trunk)
 2011-07-05 10:02:38 +00:00
Christoph Oelckers
1993e969b7 - GCC warning fixes (GCC stupidity for the most part.) 
SVN r3154 (trunk)
 2011-02-19 08:59:43 +00:00
Christoph Oelckers
1ea5cc8bd8 - added a function to execute action specials and changed all calls to use this function. This was done to make it easier to check such calls. 
SVN r3152 (trunk)
 2011-02-13 10:18:28 +00:00