zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-12-15 14:51:13 +00:00
Code Issues Projects Releases Packages Wiki Activity
12405 commits 6 branches 6 tags 107 MiB
Commit graph

129 commits

Author SHA1 Message Date
Christoph Oelckers
9bffe4ee50 - scriptified the main statusbar interface and the Strife status bar. 
Note that the Strife status bar does not draw the health bars yet. I tried to replace the hacky custom texture with a single fill operation but had to find out that all the coordinate mangling for the status bar is being done deep in the video code. This needs to be fixed before this can be made to work.

Currently this is not usable in mods because they cannot initialize custom status bars yet.
 2017-03-22 00:32:52 +01:00
Christoph Oelckers
fec958cc0a - finally managed to get rid of the DWORD type. 
This one was particularly nasty because Windows also defines a DWORD, but in Windows it is an unsigned long, not an unsigned int so changing types caused type conflicts and not all could be removed.
Those referring to the Windows type have to be kept, fortunately they are mostly in the Win32 directory, with a handful of exceptions elsewhere.
 2017-03-10 19:46:22 +01:00
Rachael Alexanderson
cc9a2e5121 Merge https://github.com/coelckers/gzdoom 2017-03-08 21:25:24 -05:00
Christoph Oelckers
ba0f5a3f94 - most WORD and SWORD are gone. 2017-03-08 18:55:55 +01:00
Rachael Alexanderson
21a8964bea Merge remote-tracking branch 'gzdoom/master' 
# Conflicts:
#	src/v_video.cpp
 2017-03-03 16:29:33 -05:00
Christoph Oelckers
c630b07011 - replaced SDWORD with int32_t globally. 
This type wasn't used in the software rendering code so it could be removed already. The other homegrown types will have to be dealt with later.
 2017-03-03 19:35:08 +01:00
Rachael Alexanderson
d84ba4b953 Merge https://github.com/coelckers/gzdoom 2017-03-02 04:22:32 -05:00
Matthew McAllister
0583691670 Add bash-style console shortcuts 2017-03-01 11:33:14 +01:00
Rachael Alexanderson
2b8db72cef Merge commit '2234d36c7ac531fd802803216f747f82b58be8c2' 
# Conflicts:
#	src/r_main.cpp
#	src/r_plane.cpp
#	src/r_things.cpp
 2017-02-15 05:42:57 -05:00
Rachael Alexanderson
8c176575c8 Merge https://github.com/coelckers/gzdoom 2017-02-12 21:39:20 -05:00
Christoph Oelckers
03283de4e8 - fixed issues with option menu items. 
- fixed the octal parser in strbin.
- remove 'new' token because it gets in the way.
 2017-02-12 16:02:55 +01:00
Rachael Alexanderson
942f90a759 Merge remote-tracking branch 'gzdoom/master' 2017-02-05 16:07:48 -05:00
ZZYZX
e4970189b6 Tactical merge 2017-02-05 19:14:56 +02:00
Christoph Oelckers
b570d0819b - streamlined font handling for scripts a bit. 
- moved the two 'you raised the alarm' messages for Strife to the string table
 2017-02-05 13:14:22 +01:00
Rachael Alexanderson
59f32d497d Merge https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/r_things.cpp
#	src/v_draw.cpp
 2017-02-05 00:08:01 -05:00
Christoph Oelckers
d3ed83942f - did some preparations to ParseDrawTextureTags to allow using the same code for parsing tag lists generated by the VM. 
- removed the fixed point alpha tag from DrawTexture and replaced all uses with the floating point version.
 2017-02-04 13:11:12 +01:00
ZZYZX
eb7548d639 Printf doesn't work with FString on GCC 2017-02-03 20:54:42 +02:00
ZZYZX
83f868a049 Implemented WorldThingSpawned hook. Also changed Console.Printf to automatically add \n. Also fixed vararg calls with names. 2017-01-30 09:10:33 +02:00
ZZYZX
3e093a20ff First take at serialization 2017-01-24 00:17:12 +02:00
Rachael Alexanderson
8a198591f4 Merge https://github.com/coelckers/gzdoom 2017-01-19 11:58:53 -05:00
Christoph Oelckers
19b1c10ba8 - scriptified a large part of the weapon code. 2017-01-19 17:40:34 +01:00
Magnus Norddahl
53a79ca215 Merge remote-tracking branch 'gzdoom/master' into qzdoom 
# Conflicts:
#	src/r_things.cpp
 2017-01-18 04:09:16 +01:00
Christoph Oelckers
14f2c39e58 - scriptified cht_Give and cht_Take and made them virtual function of PlayerPawn so that this can be better configured for mods that want other options in here. 
- improved the class pointer to string cast to print the actual type it describes and not the class pointer's own type.
- fixed: The 'is' operator created non-working code when checking the inheritance of a class pointer, it only worked for objects.
 2017-01-17 17:34:39 +01:00
Rachael Alexanderson
05662e5c4d Merge https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/r_bsp.cpp
#	src/r_plane.cpp
#	src/r_things.cpp
 2017-01-09 09:51:06 -05:00
Christoph Oelckers
cd7986b1b1 - refactored global sides array to be more VM friendly. 
- moved FLevelLocals to its own header to resolve some circular include conflicts.
 2017-01-08 18:46:17 +01:00
Christoph Oelckers
470a96d3b2 - fixed: non-damaging attacks should not cause infighting, unless some relevant pain flags are being set. 2016-12-26 08:18:25 -05:00
Christoph Oelckers
2ce55e5416 - fixed: non-damaging attacks should not cause infighting, unless some relevant pain flags are being set. 2016-12-25 19:19:49 +01:00
Rachael Alexanderson
fa66ca214e Merge https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/win32/zdoom.rc
 2016-12-22 06:24:47 -05:00
alexey.lysiuk
7dd51d6d1c Fixed infinite execution of error CCMD 
https://forum.zdoom.org/viewtopic.php?t=54659
 2016-12-22 10:33:21 +01:00
Rachael Alexanderson
a78b713f4b Merge https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/v_video.cpp
 2016-12-06 18:19:08 -05:00
Christoph Oelckers
d2ce78fae7 - changed the return value of PickupMessage to an FString so that it can interface with scripts. 
- use standard convention of prefacing localizable strings with "$" for C_MidPrint.
 2016-11-28 16:19:01 +01:00
Christoph Oelckers
b171d6e21f - scriptified a_alienspectres.cpp. 2016-11-28 11:52:03 +01:00
Magnus Norddahl
ae889acaea active_con_scale should respect uiscale 2016-11-16 19:49:46 +01:00
Christoph Oelckers
0c0cb6d69c - fixed warnings. 2016-11-12 15:36:36 +01:00
Edoardo Prezioso
104030697f - Rename con_numnotify to con_notifylines. 
Zandronum 1.1 added an option with the same purpose. Use it to avoid duplicates.
 2016-11-12 11:08:33 +01:00
Edoardo Prezioso
f123da9385 - Fixed GCC warnings with new history code. 2016-11-12 11:07:39 +01:00
Marisa Heit
c69394fa40 Add con_numnotify cvar to control number of lines of notification text 
- If con_numnotify < 0, then there is no limit on the number of lines of
  text.
- If con_numnotify == 0, then any text that would normally be shown in the
  notification area is discarded.
- If con_numnotify > 0, then that is the maximum number of lines of
  notification text to display.
 2016-11-12 00:34:07 -06:00
Marisa Heit
513ad7f75f Use FString to store console atexit commands 2016-11-12 00:34:07 -06:00
Marisa Heit
c5eb28d360 Fix console scrolling too far when page scrolling with scaled text 2016-11-12 00:34:07 -06:00
Marisa Heit
4dce07762b Change con_scale behavior for value 0 
- Do not use uiscale for con_scale default. A 40 column console when
  everything is defaults is maddening. The default is now CleanXfac minus 1.
 2016-11-12 00:34:07 -06:00
Marisa Heit
3926ca13b0 Fix console input not scrolling when you hit the side of the screen 
- Also changed the console input buffer into a struct instead of a
  frankenstein buffer.
 2016-11-12 00:34:07 -06:00
Christoph Oelckers
ba68cfd611 - do not even allow creation of names in C_RemoveTabCommands if there are no tab commands, so that FindName cannot be called after the NameManager has been destroyed. 2016-09-13 21:01:50 +02:00
Magnus Norddahl
303da0e071 Fix center text alignment issue 2016-09-09 20:09:54 +02:00
Magnus Norddahl
e794e59cd2 Add con_scale for scaling just the console 2016-09-08 00:39:52 +02:00
Magnus Norddahl
d2f8fc63fc Scale the console itself as specified by con_scaletext 2016-09-08 00:39:51 +02:00
Magnus Norddahl
6414e01354 Add uiscale slider controlling what scale the On setting uses for hud_scale, hud_althudscale and con_scaletext 2016-09-08 00:39:51 +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
Magnus Norddahl
a893013dbb Adds HUD quadruple scale and a scale slider for the crosshair 2016-08-05 12:20:34 +02:00
Christoph Oelckers
db86385cf6 - removed STACK_ARGS. 
The only reason this even existed was that ZDoom's original VC projects used __fastcall. The CMake generated project do not, they stick to __cdecl.
Since no performance gain can be seen by using __fastcall the best course of action is to just remove all traces of it from the source and forget that it ever existed.
 2016-04-11 10:46:30 +02:00
Christoph Oelckers
558e04cb99 - safety commit. 2016-03-26 01:03:02 +01:00