zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-29 07:22:07 +00:00
Code Issues Projects Releases Packages Wiki Activity
11900 commits 6 branches 6 tags 107 MiB
Commit graph

11900 commits

This branch
This branch
All branches
Author SHA1 Message Date
Magnus Norddahl
38453d0435 Added most of the blend modes 2017-02-22 00:27:06 +01:00
alexey.lysiuk
bdd20d3887 Fixed initialization of Strife dialogs internal structures 
Explicit assignment to members, no more memset() on non-PoD types
https://mantis.zdoom.org/view.php?id=317
 2017-02-21 22:36:20 +02:00
Magnus Norddahl
c918950ff6 Add php drawer for the poly renderer 2017-02-21 09:08:51 +01:00
Magnus Norddahl
e73031b3c9 Added sky drawers 2017-02-21 01:25:08 +01:00
Magnus Norddahl
5fa5b062d6 Added php script for the span drawers 2017-02-20 22:49:52 +01:00
Rachael Alexanderson
257f48de97 Merge https://github.com/coelckers/gzdoom 2017-02-20 04:55:54 -05:00
Magnus Norddahl
fe854fb71f Fix php drawer blend modes 2017-02-20 07:09:30 +01:00
Christoph Oelckers
bb6e667f33 - removed some unneeded version.h #includes. 2017-02-20 01:42:53 +01:00
Christoph Oelckers
051a394f47 - fixed some mess in the graphics organization for the Strife status bar. 
This alternatingly loaded two different patch sets but it was entirely unclear which was supposed to be loaded when so they now are merged into one. It should have been two different variables from the start.
 2017-02-20 00:22:36 +01:00
Rachael Alexanderson
7825c7b244 Merge https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/version.h
 2017-02-19 17:42:00 -05:00
Rachael Alexanderson
84ca9fd63c Merge remote-tracking branch 'origin/versionstr-change' into versionstr-change 2017-02-19 17:40:44 -05:00
Rachael Alexanderson
b134ea5b4f - fixed: Change compiled exe version strings to match git repo numbers. This is viewable in Windows by right-clicking on the executable and selecting "Properties". 2017-02-19 23:23:53 +01:00
Christoph Oelckers
26144340b8 - fixed: Hexen's poison cloud needs to call P_DamageMobj, even with a damage value of 0. Added a new flag to handle this case because normally this is not desirable. 2017-02-19 23:20:09 +01:00
Rachael Alexanderson
c2eed19b51 - fixed: Change compiled exe version strings to match git repo numbers. This is viewable in Windows by right-clicking on the executable and selecting "Properties". 2017-02-19 16:29:30 -05:00
Christoph Oelckers
165a980065 - fixed: The base MouseEvent method must return true, not false. 
- fixed: It is a bad idea to start a save within an MKEY_Input event. At this time the window chain is not stable because the text input screen is in the middle of being taken down, so the save should be deferred until the next Ticker call of the SaveMenu.
 2017-02-19 22:08:22 +01:00
Christoph Oelckers
4ca20e0297 - fixed: AActor::SetPortalTransition set an incorrect value for the previous position. 2017-02-19 21:35:06 +01:00
Rachael Alexanderson
11d6f46e2d Merge https://github.com/coelckers/gzdoom 2017-02-19 13:05:32 -05:00
Christoph Oelckers
65f2433ac7 - fixed: The text enter screen must be activated if it should be displayed. 2017-02-19 18:27:29 +01:00
Christoph Oelckers
6c9558459d - allow menu items to inherit their parent's Init method for MENUDEFS. 2017-02-19 18:15:40 +01:00
Christoph Oelckers
68b47d81de - fixed WP_NOCHANGE changes with a restart, so this must be taken into account for the script variable holding it. 2017-02-19 17:58:54 +01:00
Christoph Oelckers
fa0be4d4a9 - fixed keycodes for confirmation menu. 2017-02-19 17:30:02 +01:00
Christoph Oelckers
f3b6343e53 - use floats for menu item coordinates. This only has an effect in the ListMenu because the OptionMenu uses fixed offsets which work differently. 2017-02-19 17:24:30 +01:00
Christoph Oelckers
c0f588e234 - let M_ClearMenus destroy all open menus so that they can properly deinitialize. 2017-02-19 16:08:10 +01:00
Christoph Oelckers
fb52b034b0 - added a GenericMenu class, so that all menus can be given a virtual Init method. 
Doing this to Menu itself would not work because the different menus require different parameters.
This also means that all menus that are routed through menu items must inherit from either ListMenu, OptionMenu or GenericMenu.
All other types can only be used internally.

This should complete the menu scriptification.
 2017-02-19 15:35:28 +01:00
Christoph Oelckers
9089beb110 - scriptified most of the remaining parts of DMenu. Only the engine interface remains native now. 2017-02-19 15:23:33 +01:00
Christoph Oelckers
e05242e44d - scriptified the remaining parts of the conversationmenu. 
- do not resolve the backdrop texture to a texture ID at load time. This will allow custom menu classes to use this info differently.
- added a new ZSDF userstring property to dialog pages to give mods more means for customization.
- allow overriding the conversation menu class both globally through MAPINFO and per conversation in ZSDF.
 2017-02-19 14:21:49 +01:00
Christoph Oelckers
d85b9cdd71 - scriptified the input methods of DConversationMenu. 
- fixed handling of DimAllowed.
 2017-02-19 13:07:49 +01:00
Christoph Oelckers
3c8a5fdbe7 - scriptified the drawer functions of the conversation menu. 2017-02-19 12:28:05 +01:00
Christoph Oelckers
c4a90f39af - split up DConversationMenu::Drawer for future flexibility. 
- fixed: The in-conversation gold display did not work because it relied on an unused global variable.
 2017-02-19 11:49:59 +01:00
Rachael Alexanderson
75b81381f6 Merge https://github.com/coelckers/gzdoom 2017-02-19 05:26:51 -05:00
Christoph Oelckers
129787546d - transitioned the Conversation menu from FBrokenLines to DBrokenLines so that the internal representation matches scriptable types. 2017-02-19 10:46:53 +01:00
Christoph Oelckers
8db1646056 - fixed: Strife dialogues remembered the last menu's selection index, but with the possibility of changing sets of replies between calls of the same dialogue it should be the reply's index in the list of replies that gets remembered. 2017-02-19 10:34:47 +01:00
alexey.lysiuk
033792078c Fixed compilation with GCC/Clang 
src/menu/messagebox.cpp:70:95: error: no viable conversion from 'hfunc' (aka 'void (*)()') to 'VMValue'
 2017-02-19 11:31:58 +02:00
Magnus Norddahl
ee3bcb6f78 Fix sampling 2017-02-19 03:51:49 +01:00
Magnus Norddahl
42a7dbe33a Merge remote-tracking branch 'gzdoom/master' into qzdoom 
# Conflicts:
#	src/v_video.cpp
 2017-02-19 03:49:13 +01:00
Magnus Norddahl
dfcfd0462f Hook up sprite php drawers (but disable them for now as they don't fully work yet) 2017-02-19 01:23:16 +01:00
Christoph Oelckers
c0dd37e16e - ncopystring is not needed anymore. 2017-02-19 01:14:31 +01:00
Christoph Oelckers
b1a7941414 - some preparations of the Strife dialogue data to make it usable for ZScript, most importantly this means to replace all const char * with FString. 2017-02-19 01:11:52 +01:00
Magnus Norddahl
2bedfca071 Add php script for sprite drawers 2017-02-19 00:49:46 +01:00
Christoph Oelckers
2440951811 -scriptified the ReadThis screen. 2017-02-19 00:08:30 +01:00
Christoph Oelckers
e46571c192 - DMessageBoxMenu is fully scriptified. 2017-02-18 23:39:02 +01:00
Christoph Oelckers
62b594a499 - DMessageBoxMenu::Drawer scriptified. 2017-02-18 23:18:55 +01:00
Christoph Oelckers
aabcc1f92e - scriptified the input functions of DMessageBoxMenu. 2017-02-18 23:05:01 +01:00
Christoph Oelckers
6e0e2b2457 - replaced all subclasses of DMessageBoxMenu with a callback option and lambdas to reduce the amount of menu code to port over. Now this is only one class. 2017-02-18 22:07:28 +01:00
Christoph Oelckers
de1e7661eb - removed all native remnants of TextEnterMenu. 2017-02-18 21:25:19 +01:00
Christoph Oelckers
f5a0f6b3bf - almost done with TextEnterMenu. 2017-02-18 21:18:23 +01:00
Christoph Oelckers
0c41a9dee7 - scriptified DTextEnterMenu::Drawer. 2017-02-18 20:12:06 +01:00
Christoph Oelckers
06141338f1 - made DMenu's static variables regular global variables because that class is going to go completely scripted soon. 2017-02-18 19:19:14 +01:00
Christoph Oelckers
1b4c9e13b8 - cleaned out some cruft from the menu code, now that ListMenu is fully scripted. 2017-02-18 19:11:53 +01:00
Christoph Oelckers
b7a5437af6 - scriptified parts of ListMenu. 2017-02-18 18:35:44 +01:00