Rachael Alexanderson a78b713f4b Merge https://github.com/coelckers/gzdoom ... # Conflicts: # src/v_video.cpp		2016-12-06 18:19:08 -05:00
..
colorpickermenu.cpp	- disabled the scripted virtual function module after finding out that it only works if each single class that may serve as a parent for scripting is explicitly declared.	2016-11-25 00:25:26 +01:00
joystickmenu.cpp	- disabled the scripted virtual function module after finding out that it only works if each single class that may serve as a parent for scripting is explicitly declared.	2016-11-25 00:25:26 +01:00
listmenu.cpp	- disabled the scripted virtual function module after finding out that it only works if each single class that may serve as a parent for scripting is explicitly declared.	2016-11-25 00:25:26 +01:00
loadsavemenu.cpp	- disabled the scripted virtual function module after finding out that it only works if each single class that may serve as a parent for scripting is explicitly declared.	2016-11-25 00:25:26 +01:00
menu.cpp	- disabled the scripted virtual function module after finding out that it only works if each single class that may serve as a parent for scripting is explicitly declared.	2016-11-25 00:25:26 +01:00
menu.h	- replaced more copystrings with FString.	2016-07-28 09:06:49 +02:00
menudef.cpp	- optionally allow passing a script position object to V_GetColor and subfunctions for better error output. Implemented this for all occurences where this info was available.	2016-12-03 16:27:53 +01:00
menuinput.cpp	- disabled the scripted virtual function module after finding out that it only works if each single class that may serve as a parent for scripting is explicitly declared.	2016-11-25 00:25:26 +01:00
messagebox.cpp	- disabled the scripted virtual function module after finding out that it only works if each single class that may serve as a parent for scripting is explicitly declared.	2016-11-25 00:25:26 +01:00
optionmenu.cpp	- disabled the scripted virtual function module after finding out that it only works if each single class that may serve as a parent for scripting is explicitly declared.	2016-11-25 00:25:26 +01:00
optionmenuitems.h	- disabled the scripted virtual function module after finding out that it only works if each single class that may serve as a parent for scripting is explicitly declared.	2016-11-25 00:25:26 +01:00
playerdisplay.cpp	Change GetPixelsBgra to use CopyTrueColorPixels	2016-08-06 22:59:16 +02:00
playermenu.cpp	- disabled the scripted virtual function module after finding out that it only works if each single class that may serve as a parent for scripting is explicitly declared.	2016-11-25 00:25:26 +01:00
readthis.cpp	- disabled the scripted virtual function module after finding out that it only works if each single class that may serve as a parent for scripting is explicitly declared.	2016-11-25 00:25:26 +01:00
videomenu.cpp	- disabled the scripted virtual function module after finding out that it only works if each single class that may serve as a parent for scripting is explicitly declared.	2016-11-25 00:25:26 +01:00