Commit graph

3138 commits

Author SHA1 Message Date
biwa
565f1f885b Changed how performing undo interacts with volatile modes (it will now actually perform the undo instead of just canceling the volatile mode) 2020-06-13 15:56:16 +02:00
biwa
14c65dae5b - Only allow Edit Selection Mode to be cancelled once
- Added preliminary code to remove new 3D floor control sectors when pasting was canceled after duplicating 3D floors
2020-06-13 15:35:20 +02:00
biwa
c43c000109 Draw Grid Mode: fixed a crash that happened when having locking slices to grid enabled 2020-06-13 00:30:58 +02:00
biwa
4fbcc11418 Added functionality to duplicate 3D floor control sectors of selected sectors and paste selected sectors with the new control sectors assigned 2020-06-13 00:24:24 +02:00
biwa
a6dbd2c258 3D Floor Mode: fixed a bug with the "Detach all" and "Split all" that would create (and immediately delete) redundant control sectors 2020-06-11 00:04:20 +02:00
biwa
b5d8985e70 3D Floor Mode: added "Split all" and "Detach all" buttons to 3D floor editing window 2020-06-10 22:54:02 +02:00
biwa
cce50e9376 Hopefully fixed broken auto alignment of certain sloped 3D floors (without breaking anything else) 2020-06-09 22:10:15 +02:00
biwa
0590216c73 Slope Arch Form: added option to invert the arch 2020-06-08 23:45:08 +02:00
biwa
95dd6e284e Draw Grid Mode: number of slices less than 3 will now be remembered correctly
Draw Grid Mode: added option to to draw the slices relative to the origin of the drawing (so that you don't have to change the slice interpolation all the time)
2020-06-08 23:00:14 +02:00
biwa
cb6f6e1d93 Added missing images for arch slope dialog 2020-06-08 21:10:51 +02:00
biwa
5b89a9d4cb Added missing files to the Mono project file 2020-06-08 21:06:39 +02:00
biwa
6e4bb04516 Merge remote-tracking branch 'origin/master' into arching 2020-06-08 20:58:45 +02:00
biwa
d01cbb2c37 Some code cleanup
Added comments to code
2020-06-08 20:58:00 +02:00
biwa
f5d12e06df Improved slope arching form 2020-06-07 18:01:19 +02:00
biwa
d6d579ab76 Some refactoring
Made sloping work more reliably with irregularly shaped sectors
2020-06-06 11:51:09 +02:00
biwa
9855436fa6 3D floor mode: fixed a problem where splitting a 3D floor didn't work correctly when some selected sectors didn't belong to that 3D floor 2020-06-05 19:49:38 +02:00
biwa
f93a13c1f2 Fixed base heights for 3D floors
Improved handling of changing input boxes in slope arching form
2020-06-05 18:37:48 +02:00
biwa
b04cafd016 Added missing file 2020-06-04 17:12:56 +02:00
biwa
cdf745745a Texture sets now work with textures from a directory or PK3/PK7 (it matches against the short 8 character name) 2020-06-04 16:16:09 +02:00
biwa
2fe9345e76 Updated project file 2020-06-04 15:48:23 +02:00
biwa
aaa252bd35 Moved slope arching code into its own class
Improved functionality
2020-06-03 23:34:22 +02:00
biwa
b4e89974bd Added dialog to modify the slope arch 2020-06-01 21:57:17 +02:00
biwa
4e36099b22 Arching works... kind of 2020-06-01 17:16:13 +02:00
biwa
0a6ee07ba1 3D Floor Mode: fixed a bug that would not increment the sector tags correctly if a tag range is used 2020-06-01 11:54:25 +02:00
biwa
17987918de Fixed a bug where modifying a user_ ZScript variable through the custom properties tab would cause a crash. Fixes #420. 2020-06-01 11:12:52 +02:00
biwa
aecb1e67b7 Preliminary code for arching 2020-06-01 09:50:35 +02:00
biwa
e3e76c2b40 Edit Selection Mode: fixed a bug where the control sectors of sloped 3D floors were not updated correctly when one 3D floor was applied to multiple sectors 2020-05-30 17:32:17 +02:00
biwa
82f019b8bd Fixed a potential crash when undoing while having slope handle picking enabled 2020-05-30 16:41:05 +02:00
biwa
c164139d5e Fixed some more places where values given to new UniValue were cast to float instead of double 2020-05-26 18:49:42 +02:00
biwa
10ceef6715 Fixed jittery camera when being far away from the map origin 2020-05-24 11:35:53 +02:00
biwa
342ea4f518 Trying to fix jittery camera when being really far away from the map origin (didn't fix it yet) 2020-05-23 10:37:42 +02:00
biwa
bdc6a23934 Fixed some more cases where UniValues were set to floats. Added throwing exceptions to the UniValue constructor (gasp!) 2020-05-23 10:01:52 +02:00
biwa
abb61f1f09 Possible fixed a crash in LinedefInfoPanel.SetPairedUDMFFieldsLabel 2020-05-23 01:37:14 +02:00
biwa
9338d1221f Removed lots of unnecessary casts to float of the Math methods. Also removed some other minor implicit casts 2020-05-22 22:30:32 +02:00
biwa
ab81b17554 More conversion from float to double. Doesn't seem to crash anymore. 2020-05-22 21:39:18 +02:00
biwa
91cbcde1eb It's compiling! 2020-05-21 14:20:02 +02:00
biwa
fb3c9e7168 Started conversion from float to double 2020-05-18 18:14:54 +02:00
biwa
66be0af555 Edit Selection Mode: flipping now works on plane equation slopes 2020-05-17 22:45:33 +02:00
biwa
a5a658cc57 Edit Selection Mode: rotating sectors with plane equation slopes now works correctly if the sectors are not rectangular 2020-05-17 15:01:21 +02:00
biwa
bccb1ace56 Some refactoring to remove convoluted code 2020-05-17 12:18:58 +02:00
biwa
caf7477d75 Edit Selection Mode: slopes of 3D floor control sectors are now properly updated when moving/rotating sectors (only when not pasting) 2020-05-17 11:48:58 +02:00
biwa
fd41361f6d Fixed an issue in Edit Selection Mode that could cause Out Of Memory exceptions with vertices that are slightly off grid in the 32 bit version 2020-05-16 13:22:33 +02:00
biwa
4fd976feb9 Using Edit Selection Mode on sectors with plane equation slopes works correctly now (flipping still doesn't work) 2020-05-16 12:26:16 +02:00
biwa
f0bfc74702 Decoupled plane equation slopes from sector heights. This means that changing sector heights will not change those slopes (use the offset box in the "slope" tab of the Edit Sector Dialog instead) 2020-05-16 10:40:24 +02:00
biwa
47cec444b5 Slopes of 3D floor are now preserved when dragging the tagged sectors
Added option to lock texture offsets of 3D floors when dragging the tagged sectors
2020-05-03 17:25:07 +02:00
biwa
c0bdae79b8 Fixed a crash that happened when entering Edit Selection Mode while performing the Edit action 2020-04-30 20:22:26 +02:00
biwa
7114d17eeb Texture browser: input boxes don't lose focus anymore when the mouse is moved into the texture list area. Fixes #369. 2020-04-28 23:35:36 +02:00
biwa
9cadd378bc Changed the ambient sound drop down menu of ambient sound things to natural sort order. Resolves #406. 2020-04-28 22:48:00 +02:00
biwa
594fe0403d Removed DebugConsole functionality in non-debug builds 2020-04-26 00:58:42 +02:00
biwa
f15c0e0eb1 Fixed a crash that happened when the script window is opened but minimized, the script has syntax errors, and then the map is saved. Fixes #402. 2020-04-25 17:43:14 +02:00
biwa
684e366248 3D Floor Mode: allow pasting for texture names with more than 8 characters in the 3D floor editing window 2020-04-21 22:56:19 +02:00
Magnus Norddahl
8eb522c873 Move vpo native code into BuilderNative as it is easier to manage. The plugins folder doesn't support including native dlls properly anyway.
Fix visplane explorer busy looping when waiting for data and reduce the used core count to 75% of the total available
Made vpo native code thread safe, removing the need for ungodly DLL patching hacks
2020-04-19 15:56:24 +02:00
Magnus Norddahl
db44d411c7 Fix black output from visplane explorer 2020-04-19 14:19:18 +02:00
biwa
f4e9556262 Significantly reduced video memory usage when pasting sectors. Should also significantly increase speed when pasting many sectors. Fixes #400. 2020-04-19 11:58:55 +02:00
biwa
29e96f965f Removed default hotkeys from visual sloping actions 2020-04-11 21:19:08 +02:00
biwa
308e8fe4cb Fixed a bug where the DECORATE parser got confused by wrong tokens after starting the states definition. Fixes #374. 2020-04-11 18:46:45 +02:00
biwa
a5a78aa248 Added paint select to 3D Floor Mode
Fixed multi select in 3D Floor Mode to work when starting to drag inside a sector
2020-04-11 11:52:31 +02:00
biwa
b83467148b Fixed a crash in Edit Selection Mode when visual sloping was previously used to make the slope of a sector perfectly planar 2020-04-11 10:51:25 +02:00
biwa
138c96bb13 Moved smart grid transform into Linedefs Mode and Vertices Mode, so it also works when simply highlighting a linedef or vertex. When doing smart grid transform on a linedef it'll also use the vertex closest to the mouse cursor as the origin instead of always the start vertex 2020-04-11 10:42:41 +02:00
biwa
12b3906470 Added "Smart Grid Transform" action that sets grid transformation based on the selected elements. Vertex selected: set grid origin to that vertex. Linedef selected: align grid to that linedef. Nothing selected: reset grid transformation to the default coordinate system. No default key bound. 2020-04-10 13:40:30 +02:00
biwa
65eec24af4 3D Floor Mode: using tab in the 3D floor editor window now cycles through the input fields in a sane order 2020-04-10 12:20:01 +02:00
biwa
ac73ca7422 Fixed a crash that would happen when the line slope things (9500/9501) are used but the linedef they are tagged to doesn't have a front sidedef. Fixes #398. 2020-04-10 12:11:42 +02:00
biwa
999d5ade9e More BuilderMono.csproj fixes 2020-04-10 11:20:19 +02:00
biwa
a09b9b93e4 BuilderModesMono.csproj needs the fix too, of course. 2020-04-10 11:04:00 +02:00
biwa
ca4dc1958c Hopefully fixed BuilderMono.csproj to compile for Mac and Linux again. 2020-04-10 10:57:38 +02:00
biwa
58d5bfd59b Merge branch 'visual-slope2' 2020-04-10 10:40:42 +02:00
biwa
ff5cea7ba3 Fixed rare potential crash when raising/lowering floors/ceiling to the closed neighbor 2020-04-07 21:18:07 +02:00
biwa
895053ec26 Fixed indentation in ImageBrowserItem 2020-04-05 20:21:35 +02:00
volte
9693321590 Further performance improvement to image browser 2020-04-05 11:40:14 -04:00
volte
b1f4cdcd1c Fixed slowdown in ImageBrowser due to repeated queries for system font 2020-04-05 09:15:34 -04:00
biwa
a373421abd Copy'n'paste should now work correctly with plane equation slopes 2020-04-04 22:02:13 +02:00
biwa
560d4a5828 When auto-aligning textures on floors/ceilings they can be scaled independently on slope type
Added option to select behavior (Tools -> Preferences -> Editing) of scaling when auto-aligning textures on floors/ceilings (use base scale of 1 (default), use current scale as base, never scale)
2020-04-04 18:03:40 +02:00
biwa
a3ce81dc2b Merge branch 'master' into visual-slope2 2020-04-04 13:12:20 +02:00
biwa
ef4c763879 Fixed display and auto-align issues when using hires texture replacements with local scaling 2020-04-02 22:46:40 +02:00
biwa
8115d12b6c Custom types for user defined UDMF fields could cause problems when fields with the same name used different types, so they are disabled for the time being (only bool, int, float and string are allowed now) 2020-03-29 21:44:29 +02:00
biwa
1fc503fa24 Update things before adding their geometry in visual mode so things don't go awry when realtime editing them. Fixes #393. 2020-03-29 17:31:20 +02:00
biwa
e07a3170ac Made drop down items for ambient sounds more descriptive 2020-03-29 16:29:53 +02:00
biwa
3f4a0a0e23 Aligning textures on the X axis now works correctly with negative scale values when world panning is not enabled. 2020-03-29 12:49:05 +02:00
biwa
1d5867333c There can be multiple different ambient sounds with the same sound name, so add the index to the name to differentiate them. Fixes #390. 2020-03-29 11:53:12 +02:00
biwa
91e0f8d56c Fixes for raisesectortonearest and lowersectortonearest action when used on slope handles to account for float rounding errors 2020-03-21 01:19:04 +01:00
biwa
a4466ba01b Added support for helper messages in version/deprecated modifier in ZScript 2020-03-19 20:14:57 +01:00
Magnus Norddahl
3346c00fab Keep stream open so that the image loaders can be chained 2020-03-19 19:54:54 +01:00
biwa
f5baa09684 The raisesectortonearest and lowersectortonearest now work with visual slope handles 2020-03-19 16:16:08 +01:00
Magnus Norddahl
44d972c876 Fix crash when tga image loader succeeds in loading a 0x0 image
Copy resource bitmaps before using them on a worker thread
2020-03-19 15:46:04 +01:00
biwa
7b0adadbfb Merge branch 'master' into visual-slope2 2020-03-17 22:10:04 +01:00
Magnus Norddahl
e19b2912f3 Update mono project file 2020-03-17 21:07:51 +01:00
Magnus Norddahl
6492a2b3ff Merge branch 'nodevil' 2020-03-17 21:06:10 +01:00
alexey.lysiuk
127aff5cc4
Fixes for non-Windows platforms (#371 by alexey-lysiuk) 2020-03-17 21:37:58 +02:00
Magnus Norddahl
29b30a3dcc This joke isn't funny when half the racists in the US is saying this 2020-03-17 20:09:34 +01:00
biwa
0282f34324 3D Floor Mode: Don't set valid plane equation when the the surface isn't sloped 2020-03-15 10:39:26 +01:00
biwa
4ae5f32004 3D Floor Mode: splitting/detaching 3D floors now preserves slope equation slopes 2020-03-14 21:31:24 +01:00
biwa
c34b6e310a Rotating sectors with plane equation slopes in Edit Selection Mode works properly now 2020-03-14 20:06:30 +01:00
biwa
e8cc2f9801 Self-inheritance of ZScript classes is now considered an error and not a warning 2020-03-14 15:46:00 +01:00
biwa
d3b90f4f50 Print a warning and skip parsing classes that try to inherit from themselves (instead of going into an infinite loop) 2020-03-14 13:18:45 +01:00
biwa
e798450abd The sloping between handles action is now a bit more convenient and tries to figure out what the user wants to do even if not exactly two slope handles are selected. 2020-02-24 13:57:26 +01:00
biwa
afef349220 - Slope handles are not shown anymore when showing selection is disabled
- Smart pivot handles are now shown for the highlighted slope handle
2020-02-24 12:54:59 +01:00
biwa
37e8154556 - Some refactoring
- Added action to slope selected floors/ceilings between selected slope handles (default key: Ctrl-F)
- Added Shift-W as default key to toggle visual slope picking
2020-02-23 12:44:59 +01:00
biwa
915d83c92a - If geometry is selected and the geometry the modified slope handle belongs to is not selected it will now also be modified
- Made the slope handles hover closer to the geometry
2020-02-23 11:17:14 +01:00
biwa
73e8d5440f Fixed a problem where slope handles could be picked through other geometry 2020-02-23 01:07:40 +01:00
biwa
631ccc12af Slope handles can now be set as pivot while other surfaces are selected 2020-02-23 00:48:47 +01:00
biwa
fd2b11505c Removed remnants of holding Alt to interact with slope handles 2020-02-23 00:14:43 +01:00
biwa
9c3d8d46ba It's not possible to have a slope handle be selected and set as pivot at the same time 2020-02-23 00:09:57 +01:00
biwa
f606f3bd7c Drawing slope handles works correctly now 2020-02-22 19:45:12 +01:00
biwa
1b79d9f6c4 Improved drawing length of slope handles on sloped lines (still too short, possibly because of aspect ratio correction?) 2020-02-19 23:03:32 +01:00
biwa
50a73b6af2 Pivot handles can now be set with the normal action to edit objects (no additional hotkey needed) 2020-02-19 22:43:41 +01:00
biwa
e4644b7cab The slope handle closes to the mouse cursor will now always be picked (no minimum distance required anymore) 2020-02-19 22:14:29 +01:00
biwa
21c8379904 Added action to toggle between picking slope handles or other map elements 2020-02-19 21:59:42 +01:00
biwa
7154dec8c7 Code cleanup, added some comments 2020-02-16 22:07:20 +01:00
biwa
ff1ea95d86 Drawing visual slope handles is (mostly) working now
Also fixed some cases where slopes were applied incorrectly
2020-02-16 20:51:16 +01:00
Magnus Norddahl
c943b07bd0 Fix broken patch loading 2020-02-16 18:57:19 +01:00
Magnus Norddahl
4d3fea0088 Fix inconsistencies between the "file specification" (as documented on zee internetz) and what devteam.pcx from Descent actually contained (the only pcx I have) 2020-02-16 17:10:57 +01:00
Magnus Norddahl
c1130b4c62 Merge remote-tracking branch 'origin/master' into nodevil 2020-02-16 16:48:49 +01:00
ZZYZX
ec9765f004 Fixed: GLDEFS dynamic lights were defaulting to invisible instead of 'normal' 2020-01-25 23:28:27 +02:00
biwa
d9cfc04e2e More trying to get it to work... 2020-01-18 21:10:21 +01:00
ZZYZX
973a4b1447 Fixed: CalculateArea was doing some weird shit (resolves #372) 2020-01-18 22:08:48 +02:00
Magnus Norddahl
6e4a02fb2b Add texture format to the Texture class so that render target textures do not have to be in the bgra8 format 2020-01-15 23:28:17 +01:00
Magnus Norddahl
afb79e80d5 Implement tga image loader 2020-01-14 20:39:46 +01:00
Magnus Norddahl
0372b75eea Fix offsetting bug 2020-01-14 18:57:50 +01:00
Magnus Norddahl
4e86765f2a Implement pcx loader (I can't believe I wrote this in 2020...) 2020-01-14 18:49:45 +01:00
Magnus Norddahl
e908ec72e9 Add missing try/catch 2020-01-14 17:29:13 +01:00
Magnus Norddahl
3bbe76b225 Remove DevIL dependency
Remove IImageLoader code duplication
2020-01-14 17:25:35 +01:00
ZZYZX
42aa6c8832 Fixed: there was no highlight shader for internal sprites for ZDoom effects disabled; Fixed: highlighting of transparent walls/floors was broken 2020-01-14 11:09:33 +02:00
Magnus Norddahl
7ea64f910b Fatal crash (Texture name input) #367 2020-01-13 19:11:10 +01:00
Magnus Norddahl
a2b18f1893 Fix load bug where exactly one image per thread would not get loaded 2020-01-12 23:35:20 +01:00
Magnus Norddahl
fc7093b959 Load images when they accessed
Load previews when they are accessed
2020-01-12 23:10:57 +01:00
Magnus Norddahl
acfd4f5283 LoadImage should not be virtual 2020-01-12 21:12:56 +01:00
Magnus Norddahl
db747d022b Dispose the bitmap as soon as it has been uploaded to a texture. Use a 1 bit alphatest bitmap for those that have transparency in them. 2020-01-12 20:17:18 +01:00
Magnus Norddahl
21d19e2804 Only use GetBitmap for the alpha test 2020-01-12 19:53:50 +01:00
Magnus Norddahl
0abaeaf758 Replace GetBitmap with more descriptive functions and move the alpha test inside ImageData 2020-01-12 19:37:27 +01:00
biwa
247d3e7a97 Merge branch 'master' of https://github.com/jewalky/UltimateDoomBuilder into visual-slope2 2020-01-09 20:05:34 +01:00
biwa
a14fc7cafd Fixed an issue where grid background images were drawn upside down and moved in the wrong direction on the Y axis when scrolling 2020-01-07 22:26:21 +01:00
biwa
2c9235e4ea Trying to figure out matrix black magic 2020-01-07 21:27:37 +01:00
Magnus Norddahl
5363fe0717 Produce release build
Disable devil
Support mac build (which is useless as mono doesn't support winforms on modern macOS)
2020-01-06 08:52:59 +01:00
Magnus Norddahl
20f5f01b84 Unix build fixes 2020-01-06 08:07:52 +01:00
biwa
01ccfa56f3 Merge branch 'master' of https://github.com/jewalky/UltimateDoomBuilder into visual-slope2 2020-01-05 14:27:47 +01:00
biwa
b415046694 Fixed nonsensical values being returned when using +++/--- in many fields. 2020-01-04 23:29:35 +01:00
biwa
8aee7fc550 Merge branch 'master' of https://github.com/jewalky/UltimateDoomBuilder into visual-slope2 2020-01-04 22:15:13 +01:00
ZZYZX
0e7875e0ad Fixed: light clipping on back faces was gone 2020-01-03 03:55:34 +02:00
ZZYZX
044dbbcfd0 Rewrote dynamic light support. Resolves #319. Resolves #318. Resolves #233. 2020-01-03 03:22:33 +02:00
biwa
0efb786a97 Slopes in 3D floors work again 2020-01-03 01:11:23 +01:00
Magnus Norddahl
54fb563a9a Merge branch 'master' of https://github.com/jewalky/UltimateDoomBuilder 2020-01-02 20:35:20 +01:00
Magnus Norddahl
c10f70d595 Fix glError returning a null pointer 2020-01-02 20:34:55 +01:00
biwa
7e84883125 Some cleanups 2020-01-02 20:32:37 +01:00
ZZYZX
7b5d4a03e9 Write uniform data into separate structures 2020-01-02 21:32:08 +02:00
Magnus Norddahl
10702928ae Only call seterror if the context creation fails 2020-01-02 20:21:38 +01:00
Magnus Norddahl
6450bdcc67 Improve error message if OpenGL context creation fails 2020-01-02 19:45:45 +01:00
ZZYZX
0ba5870dfc Merge branch 'shadercompiler' 2020-01-02 20:22:49 +02:00
Magnus Norddahl
d71da60c40 Lower depth bits requirement 2020-01-02 19:07:31 +01:00
Magnus Norddahl
82db74b17a Fix profile not being used 2020-01-02 18:55:53 +01:00
Magnus Norddahl
d49a6e228b Work a little harder to find an usable OpenGL version 2020-01-02 18:53:37 +01:00