Commit graph

2031 commits

Author SHA1 Message Date
Magnus Norddahl
c95e5af46d Reduce memory usage during preview image loading 2019-12-30 06:22:32 +01:00
Magnus Norddahl
65fdafafd8 Fix TransformPatch using bitmap from the main thread 2019-12-29 23:24:08 +01:00
Magnus Norddahl
03e50615f6 Remove explicit image unloading and fix previews 2019-12-29 22:59:57 +01:00
Magnus Norddahl
f97f2d36b1 Remove preview manager and remove CreateTexture 2019-12-29 20:48:11 +01:00
biwa
a024ac9f47 Merge branch 'master' of https://github.com/jewalky/UltimateDoomBuilder 2019-12-29 19:05:26 +01:00
biwa
c46e548a73 - Fixed vertical grid lines being 1 pixel off in their horizontal position
- Fixed a bug where lines with 3D floor indicators were 1 pixel off in their horizontal position
2019-12-29 19:04:33 +01:00
ZZYZX
5dc2ab7b28 Supposedly fixed sprites not loading if reloaded resources from visual mode 2019-12-29 19:59:52 +02:00
Magnus Norddahl
ca3fa76e32 Rename the sampler filters so that they use the same naming convention as modern graphics APIs 2019-12-29 18:54:22 +01:00
ZZYZX
12fd006c61 Removed dynamic resource reloading for resource writing 2019-12-29 16:38:53 +02:00
ZZYZX
8990cc57b0 Fixed code folding in script editor 2019-12-29 15:58:53 +02:00
ZZYZX
87f74cb9c3 Trashed embedded resource editing UI 2019-12-29 15:27:29 +02:00
ZZYZX
58d2d67e77 Do not try to continuously reload failed textures 2019-12-29 14:25:53 +02:00
biwa
30819b3b0c Merge branch 'master' of https://github.com/jewalky/UltimateDoomBuilder 2019-12-29 13:01:25 +01:00
biwa
1786ab525e Changed checkdistance in ThingTypeInfo from int to double so that doesn't overflow 2019-12-29 13:00:10 +01:00
ZZYZX
62cddff505 Use nearest filtering if nearest is specified 2019-12-29 13:02:03 +02:00
biwa
8f9d840aeb Use map boundaries defined in the game's config instead of static values in VisualBlockMap 2019-12-29 11:03:42 +01:00
Magnus Norddahl
5082d7c308 Alter the nearest filter to not have noise in it 2019-12-29 06:52:39 +01:00
Magnus Norddahl
d46c72b04a Refactor the ImageData load code so that the UI thread requires no locks 2019-12-29 03:54:12 +01:00
ZZYZX
f41c5bdd6f Used slightly better approach for executing stuff in the main thread 2019-12-28 22:01:57 +02:00
ZZYZX
bd811aac7d Fixed deadlock caused by errors displayed by texture loading 2019-12-28 21:37:05 +02:00
ZZYZX
78fe6c306e Fixed UI thread becoming unresponsible in case of missing textures 2019-12-28 20:12:22 +02:00
ZZYZX
866facf80b Fixed: not all cases of static FontFamily were addressed 2019-12-28 10:22:32 +02:00
Magnus Norddahl
3cae8740ef Prevent Image.FromStream from closing the stream if the image isn't recognized 2019-12-28 05:34:38 +01:00
ZZYZX
197f96a059 Unfix MaxED's TGA fix 2019-12-27 12:43:06 +02:00
Magnus Norddahl
af3d74d186 Fix DevIL crash by protecting it with a mutex lock
Use the .net framework image loaders if they work. They do for the sane formats (PNG and JPEG) and they are faster, too.
Enable usage of multiple threads for resource loading now that it no longer crashes
2019-12-27 07:45:44 +01:00
Magnus Norddahl
11b5cb4e8f Fix crash if entering 3D mode early
Remove thread priority settings (this is not the right way to do it)
Stop brain dead busy looping and use Monitor.Wait + Monitor.Pulse
Only call Control.Invoke if its a worker thread calling RunOnUIThread
Add the code for running multiple background threads (unfortunately blocked by DevIL apparently not being thread safe, gg!)
2019-12-27 07:21:43 +01:00
Magnus Norddahl
7e0ea54254 Don't use SendMessage when the built-in Invoke function does the same 2019-12-27 04:37:10 +01:00
ZZYZX
24e4c55ed0 Fixed logos in the About form 2019-12-26 15:15:13 +02:00
ZZYZX
624c5ea1d3 Fixed: don't use full Renderer2D pipeline while updating the grid after resize (fixes debug build) 2019-12-26 14:33:23 +02:00
ZZYZX
cbe8abbc9a Fixed: 3D mode linedefs were completely broken -- reverted 718405b580 2019-12-26 10:08:11 +02:00
ZZYZX
3491bdccea Fixed: lines in 2D mode had random gray pixels with high quality enabled (resolves #331) 2019-12-26 08:16:38 +02:00
ZZYZX
1cbfddd367 Oops. 2019-12-26 07:10:01 +02:00
ZZYZX
607ac7751e Fixed: use application default font family for rendered labels if user-selected font is not available 2019-12-26 07:09:28 +02:00
ZZYZX
76bfd79bd6 Merged remote... 2019-12-26 04:17:24 +02:00
ZZYZX
8320402201 Fixed background in About form for larger fonts 2019-12-26 04:16:23 +02:00
Magnus Norddahl
061fa30a45 Improve camera sector search somewhat 2019-12-26 01:10:00 +01:00
Magnus Norddahl
9d5f8ec7c1 Rewrite VisualBlockMap to use a quad tree 2019-12-26 00:39:15 +01:00
Magnus Norddahl
718405b580 Remove the remaining dictionary lookups when culling 2019-12-25 18:57:39 +01:00
NickZ
1aa020b2d0 Added test configuration option to use Linux paths, added different font for text labels (PR#268 by NickZ)
* Add Linux Path option to test config

* make shortpaths and linuxpaths mutually exclusive
2019-12-25 19:45:19 +02:00
ZZYZX
60d836dc85 Fixed: redraw grid after window size changes 2019-12-25 17:26:30 +02:00
biwa
33b888e5d2 Renderer2D.PlotLine now transforms the y coordinate so that linedefs in nodes viewer, automap/sound environment/sound propagation mode are not flipped upside down anymore. Fixes #325. 2019-12-25 01:54:05 +01:00
ZZYZX
d559ba30d7 Added error reporting to Update Checker; Fixed update checking failure in certain setups 2019-12-24 23:32:37 +02:00
ZZYZX
842d4a6668 Fixed: full sector highlight would not show in 2D mode 2019-12-24 23:06:13 +02:00
ZZYZX
96f2b4e94e Fixed TGA texture loading 2019-12-24 21:33:16 +02:00
ZZYZX
99b1770004 Fixed references to GZDB in the setup 2019-12-24 20:43:55 +02:00
ZZYZX
f3c60ac5e5 Corrected Git Issues link for error dialog 2019-12-24 20:13:18 +02:00
ZZYZX
8b682a658c Fixed wrong icon in auto-update Newsflash 2019-12-24 20:04:20 +02:00
ZZYZX
6419cc04b0 Merged OpenGL UDB dev branch 2019-12-24 19:49:43 +02:00
ZZYZX
e1f3dfda87 Changed link to UDB 2019-12-24 19:47:07 +02:00
ZZYZX
81df5e858f Removed remaining DirectX references, fixed setup 2019-12-24 19:45:23 +02:00
biwa
37c52b4d70 Code folding in the script editor works again. Fixes #115. 2019-12-24 15:58:20 +01:00
ZZYZX
4b86389a5c Clarified credits a bit 2019-12-24 15:28:31 +02:00
ZZYZX
cd9da4b4a1 Changed splash image and icons 2019-12-24 11:59:58 +02:00
ZZYZX
d995f983fc Rebranding 2019-12-24 09:14:28 +02:00
Magnus Norddahl
11aa31452b Remove more dictionaries from the render loop 2019-12-21 05:43:16 +01:00
Magnus Norddahl
28406cf1a7 Declare the uniform variables in C# 2019-12-21 02:14:42 +01:00
Magnus Norddahl
a21edf78da Misc adjustments to make the cherry-picked 'C# shader resources' commit work 2019-12-21 01:47:27 +01:00
Magnus Norddahl
3de2427e7c Removed -f suffixes for floats (not supported on AMD) 2019-12-21 01:34:51 +01:00
Magnus Norddahl
7f6ff8929d Move the shaders to C# resources 2019-12-21 01:26:58 +01:00
ZZYZX
da57945db7 Merge branch 'master' into slimgl_merge 2019-12-20 16:41:38 +02:00
ZZYZX
e187872553 Add fps counter in visual mode 2019-12-20 16:39:01 +02:00
ZZYZX
5d3e78ad8f Add FPS counter for visual mode 2019-12-20 16:17:32 +02:00
Magnus Norddahl
c8237b0e64 Speed up linedef processing by not relying on a hashmap 2019-12-20 05:12:39 +01:00
Magnus Norddahl
28f01517d3 Trade some memory for speed 2019-12-20 04:50:43 +01:00
Magnus Norddahl
80f815cad9 Fix the error handling: only create one call unless there's an error and only check for errors in functions that can fail 2019-12-20 03:39:06 +01:00
biwa
9c8f8916e6 Fixed a crash that would happen in the texture set editor when double-clicking on the last texture 2019-12-19 15:46:02 +01:00
Magnus Norddahl
4274ee2893 Use C++ and SSE code to do matrix math
Avoid copying by passing matrices by reference to RenderDevice
Use fasttrig from GZDoom for faster cos/sin
Don't set matrices unless they changed. Even though the memcmp prevents it from being pushed to OpenGL it is still a waste.
2019-12-19 03:12:44 +01:00
ZZYZX
2bce3f06a4 Flip GDI bitmap in model loading before feeding it to OpenGL 2019-12-18 21:27:09 +02:00
ZZYZX
4de0d96d13 Only set uniform for world matrix if it was the only one that changed 2019-12-18 15:24:54 +02:00
Magnus Norddahl
de2e336cb1 Use OpenGL sampler objects 2019-12-18 03:24:09 +01:00
ZZYZX
bd967138f2 Return old code for grid drawing on the renderer side 2019-12-16 08:32:01 +02:00
ZZYZX
4cb6d68c45 Use PBO to stream texture data for software rendering 2019-12-16 06:54:44 +02:00
ZZYZX
5fbedaf8fc Fixed: don't reduce alpha twice in 2D render layers 2019-12-16 04:52:42 +02:00
ZZYZX
19718cd464 Fixed: skybox generated from Doom texture was misplaced 2019-12-16 04:18:19 +02:00
ZZYZX
8ac7e40754 Returned CodeImp's software renderer for line plotting 2019-12-16 04:15:53 +02:00
ZZYZX
81c8cdeec6 Added credit to Talon1024 & dpJ 2019-12-16 00:27:29 +02:00
ZZYZX
bd6d21773e Deleted SlimDX; returned pre-build event to copy appropriate DevIL version 2019-12-16 00:20:48 +02:00
ZZYZX
eafce14a9a Merge remote-tracking branch 'origin/master' into slimgl_merge 2019-12-16 00:00:01 +02:00
ZZYZX
502b641967 Improved error reporting 2019-12-15 23:53:33 +02:00
ZZYZX
7f09dd2aec Reenabled point filtering in visual mode 2019-12-15 22:47:06 +02:00
biwa
4febbdadf6 Zscript bool user variables are now treated as bool instead of int
Added support for int8, int16, uint, uint8, and uint16 user variables
2019-12-15 20:31:13 +01:00
ZZYZX
6f122d28c3 Fixed: alpha in the plotter was applied twice 2019-12-15 08:09:41 +02:00
ZZYZX
d1ff6bcc36 Fixed: line can be either dotted or smoothed 2019-12-15 07:20:54 +02:00
ZZYZX
ca75897bc5 Make grid dotted again 2019-12-15 03:45:21 +02:00
ZZYZX
d843a61d61 Replaced line intersection with something that does not cause infinite loops 2019-12-15 02:32:02 +02:00
ZZYZX
554ccc442f Fixed plotting from plugins, fixed transformed grid 2019-12-15 01:58:11 +02:00
ZZYZX
24c28e921f Fixed untransformed grid being Y-inverted 2019-12-15 01:16:04 +02:00
ZZYZX
714bb84204 Implemented alternate fix for Linux paths (2) 2019-12-14 23:52:12 +02:00
ZZYZX
f0aee1e174 Merge branch 'master' into slimgl_merge 2019-12-14 23:50:40 +02:00
ZZYZX
5295f7f590 Implemented alternate fix for Linux paths (to-do: add case-insensitive hack later) 2019-12-14 23:43:20 +02:00
ZZYZX
2c3013f74c Make everything build with VS2015 again 2019-12-14 23:42:44 +02:00
biwa
31eaf98cbe Using --- and +++ now also works correctly for the height offset in the edit sector properties dialog 2019-12-14 11:52:46 +01:00
biwa
c9e7551ca3 Added ZScript mixin class support 2019-12-08 01:14:21 +01:00
biwa
2699f5793b Fixed an issue where the ZScript parser aborted with a cryptic error message when encountering a number that was too small or big. It now clamps the value to min/max for the data type and prints a warning 2019-12-03 15:23:49 +01:00
biwa
8824a2bb94 Fixed a bug where the wrong texture/flat with the same name would be displayed in the texture browser when they were loaded from a PK3 or directory 2019-11-30 17:49:21 +01:00
biwa
cbaa0c030c Long names can now used for flats (again) 2019-11-30 17:05:00 +01:00
biwa
b94dd31fdb - Fixed a bug where the wrong sectors and linedefs were highlighted in UDMF under certain conditions. Fixes #307. 2019-10-31 21:16:59 +01:00
biwa
4b86f5458f - Increased max view distance from 9000 to 64000 map units. Step size increased from 200 to 500 map units
@ Improved performance of VisualBlockMap.GetFrustumRange so that high view distances is actually usable. This does not do anything to the rendering speed, so that's still slow
2019-10-19 16:52:02 +02:00
biwa
ba6dc546ba - (Hopefully) addressed a problem where images failed to load when opening another map in the 64 bit version
@ This is a workaround for #295.
2019-10-13 13:47:29 +02:00
biwa
67a6818632 - UDMF vertex heights are now preserved in a more sensible way when joining vertices. Fixes #299. 2019-09-20 23:14:53 +02:00
Kevin Caccamo
b5bd90c0ce Attempt to fix grid being vertically inverted
I don't know exactly where the root cause of the problem lies, but this solution works for me, even if it is a bit of a hack.

Fixes #1
2019-09-10 19:28:43 -04:00
Kevin Caccamo
6e4298660f Fix crash when adding a new sector with the same number of vertices as another
I think it happened because set.buffers[bufferindex] was null.

Fixes #2
2019-09-10 00:17:53 -04:00
Xabis
399e527b5c Support for RenderRadius (PR#297 by Xabis) 2019-09-05 13:37:31 +03:00
Kevin Caccamo
7d3379c6ce Fix textures in 2D mode being clamped
I have no idea why the textures in 2D more ended up being clamped to begin with, but this should fix that.
2019-09-03 22:55:54 -04:00
Kevin Caccamo
b5ad511671 Enable DevIL on Linux
Remove NO_DEVIL defines, and add devil.dll -> libIL.so.1 DLL mapping to app.config
2019-09-03 22:47:59 -04:00
Magnus Norddahl
03e9da365e Misc fixes for mono P/Invoke of BuilderNative 2019-08-30 10:30:28 +02:00
Magnus Norddahl
3cd96fc788 Fix linux compile errors and build the BuilderNative.so library 2019-08-30 08:45:14 +02:00
Magnus Norddahl
51fabae1e7 Turn off updater with mono as it won't work without additional work 2019-08-29 21:45:58 +02:00
Magnus Norddahl
4cfe80f33a GZDB can now boot using mono 2019-08-29 21:04:50 +02:00
Magnus Norddahl
159a2e6d38 Build using msbuild on mono to fix issues with resources and such 2019-08-29 20:24:22 +02:00
Magnus Norddahl
9b300126e9 Disable DEVIL and create build solution specifically for mono 2019-08-29 17:56:12 +02:00
Magnus Norddahl
9f2c9e00d7 Add mono makefile 2019-08-29 16:30:49 +02:00
biwa
64c04f4246 - Fixed a bug where lights defined in GLDEFS wouldn't show up in visual mode. Fixes #294. 2019-08-24 12:45:55 +02:00
Magnus Norddahl
c2157ee24e - fix field of view 2019-08-22 23:28:26 +02:00
Magnus Norddahl
9d02676f8f - fix wrong uniform state 2019-08-22 22:59:27 +02:00
Magnus Norddahl
64cc7d2bc2 - implement the fixed function fog 2019-08-22 18:43:54 +02:00
Magnus Norddahl
808d644c0b - fix visual mode movement not working 2019-08-22 16:26:22 +02:00
Magnus Norddahl
7abcb2a328 - remove unsafe keyword from functions no longer needing it 2019-08-22 15:52:17 +02:00
Magnus Norddahl
0562dac685 - fix screenverts math and some line drawing bugs 2019-08-20 12:45:23 +02:00
Magnus Norddahl
4c0e6e8fcc - implement plotter as a shader 2019-08-20 11:00:24 +02:00
Magnus Norddahl
e5500f7190 - don't update the texture unless something was drawn 2019-08-18 08:14:14 +02:00
Magnus Norddahl
9b0b6d2687 - clear command list once drawn 2019-08-18 08:11:09 +02:00
Magnus Norddahl
b51270fdfa - Delay plotter drawing until DrawContents is called 2019-08-18 08:07:28 +02:00
Magnus Norddahl
3142437444 - move plotter texture into plotter 2019-08-18 07:43:46 +02:00
Magnus Norddahl
5ccc225fa8 - fix light pass 2019-08-17 05:21:28 +02:00
Magnus Norddahl
6c9f9b9247 - remove unused code 2019-08-17 03:58:07 +02:00
Magnus Norddahl
c914aadcaa - simplify texture binding 2019-08-17 03:21:11 +02:00
Magnus Norddahl
c88b94e1c9 - render to texture bug fixes 2019-08-17 03:08:34 +02:00
Magnus Norddahl
cea032e025 - remove unused code 2019-08-16 14:06:03 +02:00
Magnus Norddahl
0542bd25ec - convert texturefactor to uniform 2019-08-16 14:01:27 +02:00
Magnus Norddahl
3968206199 - Sending data to Direct3D 9 just to retrieve it is stupid 2019-08-16 13:38:53 +02:00
Magnus Norddahl
149012e8b3 - simplify buffer indexing 2019-08-16 13:23:25 +02:00
Magnus Norddahl
9b53939f0c - simplify vertex buffer and vertex format 2019-08-16 13:07:57 +02:00
Magnus Norddahl
d701987fb4 - don't pass sizes into VertexBuffer and IndexBuffer constructors
- CopyTexture bug fixes
2019-08-16 11:24:22 +02:00
Magnus Norddahl
fb137d46db - draw streamed vertices 2019-08-16 07:45:34 +02:00
Magnus Norddahl
edecd3f7aa - rename draw functions 2019-08-16 07:12:26 +02:00
Magnus Norddahl
5604685770 - remove old fixed function shader as it isn't used 2019-08-16 07:10:46 +02:00
Magnus Norddahl
55c404e689 - add raw mouse input 2019-08-16 06:39:18 +02:00
Magnus Norddahl
e035ff8113 - fix alpha ending up in red channel 2019-08-16 05:37:03 +02:00
Magnus Norddahl
8ea439a5c2 - fix some rendering problems in visual mode 2019-08-15 14:49:49 +02:00
Magnus Norddahl
a542385cd7 - force texture and buffer updating to go through RenderDevice 2019-08-15 02:52:21 +02:00
Magnus Norddahl
b41cb07eaa - Hook up texture creation and binding 2019-08-14 13:51:05 +02:00
Magnus Norddahl
1d09a0f86a - implement ApplyUniforms 2019-08-14 12:36:33 +02:00
Magnus Norddahl
3c44f77b60 - port all the direct3d shaders to glsl 2019-08-14 07:55:21 +02:00
Magnus Norddahl
14fd3c96e1 - remove Things2DShader, World3DShader, Effect and EffectShader 2019-08-13 04:12:04 +02:00
Magnus Norddahl
0b3725e2fa - remove Display2DShader class 2019-08-13 02:43:01 +02:00
Magnus Norddahl
2eaf323ad0 - fix vertex array object binding bug
- add shader program
- fix that alpha color was stored in red channel in Color4
- fix buffer upload bug
2019-08-12 08:33:40 +02:00
Magnus Norddahl
d48f032b71 - create OpenGL context 2019-08-10 02:32:08 +02:00
Magnus Norddahl
3fae1e9ef3 - add RenderDevice bindings 2019-08-10 00:46:51 +02:00
Magnus Norddahl
e3740033fc - rename classes with D3D in them 2019-08-09 23:22:16 +02:00
Magnus Norddahl
8ada3862e4 - rename files 2019-08-09 23:20:36 +02:00
Magnus Norddahl
407cc703b8 - implement enough of BuilderNative for GZDB to successfully run without crashing 2019-08-09 23:15:48 +02:00
Magnus Norddahl
37876f6d8a - add BuilderNative library that does the actual rendering 2019-08-09 06:18:08 +02:00
Magnus Norddahl
690a4d2e83 - remove DataStream class 2019-08-08 20:06:35 +02:00
Magnus Norddahl
c665bfca86 - remove SlimDX namespace 2019-08-08 18:24:33 +02:00
biwa
c00a8995aa - Fixed a crash when loading OBJ models with faces without normals 2019-08-08 12:17:49 +02:00
Magnus Norddahl
8f15e8d5e7 - Simplify code 2019-08-08 07:10:35 +02:00
Magnus Norddahl
e4b257a89a - remove SlimDX.DirectInput namespace 2019-08-08 04:21:57 +02:00
Magnus Norddahl
21b46010c1 Merge remote-tracking branch 'origin/master' into slimgl 2019-08-08 04:07:00 +02:00
Magnus Norddahl
c8845ae559 - remove SlimDX Stopwatch 2019-08-08 04:02:00 +02:00
Magnus Norddahl
3cff90d716 - remove SlimDX.Direct3D9 namespace 2019-08-08 03:51:21 +02:00
Magnus Norddahl
1be047d316 - Simplify D3DDevice 2019-08-08 03:19:11 +02:00
Magnus Norddahl
90b5c41517 - update solution to .net framework 4.7.2 and add build output files to .gitignore 2019-08-08 00:18:44 +02:00
Magnus Norddahl
4cec56b5d6 - remove SlimDX dependency 2019-08-08 00:05:21 +02:00
biwa
363a07c609 - Fixed a bug where a thread unsafe string length measuring method could cause a crash. Fixes #275. 2019-07-16 20:37:18 +02:00
biwa
34f2c308bd - More model texture loading weirdness is now regarded 2019-06-16 19:31:44 +02:00
biwa
c2b18a913e - Fixed a bug where textures for internal model skin names did not load when "Path" was specified in MODELDEF 2019-06-16 18:40:10 +02:00
biwa
70b2be5e73 - Fixed a crash that happened when there were OBJ elements without parameters 2019-06-16 12:05:03 +02:00
biwa
dc74617820 - Fixed a problem with OBJ models being flipped 2019-06-16 00:03:37 +02:00
biwa
97d4fdd78a @Fixed some compiler warnings 2019-06-15 21:26:43 +02:00
biwa
dde8742ff2 - Added support for Wavefront OBJ models
- Fixed a problem where model textures were not loaded from the textures directory or from TEXTUREx definitions. Fixes #173 and #226
2019-06-15 17:44:02 +02:00
biwa
44745bdbc8 - More speed improvements to the texture browser 2019-05-31 23:11:17 +02:00
biwa
48af52afcf - Improved performance of the texture browser. This should significantly reduce the times it takes to open the texture browser when using large texture sets 2019-05-31 00:20:12 +02:00
biwa
36361de889 - Fixed a bug where script compile errors were not shown under certain circumstances. Fixes #161. 2019-04-19 19:58:41 +02:00
biwa
b5e950df89 - Fixed an issue where the current editing mode was not re-initialized properly when opening a map from current WAD 2019-04-19 16:14:30 +02:00
biwa
aafe42c88d - Test map from current mouse position now works properly in Hexen/UDMF maps with multiple player starts. Also works in maps without a valid player start now. Fixes #263. 2019-04-16 18:05:21 +02:00
biwa
03cb5249af Merge branch 'master' of https://github.com/jewalky/GZDoom-Builder-Bugfix 2019-04-14 18:27:34 +02:00
biwa
f2a343e118 - Added support for the ForceWorldPanning MAPINFO option. Fixes #258
- Improved support for auto aligning scaled textures
2019-04-14 18:24:37 +02:00
ZZYZX
95a9d28798 Specify git.exe instead of just 'git' for compatibility with my environment with Cygwin git... 2019-03-29 20:41:01 +02:00
volte
821016760b Fix for rotated grid algorithm causing a freeze in some circumstances (PR#255 by Volte) 2019-01-28 01:27:14 +02:00
ZZYZX
5c42035731 Fixed unused variable warnings; fixed compilation error in Renderer2D 2019-01-19 10:02:54 +02:00
volte
5157dafd6a Various fixes for rotated grid functionality (PR#253 by Volte) 2019-01-16 08:44:38 +02:00
volte
a1d28e1e56 Grid rotation and alignment functionality (PR#252 by Volte) 2019-01-14 20:07:08 +02:00
ZZYZX
e1b9f31525 Updated ZDoom ACS definitions; Updated ZScript parser for compatibility with latest GZDoom 2018-12-02 17:51:54 +02:00
ZZYZX
a705dc1e03 Maintenance: added missing FolderSelectDialog.cs 2018-10-08 01:26:51 +03:00
ZZYZX
6fc15a179f Fixed crash while trying to reference nonexistent vertices in Unreal models 2018-07-25 16:03:41 +03:00
ZZYZX
80b7d86cd8 Added: color user variable, //$UserReinterpret for color control on integer user variable 2018-07-24 11:35:52 +03:00
ZZYZX
04dc210db5 Added: string/float user variables, //$UserDefaultValue <value> for specifying default user variable value 2018-07-24 10:27:29 +03:00
ZZYZX
74e31b658b Fixed Builder.exe.config, only this time properly 2018-07-16 21:33:22 +03:00
ZZYZX
a196457f83 Fixed: GZDB wouldn't load plugins on certain paranoid systems due to plugin DLL's being "remote" and unsigned (reported by Lorenzo) 2018-07-16 17:06:49 +03:00
ZZYZX
20f96cd115 Added .iwad, .ipk3, .ipk7 extensions to recognized list (reported by someone somewhere some time ago...) 2018-07-13 08:20:45 +03:00
ZZYZX
1933b0b6de Changed Resource directory browser to use Win7 folder dialog, not Win9x one (reported by dpJudas) 2018-07-13 07:56:13 +03:00
Marisa Kirisame
afd710801f Update .3d support to match coelckers/gzdoom#506 (PR#221 by Marisa_Kirisame) 2018-07-05 12:50:03 +03:00
ZZYZX
50d458f764 Fixed null reference in visual mode when trying to render a thing without a sector (reported by Ozymandias81) 2018-06-23 19:20:39 +03:00
ZZYZX
b026e58a89 Added: MODELDEF #include support 2018-06-09 17:26:03 +03:00
ZZYZX
3c433cfcb8 Fixed scalar in UE1 model reader (was 127, should be 128) 2018-06-07 11:59:52 +03:00
JakeSmokie
6768bc7f37 Added sector raise/lower by 128mp (PR #215 by JakeSmokie) 2018-06-07 11:32:36 +03:00
ZZYZX
0f469e90ad Updated Unreal model loading to the fixed behavior (only this time really fixed) 2018-05-28 11:12:04 +03:00
ZZYZX
320b5f017f Updated Unreal model loading to the fixed behavior in GZDoom - axes were remapped incorrectly (I blame Marisa_Kirisame) 2018-05-28 11:00:57 +03:00
ZZYZX
8af4a46c5b Actually fixed vertex axes in Unreal models. Fixed the order of rotations in MODELDEF Offsets (this was not releavent to Unreal issues) 2018-05-28 04:06:21 +03:00
ZZYZX
260ffbe57b Fixed skin remapping method 2018-05-27 23:25:17 +03:00
ZZYZX
85f00ab9d7 Added multiple texture support for Unreal models 2018-05-27 21:05:57 +03:00
ZZYZX
4213be1c7a Added simple Unreal model support; Fixed numerous issues with normal handling; Fixed outright invalid handling of AngleOffset/PitchOffset/RollOffset in MODELDEF 2018-05-27 08:53:54 +03:00
ZZYZX
d6e1b815c3 Added platform information to application log 2018-05-27 04:25:16 +03:00
ZZYZX
db36293462 Added platform information to the saved error report 2018-04-16 03:22:24 +03:00
ZZYZX
e9c83d0646 Fixed: GZDB was built against wrong SlimDX version (including 64-bit which was built against 32-bit SlimDX) - (reported by StrikerMan780, leodoom85, Rockstar Racoon) 2018-04-16 01:51:57 +03:00
ZZYZX
a2a6004a61 Fixed (?): The new .NET 4.6.x JIT method inlining was fucking with GetCallingAssembly-based plugin detection 2018-04-15 01:59:58 +03:00
ZZYZX
000ecfbab0 Made GZDB output 64-bit in the title 2018-04-14 18:15:11 +03:00
ZZYZX
d9dfab64a0 Made some edits to the build scripts and auto-update routine to support 64-bit updating 2018-04-14 18:11:40 +03:00
jewalky
0b14bdeec1
GZDB native 64-bit binary support (PR#197 by StrikerMan780) 2018-04-14 16:55:21 +03:00
ZZYZX
0a5a2e81e0 Updated ZDoom ACC to the latest dev build (reported by printz) 2018-04-10 21:07:55 +03:00
ZZYZX
5344700f77 Added UDMF desaturation preview in classic modes 2018-04-10 20:54:57 +03:00
ZZYZX
9742a9f7bb Added UDMF desaturation preview in visual modes 2018-04-10 19:41:44 +03:00
ZZYZX
88d98acd49 Fixed: zero-radius point lights would crash upon entering things mode (reported by blood) 2018-03-31 14:13:35 +03:00
ZZYZX
10167038ae Fixed: on a second thought, let's just make FileImageReader fall back to guessed image if possible... 2018-03-31 14:01:36 +03:00
ZZYZX
f7c2a577e4 Fixed: made more correct checking for legal file formats; now it should actually validate the format upon loading 2018-03-31 13:38:30 +03:00
ZZYZX
abdacb32df Fixed: flats are now unconditionally detected as Doom Flat if they are exactly 4096 bytes long and inside F_ markers or flats directory. (reported by Chickenlegz) 2018-03-31 13:07:41 +03:00
ZZYZX
995e23f290 Enabled parsing of NaN in UDMF so that the existing buggy maps load; made it throw exceptions when a NaN vertex is added to the map 2018-03-25 01:40:31 +02:00
ZZYZX
efd2ded0b3 Made 2D spotlight projection even more accurate (reported by Gutawer) 2018-02-04 13:20:11 +02:00
ZZYZX
a0ef5209b7 Fixed light color picker to work with spotlights 2018-02-04 09:18:02 +02:00
ZZYZX
f97b0b2ee8 Made 2D spotlight projection more accurate 2018-02-04 07:28:41 +02:00
ZZYZX
4462224aaa Oops quickfix: inherited generic lights did not work 2018-02-04 06:30:50 +02:00
ZZYZX
5791171851 Added proper spotlight preview in 2D mode 2018-02-04 06:16:46 +02:00
ZZYZX
e91fe94794 Added string support for spotlight colors 2018-02-04 05:16:52 +02:00
ZZYZX
184982dc67 Added spotlight preview in visual mode 2018-02-04 04:18:59 +02:00
ZZYZX
089906bac0 Removed leftovers of default string value implementation 2018-02-04 02:50:46 +02:00
ZZYZX
d8bee559dc Did some maxcode refactoring about dynamic lights; added initial spotlight support (at least they are recognized as lights now) 2018-02-03 22:31:43 +02:00
ZZYZX
8375ece252 Fixed collection modification inside foreach. (reported by Lud) 2018-01-22 13:20:12 +02:00
ZZYZX
1d36d3fe6e Updated ZScript parser for const array definition support (reported by SanyaWaffles) 2017-12-25 02:45:21 +02:00
ZZYZX
f0364c15a5 Fixed one-line issue in model lighting pipeline (reported by everyone) 2017-10-25 07:58:48 +03:00
ZZYZX
3f35731914 Fixed: allow dotted identifier in array dimensions 2017-09-06 18:57:25 +03:00
ZZYZX
e7328e4caa Added support for non-1.2 pixel ratios if view stretching is enabled (reported by Nash); Fixed: map names in quotes were not recognized properly. 2017-08-27 08:10:22 +03:00
Mistranger
7168ad2095 Add "Mouse selection threshold" option (#141 by Mistranger)
* Mouse selection threshold

* Cleanup

* Fix selection bug
2017-08-24 16:24:03 +03:00
ZZYZX
c9162c6f26 Fixed: builtin dynamic lights were rendered at wrong height (reported by +Ku6EPyXOBEPTKA+) 2017-08-10 16:01:22 +03:00
ZZYZX
c0b3f983b9 Fixed minor translucent rendering issue 2017-07-26 19:34:01 +03:00
ZZYZX
a122dacf1d Added lights on models 2017-07-26 18:35:22 +03:00
ZZYZX
f14a4bd64a Added new flags for internal dynamic lights (reported by Nash) 2017-06-20 21:30:00 +03:00
ZZYZX
7603e5fa30 Fixed: INHERITACTORPITCH was actually changed along with USEACTORPITCH...doesn't really make sense compatibility-wise but there it is. (reported by alekv) 2017-05-29 06:38:11 +03:00
ZZYZX
d9d8c352a0 Fixed: pitch formula was duplicated and not changed in one of the places. (reported by Ozymandias81) 2017-05-10 22:53:30 +03:00
ZZYZX
0e43985f65 Fixed: flipped +USEACTORPITCH direction for recent GZDoom versions; this can be reverted by putting "buggymodeldefpitch = true;" in the game configuration for your specific projects if they are using old GZDoom versions. Note: already added for Zandronum. 2017-05-10 06:13:33 +03:00
ZZYZX
04324cd140 Fixed (?) cross-thread bitmap usage. (reported by Xane123) 2017-05-09 06:06:21 +03:00
Sean Baggaley
021bcf6981 Fix texture filtering not disabling properly (resolves #106) (#107 by csnxs) 2017-04-29 09:52:12 -04:00
ZZYZX
ad6ae1112e Fixed: render sorting issues with multiple translucent 3D floors next to each other on different heights 2017-04-29 13:56:17 +03:00
ZZYZX
de7445b786 Fixed nested template types handling in ZScript parser 2017-04-17 12:40:58 +03:00
ZZYZX
594dab97c8 Fixed: regression in texture selection window caused by previous fixes (reported by simc2) 2017-04-11 04:48:01 +03:00
ZZYZX
0c4051a5a0 Fixed 0.5/1.0 second sector light blinking specials (reported by printz) 2017-04-11 04:45:04 +03:00
ZZYZX
3d943f12bc Fixed: Internal: added off-grid vertices check to BuilderModes project 2017-04-11 04:33:41 +03:00
ZZYZX
983dea1b8a Fixed: all the old magic in SafeDistanceToSq is now only working for non-UDMF maps 2017-04-04 14:06:08 +03:00
ZZYZX
8dbe5f7a7b Fixed: Visplane Explorer depended on the old behavior of SafeDistanceToSq. (reported by riderr3) 2017-04-04 14:04:29 +03:00
ZZYZX
356eac34e2 Internal: Oops: removed debug leftovers (x2) 2017-04-03 20:45:51 +03:00
ZZYZX
b80c8febff Internal: Oops: removed debug leftovers 2017-04-03 20:42:34 +03:00
ZZYZX
a2c9de393e Fixed: changing flat names around is wrong... (reported by Lud) 2017-04-03 20:40:51 +03:00
ZZYZX
153c63b5d2 Fixed: the model should be Z-scaled to 0.83 even in unstretched view to ensure that models fit the geometry right (reported by Ozymandias81) 2017-03-29 04:11:05 +03:00
ZZYZX
bb650fa679 Updated ZScript parser to support abstract on classes 2017-03-28 15:07:12 +03:00
ZZYZX
10aa7e9493 Fixed translucent sprites. Added visual stencil color preview. (reported by Lud) 2017-03-25 05:19:42 +02:00
ZZYZX
aff6998dbd Fixed: reduced magic in Linedef.SafeDistanceToSq - fixes line/sector selection with 0.125mp grid (reported by camaxide) 2017-03-25 04:15:50 +02:00
ZZYZX
816e61d110 Added: binding actions to horizontal mouse wheel 2017-03-25 03:47:18 +02:00
ZZYZX
e9030bd5d8 Readme: devbuilds link should point to the right page. 2017-03-18 19:33:12 +02:00
ZZYZX
814fdd9027 Fixed: texture copy/paste in the visual mode was detected as failed pasting and caused a beep. (reported by DOOMGABR, abbuw, Turret_Master) 2017-03-17 17:48:14 +02:00
ZZYZX
53ce14fc43 Internal: fixed compiler warnings 2017-03-15 08:52:53 +02:00
ZZYZX
579b90a13c Fixed: the old way of checking for GZDB's directory writability would not work in certain versions of WINE/Mono 2017-03-14 20:31:04 +02:00
ZZYZX
36af342423 Internal: removed debug code from Renderer3D. 2017-03-13 03:12:24 +02:00
ZZYZX
35f8c5e10e Fixed: cutting a thing in visual mode would leave disposed BaseVisualThings in the selection. (reported by DOOMGABR) 2017-03-13 03:10:07 +02:00
ZZYZX
9bd51a0186 Updated ZDoom ACS compiler 2017-03-12 13:26:28 +02:00
ZZYZX
ee28f1d094 Made Skulltag item sprites optional to support default Skulltag+Zandronum config without producing 100 errors 2017-03-09 19:09:08 +02:00
ZZYZX
ce6074fd9f Internal: Oops: removed useless leftover file 2017-03-09 18:01:08 +02:00
ZZYZX
509fb55e62 Fixed field caption for floor glow color. 2017-03-09 01:32:20 +02:00
ZZYZX
957314a9ac Fixed: field name for things is called color_sprites. 2017-03-09 01:24:31 +02:00
ZZYZX
d8701b7a3a Added: proper GUI tab for color-related sector properties. The tab now hosts Doom64 lighting as well as old color-related things (floor/ceiling glow, light color, fade color and desaturation). 2017-03-09 01:00:20 +02:00
ZZYZX
87a2a14d7c Fixed: FAIL medal sprite in zandronum.pk3 was not parsed correctly 2017-03-08 23:34:21 +02:00
ZZYZX
4611aa1bc8 Added more specific debug logging to random NullPointerException crash place 2017-03-08 05:35:56 +02:00
ZZYZX
717e48edbb Fixed: for scaled walls, texture offsets should not be scaled (reported by Tormentor667) 2017-03-07 03:06:15 +02:00
ZZYZX
bbe651d366 Camera texture can be longer than 8 characters 2017-03-06 06:08:30 +02:00
ZZYZX
92825a0870 Updated ZScript parser to the latest syntax 2017-03-06 06:07:19 +02:00
ZZYZX
8c36eafbff Fixed state lookup logic for sprite guessing; it should always prefer SPRITE_CHECK_STATES to using the random first frame. 2017-03-04 16:50:46 +02:00
ZZYZX
522c1e3ff9 Fixed: never pick up POL5 frame definition from Actor::GenericCrush. Ew, blood. 2017-03-04 02:25:10 +02:00
ZZYZX
4b1a31c3ca Fixed: duration 0 frames should be skipped if there are nonzero frames after them (reported by Tormentor667, Ozymandias81). Fixed crash if some actor had a modeldef entry but doesn't anymore. 2017-03-04 02:13:39 +02:00
ZZYZX
f97c15ae95 Fixed: Internal: made most 'get' calls in WADReader use synchronized MemoryStream duplicate as opposed to operating on WAD stream directly. Hopefully fixes multithreading issues with sprite loading. (reported by Mysterious Haruko, camaxide) 2017-03-03 20:33:40 +02:00
ZZYZX
59c1320971 Fixed: flats and textures with the same name were not cached correctly in the texture browser. (reported by DOOMGABR) 2017-03-02 20:14:24 +02:00
ZZYZX
52e771fe1d Internal: Fixed: builtin light alteration by actor flags logic in GetGZLightTypeByClass 2017-03-02 00:57:29 +02:00
ZZYZX
61085027c2 Fixed: actor flags with inheritance from GZDoom dynamic lights (i.e. PointLight) 2017-03-02 00:36:33 +02:00
ZZYZX
748fe9e2e5 Fixed: inheritance from game configuration for dynamic lights; Fixed: visual representation of inherited lights (reported by Nash); Fixed: inherited thing arguments from game configuration; Added: //$ClearArgs for clearing inherited arguments. 2017-03-02 00:21:08 +02:00
ZZYZX
125844b308 Fixed: sprite replacements with different rotation count weren't handled correctly. (reported by DOOMGABR) 2017-03-01 18:35:15 +02:00
ZZYZX
6661ed44e3 Fixed: saving a script would reset scrolling to the top 2017-02-26 12:03:39 +02:00
ZZYZX
39889a94d1 Fixed: arg0str TextBox wasn't aligned to the right on Windows 10 (reported by SanyaWaffles) 2017-02-25 16:30:19 +02:00
ZZYZX
72352792c9 Changed: just use //$ArgNStr to check if arg0str is supported. If the argument is present, arg0str will be shown. 2017-02-25 11:08:27 +02:00
ZZYZX
2bb2c92aaa Fixed: don't use script control for non-script arg0str. That breaks things. 2017-02-25 11:04:00 +02:00
ZZYZX
6d1717336b Added: custom arg0str things with //$ArgNAllowStr and //$ArgNStr (title for string version) 2017-02-25 10:41:03 +02:00
ZZYZX
1a8b9d404f Added: search&replace support for non-script arg0str 2017-02-25 10:31:25 +02:00
ZZYZX
3748ea6398 Fixed: handling of arg0str in non-script specials in info panel; default arg0str. 2017-02-23 15:01:36 +02:00
ZZYZX
5ff54ab319 Added: arg0str in non-script specials. Kinda. 2017-02-23 14:19:07 +02:00
ZZYZX
3ac39598db Fixed: forgot to add ZDaemon_common.cfg; Fixed: Internal: removed hardcoded arg0str only for scripts 2017-02-23 13:54:42 +02:00
ZZYZX
1cb3682c6b Updated ZDaemon configuration and related files (13.02.2017 by Krawa) 2017-02-20 13:42:12 +02:00
ZZYZX
0ec1824253 Fixed: SplitLinesByVertices could leave disposed lines for iteration, which resulted in crashes on certain geometry while using 'Replace with Dragged Geometry'. 2017-02-20 09:13:35 +02:00
ZZYZX
e2fa70cd0f Internal: Oops: removed debug logging 2017-02-20 08:21:56 +02:00
ZZYZX
dba7088681 Internal: threw out a lot of unoptimized code in TraceSector. Now using Tools.FindPotentialSectorAt. 2017-02-20 08:14:07 +02:00
ZZYZX
6988bae720 Fixed: check for mathing argument lists was doing god-knows-what. Should now be ok. 2017-02-20 07:30:00 +02:00
ZZYZX
679f2eec62 Fixed: check for matching argument lists was severely broken and was resetting or not resetting almost randomly 2017-02-20 07:26:59 +02:00
ZZYZX
271df46f2a Added: script editor will now automatically trim trailing whitespace on save. 2017-02-20 07:07:44 +02:00
ZZYZX
bd00eef8de Fixed: preferences window size was off 2017-02-19 08:40:30 +02:00
Xabis
d3289d01de * Fixed a crash if setting an argument to the thing type ($Arg#Type = 14) on a decorate actor
* Added support for using the "Target Class" filter for argument thing types. Configure using the new $Arg$TargetClasses property. Note: only actors with a valid classname may be added to the filter.
2017-02-15 14:03:17 -05:00
jewalky
3540f55a25 Merge pull request #42 from Xabis/master
Direct tag-to-tag associations
2017-02-14 22:37:44 +02:00
ZZYZX
b4fbcf5d57 Fixed: 'forbidden' lumps are not supposed to count towards matching while detecting map type 2017-02-14 20:27:10 +02:00
Xabis
a886a53e75 * A direct tag-to-tag relationship can now be established between two things, which allows event lines to be properly setup between them. This is intended for interpolation and patrol specials which are linked via a shared tag, instead of an argument. A POSITIVE value represents the parent thing, where a NEGATIVE value represents the child thing.
* Added interpolation and patrol point specials to the persistent event line processing
2017-02-14 12:33:50 -05:00
ZZYZX
4a62478545 Fixed: 'Save into' would detect non-map lumps with the same name as maps and ask if you want to save over... 2017-02-14 17:48:31 +02:00
ZZYZX
d46860824d Fixed: in case there are other (non-map) lumps in the archive that have the same name as a map (e.g. MB2 patch and MB2 map in idl201x WADs) only the valid map is read. 2017-02-14 16:10:18 +02:00
ZZYZX
780482f429 Fixed: consequential duplicate maps weren't handled properly 2017-02-14 15:39:35 +02:00
ZZYZX
f8959507fb Fixed: old map format is now autodetected when saving a map over an existing one. Saving a map in different format shouldn't leave junk lumps anymore. 2017-02-14 15:25:16 +02:00
ZZYZX
d9eecbdc5e Internal: reverted mysterious MaxED edit in map saving functions 2017-02-14 12:13:53 +02:00
ZZYZX
dee1e0f417 Internal: removed now unneeded CopyAllLumpsExceptMap 2017-02-14 11:57:46 +02:00
ZZYZX
b996d8a380 Internal: not copying all lumps manually anymore on 'Save As'. The WAD is copied with File.Copy anyway. 2017-02-14 11:56:38 +02:00
ZZYZX
123145085f Fixed: Find&Replace in Script Editor would go into an infinite loop if replacement contains the searched text 2017-02-13 03:02:14 +02:00
ZZYZX
6bb79c1c8b Fixed: Internal: StairSectorBuilder wasn't marked as dependent on Builder project 2017-02-13 00:23:26 +02:00
ZZYZX
946e805138 Added: action numbers in linedef action selection dialog; Fixed: improper usages of 'Window' white color in place of 'Control' gray color in dialogs. 2017-02-12 20:58:19 +02:00
ZZYZX
bffb499ffb Fixed: removed useless rounding to 1px in Draw Curve, Draw Ellipse, Draw Rectangle, Draw Grid tools; this performed incorrectly with grid sizes less than 1px 2017-02-12 18:35:11 +02:00
ZZYZX
251c89f3e9 Supposedly fixed handling of multidimensional arrays in ZScript, as well as specifying array dimensions in the type 2017-02-11 17:47:07 +02:00
ZZYZX
02d5ce4c3b Internal: Oops: missing files 2017-02-10 12:32:35 +02:00
ZZYZX
db9bb4f4fd Info panel might work a bit faster now 2017-02-09 19:14:05 +02:00
ZZYZX
e3ebe7dcdf Fixed: additive-translucent geometry should not be lit 2017-02-09 16:49:58 +02:00
ZZYZX
d47dd9a533 Fixed: slightly incorrect texture name offsets in classic view in the texture browser 2017-02-09 15:45:50 +02:00
ZZYZX
cafd1a6f4e Fixed: lights were not applied to translucent textures 2017-02-09 15:08:31 +02:00
ZZYZX
3d69ec12d4 Fixed: lights behind the camera shouldn't count towards the max lights counter 2017-02-09 14:28:54 +02:00
ZZYZX
2b69b38e18 Added dynamic light count = 256 for high end users. Fixed: incorrect attenuated<->subtractive light ordering caused invisible subtractive lights. 2017-02-09 13:28:55 +02:00
ZZYZX
e62bbba9ff Internal: ZScript: now using StringBuilder in the internal tokenizer loops, might speed it up a bit 2017-02-09 04:07:27 +02:00
ZZYZX
1fb1167e5d Fixed: Internal: resumed resource would lose readonly attribute 2017-02-09 02:39:32 +02:00
ZZYZX
7f2f51d48d Added: primitive support for ZScript in the script editor (all classes in the current file are listed) 2017-02-09 02:26:25 +02:00
ZZYZX
1382d144fe Added: basic support for automatic user variables from ZScript classes, currently only for int variables (as supported by GZDoom). 2017-02-08 23:55:38 +02:00
ZZYZX
0d43a7be12 Fixed: 'Texture sizes below names' was handled incorrectly with 'Show texture sizes' disabled 2017-02-08 19:21:17 +02:00
ZZYZX
ed6e598519 Fixed: item selection gradient in classic views was severely off. 2017-02-08 18:58:13 +02:00
ZZYZX
46cc1df034 Merge anotak's optimizations - stage 4: Texture Browser 2017-02-08 18:36:40 +02:00
ZZYZX
4faed76b92 Merge anotak's optimizations - stage 3 2017-02-08 14:20:03 +02:00
ZZYZX
0fe77cf80b Merge anotak's optimizations - stage 2 2017-02-08 14:18:32 +02:00
ZZYZX
09b8c27dab Merge anotak's optimizations - stage 1 2017-02-08 14:18:01 +02:00
ZZYZX
34d1af9446 Reverted anotak's PR: it causes 'Cancel' button in Edit windows to automatically do undo or something similar, breaking maps completely 2017-02-07 20:02:31 +02:00
anotak
b5f7db1d50 Speedup on opening properties windows 2017-02-06 22:53:00 -06:00
anotak
52b47cd019 Revert "Revert "actionmanager change""
This reverts commit 4d9d1eda0f.
2017-02-06 00:10:10 -06:00
anotak
4d9d1eda0f Revert "actionmanager change"
This reverts commit a3ff16cacb.
2017-02-05 23:40:01 -06:00
anotak
a3ff16cacb actionmanager change
actionmanager change
2017-02-05 20:47:54 -06:00
ZZYZX
6971f6dfaf Internal: ~ConfigurationInfo destructor might be called before full construction took place 2017-02-04 22:03:32 +02:00
ZZYZX
5a5c6d0467 Internal: ZScriptTokenizer shouldn't reinitialize static stuff on every construction 2017-02-04 17:25:48 +02:00
ZZYZX
e6ca49581a Fixed: links should now open in the default browser and not what GZDB thinks to be the default browser.
Fixed: ZScript parser should no more crash on severely invalid code.
2017-02-03 09:15:54 +02:00
ZZYZX
7e502a1fa2 Fixed: color_absolute is not actually in GZDoom 2017-02-02 07:34:29 +02:00
ZZYZX
cb8473fa09 Added: 3D floor should be affected by control sector's color_floor and color_ceiling. 2017-02-01 20:16:42 +02:00
ZZYZX
76b2b1be10 Added: an option to display image sizes below names, not over texture previews 2017-02-01 19:10:22 +02:00
ZZYZX
71440fb21e Implemented more reliable dynlight-surface angle clip threshold 2017-02-01 17:29:08 +02:00
ZZYZX
fc7b9ec9a8 Removed dynlight-surface angle clip threshold - it didn't work properly anyway 2017-02-01 16:53:19 +02:00
ZZYZX
469942d263 Fixed: glow should apply before Doom64 coloring 2017-02-01 09:57:00 +02:00
ZZYZX
b80ead1202 Added custom fields for Doom64 lighting in the ZDoom configuration 2017-02-01 08:29:14 +02:00
ZZYZX
24c8b0497c fixed: First and last texture entires could never be selected using up/down controls 2017-01-30 06:20:48 +02:00
ZZYZX
f4947a20be Added: more magic to the autoalign/select neighbours logic; These functions should not anymore wrap around to the opposite side of two-sided linedefs, allowing you to select back and front sides separately using shift+click, and reducing infinite broken autoalign loops. 2017-01-26 15:33:07 +02:00
ZZYZX
dd48b5edfd Fixed: internal images were a bit broken by the previous commit 2017-01-26 12:01:11 +02:00
ZZYZX
7de5d10c0f Fixed: long texture names are no longer activated for Doom flat images (GZDoom doesn't support these) 2017-01-26 09:09:22 +02:00
ZZYZX
5ebdbd12d5 Fixed: 65:Plat_UpByValue had incorrect argument description 2017-01-25 17:31:03 +02:00
ZZYZX
ee936152cc ZScript: added #region support 2017-01-21 05:05:56 +02:00
ZZYZX
4c636a6d9a ZScript: added support for //$GZDB_SKIP special comment in the root scope. 2017-01-21 04:16:42 +02:00
ZZYZX
8c9514fba5 Fixed: broken previous gitbuild 2017-01-21 03:44:42 +02:00
ZZYZX
a5a942c798 Fixed: lump saving in script editor after editing archive with SLADE.\n Fixed: checking for concurrent modification in script editor while trying to save the lump. 2017-01-21 03:14:21 +02:00
ZZYZX
a705e47fb9 Fixed GLDEFS attenuate 1 and subtractive 1 logic 2017-01-20 00:59:04 +02:00
ZZYZX
49f55120ad Added: GLDEFS support for 'attenuate 1' keyword 2017-01-20 00:27:36 +02:00
ZZYZX
30a5edfdfe Added: attenuated dynamic light support 2017-01-20 00:17:43 +02:00
ZZYZX
819ef6490e Fixed: wild exception while replacing ZScript actor from DECORATE 2017-01-19 09:16:55 +02:00
ZZYZX
55b24eef39 Fixed: ZScript: scale property should be expanded into xscale and yscale; Fixed: if actor's Spawn state starts with TNT1, first non-TNT1 frame will be used 2017-01-18 08:35:26 +02:00
ZZYZX
87fdd67fd6 ZScript: himBHcomment arguments should be stripped of whitespace 2017-01-17 20:34:19 +02:00
ZZYZX
a1dc4bb157 Internal: Remembered various ZScript operators for the future; Script Editor: fixed script type icons 2017-01-17 20:19:45 +02:00
ZZYZX
7a70ac8c17 Internal: removed parser stuff from ActorStructure, StateStructure, StateGoto classes 2017-01-17 11:40:58 +02:00
ZZYZX
b783ea1c0f ZScript: enabled custom GZDB actor properties in Default block (//$ comments, same as DECORATE) 2017-01-17 11:21:01 +02:00
ZZYZX
a85a7a40f0 Renamed default category Decorate to User-defined 2017-01-17 10:39:30 +02:00
ZZYZX
c1387a8e7e Internal: refactored ZScriptTokenizer.ExpectToken for less redundancy 2017-01-17 10:19:48 +02:00
ZZYZX
dc72c533ca ZScript: fixed odd cases of inheritance (class SpecialShotgun : Shotgun replaces Shotgun) causing stack overflow 2017-01-17 07:29:01 +02:00
ZZYZX
05a160b533 ZScript: moved actor inheritance code to separate step; ZScript: ported game configuration inheritance code from DECORATE 2017-01-17 07:13:28 +02:00
ZZYZX
8fa63cae3d Fixed: DECORATE and ZScript parsers would ignore TNT1 when used in states 2017-01-17 06:58:52 +02:00
ZZYZX
0787f96042 GLDEFS, MODELDEF: Included ZScript actors in missing class check 2017-01-17 06:53:20 +02:00
ZZYZX
3bdfadc1d7 ZScript: implemented 'transient' and 'property' keywords 2017-01-17 06:41:33 +02:00
ZZYZX
76213ae1d6 Internal: tried to fix case sensitivity issues in X11R6RGB colors 2017-01-17 04:56:44 +02:00
ZZYZX
17fb9157df Fixed: MAPINFO parser wouldn't take quoted OutsideFogDensity 2017-01-17 04:51:12 +02:00
ZZYZX
76ce87eace Fixed null reference access while searching for superclass state; Fixed incorrect parsing of random() in frame duration; Fixed incorrect parsing of quoted sprite names 2017-01-16 14:10:11 +02:00
ZZYZX
37a3eab150 Enabled prototype ZScript support 2017-01-16 13:18:46 +02:00
ZZYZX
8afd01f6bd Internal: Disconnected ZDoom actor state data from DECORATE parsing code 2017-01-16 10:20:47 +02:00
ZZYZX
a0674f13fc Internal: finished enumeration of ZSCript actor properties and flags 2017-01-16 08:10:32 +02:00
ZZYZX
ad5b542cd0 Internal: finished enumeration of ZScript actor fields and methods 2017-01-16 07:20:49 +02:00
ZZYZX
b42de7db6c Internal: Moved ZScript class initialization logic to after querying all lumps 2017-01-16 03:49:58 +02:00
ZZYZX
db08802780 Enabled DECORATE classes to inherit ZScript ones 2017-01-16 02:08:35 +02:00
ZZYZX
6147ed2385 Internal: disconnected actor parsing from generic ZDoom actor structure 2017-01-16 01:35:27 +02:00
ZZYZX
fbf1aefef2 Internal: Fixed class extension, error reporting on invalid top-level keyword 2017-01-16 00:21:47 +02:00
ZZYZX
856cb9f860 Internal: Added ZScriptParser.cs, ZScriptTokenizer.cs 2017-01-16 00:03:44 +02:00
ZZYZX
38ffc861cb Internal: started implementing ZScript parser. Nothing works for now, aside from the actual parsing code. 2017-01-16 00:00:45 +02:00
ZZYZX
96ffb78678 Finished upgrading to VS2015 2017-01-15 18:12:49 +02:00
ZZYZX
e0fb41d37f Changed ZDoom/GitHub links so that people can report issues to the correct page 2017-01-15 06:30:53 +02:00
ZZYZX
5e11072970 Added IOException handling to image loading from disk (fixes GZDB Git issue #8) 2017-01-15 05:12:19 +02:00
ZZYZX
8277d7b63c fixed: Classic Texture Select: selected item in white background is supposed to be blue;
fixed: Texture Select: visible items were not clipped correctly;
fixed: 128x128 texture previews were too large for small window size in Texture Set editor
2017-01-15 03:40:11 +02:00
ZZYZX
fa7c536a27 Product name somehow reset AGAIN. Fixed. 2017-01-15 01:41:35 +02:00
ZZYZX
741897af76 Actually changed the product name 2017-01-15 01:40:19 +02:00
ZZYZX
668cb13794 Updated GIT build batch 2017-01-15 01:22:39 +02:00
ZZYZX
5821152368 Always show the revision number in window title, also renamed to GZDB-Bugfix 2017-01-15 01:14:15 +02:00
ZZYZX
ebd7fb1a57 Upgrade to VS2015 (14.0) 2017-01-15 00:35:40 +02:00
ZZYZX
36a5aa6cef Even with used textures on top disabled, textures should be separate from directories 2017-01-09 14:32:00 +02:00
ZZYZX
88ff83b74d Use the word 'flats' if currently browsing flats 2017-01-09 07:21:26 +02:00
ZZYZX
e43e3e12c1 Removed global 'available textures' header from classic view 2017-01-09 07:11:01 +02:00
ZZYZX
36381c51bb Should not have used textures category if not having them on top 2017-01-09 07:01:01 +02:00
ZZYZX
819d27885b Initial classic view mode in texture browser 2017-01-09 06:47:58 +02:00
m-x-d
2b24ce3c25 Updated, Textures Browser: texture name length is now taken into account when calculating the width of texture items.
Internal: moved thing helper shapes creation logic from ThingsMode to LinksCollector.
2017-01-09 01:04:55 +03:00
m-x-d
a41058bef9 Fixed, Script Editor: bottom panel was not automatically expanded after adding a script error.
Fixed, Script Editor: in some cases extra indentation was added to the duplicated line when using "Duplicate Line" command.
Added, Script Editor: some editor comments were missing from ZDoom_DECORATE.cfg.
Fixed, Game Configurations: fixed a crash when overriding an existing linedef action definition by a one from a different category (this fixes Issue #1).
2017-01-07 23:53:13 +03:00
MaxED
1c684f7213 Added, Things mode, Visual mode: added the ability to specify minimum/maximum argument range hint shapes using special DECORATE comments and Game Configuration properties (loosely based on range finder patch by Xabis).
Updated documentation ("Game Configuration - Action Argument Settings" and "DECORATE keys" pages).
2017-01-06 15:59:41 +03:00
MaxED
cd854779e8 Fixed, Classic modes, UDMF: grid size didn't go below 1 mu. when zooming in when "Dynamic grid size" option was enabled.
Internal: restored GridSetup DB2 compatibility.
Updated ZDoom_ACS.cfg (SetFogDensity, SetSectorGlow).
2017-01-06 13:01:59 +03:00
MaxED
a7d2417844 Visual mode, UDMF: added rendering support for fogdensity and floor/ceiling glow properties.
Internal, build tools: use origin/master to get commits count and current hash instead of local master.
2017-01-04 16:28:36 +03:00
MaxED
7052dbec5d Fixed, Sector Edit window, UDMF: fixed some incorrect tooltips. 2016-12-30 13:44:21 +03:00
MaxED
a9c19754ce Added, Sector Edit window, UDMF: added UI support for "floor_reflect", "ceiling_reflect", "floorglowcolor", "floorglowheight", "ceilingglowcolor", "ceilingglowheight" and "fogdensity" UDMF properties.
Updated ZDoom ACC.
2016-12-29 18:15:35 +03:00
MaxED
be1e799688 Internal: Git commit hash is how shown in the About window.
Internal: Git commit hashes are now shown in the Update window changelog.
Internal: Exception window now links to GitHub Issue Tracker instead of zdoom.org GZDB thread.
2016-12-28 15:24:58 +03:00
MaxED
659250e805 Internal: removed some old unused resource/test/documentation files. This reduces repository size by approx. 20Mb. 2016-12-28 14:29:31 +03:00
MaxED
be7ba0a05d Added: minimum grid size is now 0.125 instead of 1. 2016-12-27 16:59:20 +03:00
MaxED
84886d10ba Internal: more updates to the build toolchain... 2016-12-27 15:12:57 +03:00
MaxED
ed3233736b Internal: updated the manual ("Compiling GZDoom Builder" page) and UI to reference GitHub/Git instead of SourceForge/SVN.
Internal: post build event in Builder.csproj worked only when compiling using batch files.
Internal: updated README.md.
2016-12-27 13:12:10 +03:00
m-x-d
f9c2bbe44a Internal: updated build tools and scripts to work with Git instead of SVN. 2016-12-27 02:05:53 +03:00
MaxED
a8f4f67f22 Internal: rewritten part of NodesViewerMode to use iteration instead of recursion.
Internal: post build event in Builder.csproj worked only in VS 2008.
2016-12-26 13:37:57 +00:00
MaxED
b37bc84fff Fixed, Script Editor: fixed incorrect function calltip position when the cursor was positioned in a wrapped part of a wrapped line.
Updated ZDoom_DECORATE.cfg.
2016-12-25 21:00:41 +00:00
MaxED
26687a2ee3 Added, Textures Browser: "[All]" folder is now added to each map resource. It holds all textures found in that resource.
Fixed, Textures Browser: only name filtering is now applied to folder-type image items, filtering is never applied to "go to parent folder" image items.
Fixed, Textures Browser: in some cases "Backspace" key was ignored by the Filter textbox.
Fixed, Textures Browser: "Ctrl-Backspace" key combo now clears Filter textbox instead of adding an unknown char to it.
2016-12-24 21:52:42 +00:00
MaxED
f2db0e1d30 Changed, Textures Browser: frames/names of used textures are now drawn using a different color.
Changed, Textures Browser: the browser now toggles between showing used textures on the top of the list and showing textures in alphabetical order instead of toggling between showing all textures and used textures.
2016-12-23 12:39:09 +00:00
MaxED
447851e457 Added, Textures Browser: redesigned textures list. Textures preview size can now be changed from the Textures Browser window. Folders are now shown in the textures list.
Fixed, Script Editor: Find and Replace window now sets keyboard focus to the input textbox when opening the window/switching between tabs.
Fixed, Nodes Viewer mode: SEGS overflows were not handled, causing a crash. Also extended SEGS limit is now used.
Updated ZDoom_DECORATE.cfg (A_SetSize).
2016-12-22 15:04:40 +00:00
MaxED
d73ea867a4 Fixed, Script Editor: MD5 hash of text files stored in PK3 was calculated incorrectly, resulting in false warning messages when saving. 2016-12-22 00:03:58 +00:00
MaxED
cfc92d9075 Added, Draw Lines mode: added "Remove First Vertex" action (Ctrl-Backspace). It removes the first drawn vertex from the drawing session. Renamed "Remove Previous Vertex" action to "Remove Last Vertex".
Changed, Classic modes: added a limit on how far the view can be scrolled from the editable map area.
Fixed, Drag geometry modes: in some cases incorrect vertices were removed when using "Replace with dragged geometry" drag mode.
Fixed, Game configurations: sector special 195 ("Hidden Sector") was missing from Hexen/UDMF specials list.
2016-12-16 21:23:37 +00:00
MaxED
45c3cbaae3 Added, Script Editor: added script configurations / auto-detection support for GAMEINFO, FONTDEFS and KEYCONF text lumps.
Fixed, "Open Map Options" and "Change Map" windows: fixed incorrect size of the items in the maps list when using high-DPI scaling.
Updated ZDoom_DECORATE.cfg and ZDoom_MAPINFO.cfg.
2016-12-12 12:35:18 +00:00
MaxED
b283fab795 Fixed, action arguments control: in some cases named script name was not displayed.
Fixed, Script Editor: Delete key was not working in the text editor (because it was hijacked by context menu action, which requires a selection to be active).
2016-12-10 21:33:59 +00:00
MaxED
da02474302 Applied skybox cubemap creation performance increase patch by Xabis.
Added, MAPINFO parser: added support for "Skybox" map block property.
2016-12-08 13:11:11 +00:00
MaxED
88363a1a66 Added, Script Editor: added "Find usages" option (available in the "Search" menu, via text editor context menu, via Ctrl-Shift-F shortcut and in the "Find and Replace" window).
Added, Script Editor: double-clicking text resource tab header now shows the corresponding resource in the Resources tree.
Updated, Game configurations, UDMF: added several missing Thing renderstyles.
2016-12-08 12:10:43 +00:00
MaxED
5dd45ffdca Updated, Script Editor: redesigned "Find and Replace" window. It can now search/replace in all opened tabs and all detected text resources.
Fixed, Script Editor: resources list control was incorrectly positioned when using DPI scaling.
2016-12-02 13:45:03 +00:00
MaxED
a31c6b6652 Fixed, Script Editor: resources navigator was always loading the first WAD lump with matching name when trying to open any of several WAD lumps with matching names.
Reverted, Visual mode: looks like all additional cases of displaying sky hack added in r2755 were actually undefined engine behaviors, not the "proper" shy hack... Reverted implementation to the wiki definition of the sky hack.
2016-11-30 20:12:32 +00:00
MaxED
1523d06ee3 Updated, Visual mode: some cases when the sky hack must be applied were not handled.
Updated, Script editor: script editor was unable to show error location after double-clicking on it in the Warnings and Errors window when said location was inside of a WAD located in a PK3 file.
Updated, text lumps tracking: already parsed DECORATE/GLDEFS lumps are now added to the text lumps list even when DECORATE/GLDEFS parsing fails, allowing you to fix errors without the need to use external tools.
Fixed: in some cases the editor could stuck in an infinite loop when searching for wad lumps.
2016-11-28 20:01:47 +00:00
MaxED
18dc8cebba Fixed: in some cases only the last data (sprite/texture/patch etc.) range was detected in WADs.
Fixed, Script Editor: Cut/Copy/Paste/Undo/Redo keyboard shortcuts were handled incorrectly when quick search textbox was focused.
Fixed, Script Editor: Find next/Find previous quick search button actions were handled incorrectly.
Updated documentation.
2016-11-26 20:03:59 +00:00
MaxED
aecd017b19 Added, Errors and Warnings window: most of warnings/errors related to (G)ZDoom text lump parsing can now be double-clicked to show warning/error source in the Script Editor.
Fixed: some map format conversion errors were never displayed, because errors list was cleared after performing map conversion.
Fixed: 3d floor indicators in 2D modes were not updated after leaving Visual mode.
Fixed: some UDMF-only interface buttons were never removed after converting map format from UDMF.
2016-11-26 00:02:56 +00:00
MaxED
9553042c84 Added, Script Editor: unreferenced ACS files are now shown in the Resources list.
Added, Script Editor: MENUDEF and SBARINFO files/lumps are now shown in the Resources list.
Fixed, ACS handling: fixed a crash when trying to parse an #include file, when specified path was absolute.
2016-11-24 21:09:24 +00:00
MaxED
894279b4ba Added, Script Editor: added "Script Navigator" tab. It shows and allows to open text resources loaded by the editor.
WARNING: because of the large amount of added/modified code, bugs are possible, so backup your resources, save often and report bugs.
2016-11-24 11:55:11 +00:00
MaxED
36ff694e79 Fixed: window size and location was not saved when closing a maximized or minimized window. 2016-11-22 12:07:39 +00:00
MaxED
21cab1d134 Added, Game configurations, ZDoom: Ambient sound things (14001 - 14064) were missing arguments definitions.
Fixed, Make Sectors mode: in some cases sector shape detection logic returned incorrect shape, or no shape at all.
2016-11-21 13:03:19 +00:00
MaxED
0cc5374295 Fixed, Things mode: fixed a crash when deleting Light/Ambient Sound things when "Show Dynamic Light Radii" / "Show Ambient Sound Radii" settings were enabled.
Fixed: WAD lump index was not appended to lump name when reporting errors during ZDoom text lumps parsing.
2016-11-19 20:43:42 +00:00
MaxED
c0b46bc6a5 Added, Game configurations, ZDoom: added Line_SetBlocking (55) linedef action.
Fixed, Draw Rectangle mode: fixed a crash caused by incorrectly changing text labels array when accepting the drawing.
Fixed, "Check unknown ACS scripts" error check: named scripts check was performed incorrectly causing it to fail on script names containing uppercase letters.
2016-11-18 17:34:49 +00:00
MaxED
fb937b9e61 Added "Apply Directional Shading" mode. It can be used to apply directional colored flat shading to sloped terrain sectors (line and vertex slopes are supported) and sidedefs.
Updated ZDoom ACC.
Updated ZDoom_ACS.cfg.
2016-11-16 20:31:04 +00:00
MaxED
7d3a0c779d Changed, Game configurations: "default" property is no longer mandatory for universal field definitions.
Fixed, Game Configurations window: map resources were not marked for reloading after pasting resources to currently used game configuration.
Fixed, Game configurations: "Platform Generic Change" action's arg2 value must be in octics.
2016-11-14 10:22:24 +00:00
MaxED
4306e277e6 Fixed map lumps duplication when saving the map several times after converting the map from/to UDMF map format by changing it in the Map Options window.
Fixed, cosmetic: in some cases incorrect resource loading time was displayed after saving the map.
2016-11-10 19:18:06 +00:00
MaxED
0a6a6bbd20 Restored the ability to paste map elements copied in DB2/DB64. 2016-11-10 12:07:12 +00:00
MaxED
c2ef080268 Changed, Sector drawing: sector height is set to 0 when the nearest sector's height is < 0 (previously default sector height was used when the nearest sector's height was <= 0). 2016-11-10 00:35:29 +00:00
MaxED
437fe9ce86 Updated, GLDEFS parser: updated glowing texture parsing logic to better match GZDoom logic.
Removed, GLDEFS parser: removed GLOOME glow definitions support code.
2016-11-09 10:07:21 +00:00
MaxED
5f2454230a Added script editor configurations for the most of ZDoom text lumps.
A minor code refactoring.
2016-11-04 09:48:51 +00:00
MaxED
9534a20eb3 Optimized map geometry merging performance when creating drawn lines.
Optimized map geometry merging performance when pasting map geometry.
Added, Curve Linedefs mode: added "Flip Curve" button.
Updater: partially rewrote fix from the previous commit.
2016-10-31 18:52:29 +00:00
MaxED
a70d9d00d6 Fixed the editor crashing/locking up when trying to read TEXTUREX patch containing invalid data. 2016-10-28 21:08:22 +00:00
MaxED
8570922d0d Fixed the editor crashing/locking up when trying to read TEXTUREX patch containing invalid data. 2016-10-28 21:07:33 +00:00
MaxED
3e132f1cf2 Changed, Curve Linedefs mode: re-designed the mode UI. Alternative control options are now available (check Help tab while the mode is active).
Changed, Curve Linedefs mode: changed curve generation logic. Setting Distance to 0 will now divide selected linedefs into equal parts.
Changed, Curve Linedefs mode: curve vertices are now drawn.
Updated ZDoom_DECORATE.cfg.
2016-10-26 22:33:36 +00:00
MaxED
a6351a9d69 Updated: sector triangulation logic now works ~50% faster than DB2 implementation. 2016-10-24 23:30:40 +00:00
MaxED
9908e41197 Added, Game configurations: added "ignoreddirectories" parameter. It lists directory names to be ignored when loading PK3/PK7/Directory resources.
Added, Game configurations: added "ignoredextensions" parameter. It lists file extensions to be ignored when loading PK3/PK7/Directory resources.
Updated: sector triangulation logic now works ~20% faster.
Changed: a case when a pk3/pk7 archive contains several entries with identical filename is now treated as a warning, not as an error.
Fixed, Visual mode: absolute floor/ceiling brightness should not be affected by brightness transfer effects (like 3d floors).
Fixed, Draw Lines mode: in some cases unclosed sectors were created when several points were successively drawn at the same location.
Updated documentation.
2016-10-24 19:19:11 +00:00
MaxED
70d35bf1d6 Added, Edit Sectors window: added UI for floor/ceiling portals.
Updated ZDoom_DECORATE.cfg.
Updated documentation ("Game Configuration - Sectors Settings" page).
2016-10-11 12:58:35 +00:00
MaxED
100c4ae976 Added: some numeric text inputs now support expressions (e.g. (23+15)*1.5). - inspired by https://www.doomworld.com/vb/doom-editing/91089-gzdoombuilder-patch-expression-evaluation-for-sector-heights/
Fixed, Game Configurations window: fixed a crash when switching to a game engine without the file path using the "Engine" drop-down.
2016-10-10 14:14:47 +00:00