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
Christoph Oelckers
6a65f02257
- completed scriptification of LoadSaveMenu.
2017-02-18 18:01:24 +01:00
Christoph Oelckers
e46d378fb2
- sciptified DLoadSaveMenu::Drawer.
2017-02-18 17:51:40 +01:00
Christoph Oelckers
4a6d0f1fa5
- scriptified DLoadSaveMenu::MenuEvent.
2017-02-18 17:35:01 +01:00
Christoph Oelckers
ee6a90deec
- scriptified DLoadSaveMenu::Responder.
...
- scriptified DSaveMenu.
2017-02-18 16:40:32 +01:00
Christoph Oelckers
e58a03de9b
- the savegame manager needs a destructor
2017-02-18 14:18:27 +01:00
Christoph Oelckers
872969eb14
- scriptified the LoadMenu class and exported the entire interface to handle the LoadSaveMenu.
2017-02-18 14:08:16 +01:00
Christoph Oelckers
9d51266145
- some more encapsulation of savegame data in the savegame manager, because some of its info is not in a state that can be accessed directly through script code and needs a few helper functions.
2017-02-18 13:05:33 +01:00
Christoph Oelckers
128dfdeee6
- made some of the load/save menu's data a bit more scripting friendly, this mostly means removal of static string buffers.
2017-02-18 12:36:31 +01:00
alexey.lysiuk
0ffd475d8c
Fixed compilation with GCC/Clang
...
src/r_data/sprites.cpp:805:79: error: cannot pass non-trivial object of type 'FString' to variadic function; expected type from format string was 'char *' [-Wnon-pod-varargs]
2017-02-18 10:34:27 +02:00
Magnus Norddahl
4fc352a50d
Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom
2017-02-18 09:18:40 +01:00
Magnus Norddahl
8f06b5f9a1
Updated wall drawers to process two lines at a time
2017-02-18 09:17:47 +01:00
Rachael Alexanderson
e644adf3b8
- added "vid_glswfb" CVAR for linux, defaults to false, to allow init without GL framebuffer. This will need to be ultimately finished at a later date.
2017-02-18 02:46:30 -05:00
ZZYZX
6ec7d9af59
No more crashing in anonymous functions during runtime check of virtualscope
2017-02-18 08:02:38 +02:00
ZZYZX
fb9b8c8870
Re-enabled clearscope for methods; made isBlinking() clearscope
2017-02-18 07:51:41 +02:00
ZZYZX
ab07b30d5e
Fixed: implicit method call without specifying self should be checked as well
2017-02-18 07:48:28 +02:00
ZZYZX
463620c3b8
ClearScope is not needed for methods either. Disabled, but not removed - reenable if needed later
2017-02-18 07:33:27 +02:00
ZZYZX
d7f5d8a403
ClearScope for fields essentially means 'world-writable'. We don't want to support that - disallowed
2017-02-18 07:31:07 +02:00
ZZYZX
dbc595f886
Marked DrawPowerup as ui, still compiles and somewhat works :D
2017-02-18 07:30:20 +02:00
Rachael Alexanderson
65122ed19e
Merge https://github.com/coelckers/gzdoom
2017-02-18 00:18:45 -05:00
ZZYZX
afc9050a43
Marked Thinker play. Marked OnDestroy and Destroy virtualscope. It compiles :D
2017-02-18 06:56:00 +02:00
Magnus Norddahl
097dda38a9
Hook up all php generated wall drawers and enable them per default
2017-02-18 05:34:26 +01:00
ZZYZX
e0ae0fdb2e
Dynamic virtualscope checking. May yet be buggy.
2017-02-18 06:27:28 +02:00
ZZYZX
b5ab011bb9
Static virtualscope checking. This is possible, because virtualscope can't produce false positives (data readable for everyone), only false negatives (which are handled at runtime later)
2017-02-18 04:07:12 +02:00
Christoph Oelckers
013e52fabd
- fixed: newly created list menus did not call their scripted virtual Init method.
2017-02-18 01:31:01 +01:00
Christoph Oelckers
5f1241a55c
- scriptified the rest of the player menu. This compiles and runs but doesn't work yet, it will be fixed in the next commit.
2017-02-18 01:20:07 +01:00
Christoph Oelckers
49a07180c0
- scriptified ClassChanged.
2017-02-17 23:56:22 +01:00
ZZYZX
12aa18a92b
Preparing to do class-based method scopes: can't change class scope once defined (play stays play, ui stays ui)
2017-02-18 00:39:57 +02:00
Christoph Oelckers
50d2846e40
- scriptified UpdateColorsets.
2017-02-17 23:16:07 +01:00
Magnus Norddahl
89a2e434d4
Fix typo where __m128 should have been __m128i
2017-02-17 23:03:48 +01:00
