qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-11 07:42:18 +00:00
Code Issues Projects Releases Packages Wiki Activity
6924 commits 17 branches 20 tags 29 MiB
Commit graph

1799 commits

Author SHA1 Message Date
Jeff Teunissen
74d959ec64 Cope gracefully with wadfiles we can't handle 
This is a weird little diff. We're doing a lot of gymnastics here so that
we don't have to crash (killing any loaded unsaved work!) when we find a
wadfile we don't know how to deal with.
 2010-11-28 15:31:40 +09:00
Bill Currie
6702f04b46 Fix key resetting. 
Make sure we don't add a new key-pair when the key already exists, and if
the existing value has the same pointer as the "new" value, do nothing.
 2010-11-28 15:31:40 +09:00
Bill Currie
ff94a0f76a Can now select textures. 2010-11-28 15:31:39 +09:00
Jeff Teunissen
47117f1762 return the actual string 
Oops. I returned a text field instead of the string in it. :)
 2010-11-28 15:31:39 +09:00
Jeff Teunissen
877067de61 Export the base directory of the open project 
Project -baseDirectoryPath returns the absolute path to the directory from
which the .qpr file was loaded.
 2010-11-28 15:31:39 +09:00
Bill Currie
22885a48ad Correctly initialize the path variables. 
Use the current project file, not the default.
 2010-11-28 15:31:39 +09:00
Jeff Teunissen
0d0e7bfe18 TexturePalette.m: microscopic update 
remove a bogus comment, clarify a printf call, add parens around a ternary
test.
 2010-11-28 15:31:39 +09:00
Jeff Teunissen
ba508fa3e0 TexturePalette: Prevent NULL dereference 
Keep the app from crashing on a wad that doesn't have any palette at all.
 2010-11-28 15:31:39 +09:00
Bill Currie
d75f5f3f79 Fix brush selection. 
The great cleanup caused a few vital returns to disappear (they probably
went to the same place a lot of my lego did).
 2010-11-28 15:31:39 +09:00
Bill Currie
946a06b264 Don't crash if the palette entry is not first. 
Instead, swap the palette entry and the first entry (only in memory).
 2010-11-28 15:31:39 +09:00
Bill Currie
78a816dbdf Correct miptex byte-count scaling factor. 2010-11-28 15:31:39 +09:00
Bill Currie
1928780af6 Support Quests' map format. 
This is mostly because I have a few maps in this format.
 2010-11-28 15:31:39 +09:00
Bill Currie
ae1d5245ad Got the value/key backwards. 2010-11-28 15:31:39 +09:00
Bill Currie
c2644699a4 Even more conversions to NSString 2010-11-28 15:31:39 +09:00
Bill Currie
12d79ba28d More conversions to NSString 2010-11-28 15:31:39 +09:00
Bill Currie
fd000b880d Do a lot of conversions to NSString. 2010-11-28 15:31:38 +09:00
Bill Currie
2ac2f5fab5 Change path_projectinfo to NSString. 2010-11-28 15:31:38 +09:00
Bill Currie
1180a54d67 It seems I forgot to commit this with the plist changes. 2010-11-28 15:31:38 +09:00
Bill Currie
b28ba46448 Fix wad loading when loading the map. 
This broke with the fix for the entity inspector.
 2010-11-28 15:31:38 +09:00
Bill Currie
da2c87f964 Use QF's property lists for the project file. 2010-11-28 15:31:38 +09:00
Bill Currie
24fad619d1 First step in cleaning up Dict. 2010-11-28 15:31:38 +09:00
Bill Currie
5c0fb3ecd3 Correct an error message. 2010-11-28 15:31:38 +09:00
Bill Currie
6c96402403 Get the button icons set properly. 
There are still issues with the way gorm does things, but this works for
now.
 2010-11-28 15:31:38 +09:00
Jeff Teunissen
602564075d install images into Resources 
Install the button icons into the app when we make it.
 2010-11-28 15:31:38 +09:00
Jeff Teunissen
edf5f6e018 find $GNUSTEP_MAKEFILES 
Enable locating the GNUstep makefiles using the various schemes available
(in order of reliability), eventually reaching a hardcoded default.
 2010-11-28 15:31:38 +09:00
Jeff Teunissen
0e5cd14829 tactical whitespace bomb 
Add return-type information to all methods, split up lines properly where
I could find them, and ran the whole thing through uncrustify. Looks purty
now. :)
 2010-11-28 15:31:38 +09:00
Jeff Teunissen
a4eec40843 Remove -read:/-write from Storage 
Apparently GS doesn't do TypedStream any more...
 2010-11-28 15:31:38 +09:00
Jeff Teunissen
cdc79ae6f8 Add type information, don't return self most of the time 
Start "modernizing" the code base; old code is based heavily in the
Smalltalk style, where everything that doesn't return a different object
returns self. This can be useful, but it isn't what is usually done these
days. Also, add type information (which didn't exist in "the old days" --
an object was an "id", not a "Foo *") to help with debugging.
 2010-11-28 15:31:38 +09:00
Jeff Teunissen
7dc5d26480 SetBrush: signed/unsigned fix 2010-11-28 15:31:37 +09:00
Jeff Teunissen
dbab1545e5 Comment an #if 0 
Looks like John Carmack was going to implement "reference" .qpr directories,
where they would contain a reference to the "real" base path, but never got
it finished. Make a note in the source to explain the "dead" code.
 2010-11-28 15:31:37 +09:00
Jeff Teunissen
4d63d20663 signed/unsigned and some const-correctness 2010-11-28 15:31:37 +09:00
Bill Currie
646422d683 Get the timing right when setting the wad file in worldspawn. 2010-11-28 15:31:37 +09:00
Bill Currie
939605309f Do error checking when trying to load a wad file. 2010-11-28 15:31:37 +09:00
Bill Currie
997df6c310 Char buffer audit. 
Get rid of most static char buffers. The few remaining are either in file
structs or messy code that needs further analysis.
 2010-11-28 15:31:37 +09:00
Bill Currie
1b7be81f11 Do a const-correct run. 2010-11-28 15:31:37 +09:00
Bill Currie
62c73b300e Fix the tangled mess of entity connections. 
What was the person who wrote valueForQKey thinking? Make the function
const-correct and bubble the changes through the code.
 2010-11-28 15:31:37 +09:00
Bill Currie
3574668fe3 Connect the region filtering switch. 
Region filtering now seems to work. Also added a tool tip.
 2010-11-28 15:31:37 +09:00
Bill Currie
d8773fddb1 Get the entity flags switches into the right initial stage. 2010-11-28 15:31:37 +09:00
Bill Currie
68190bd431 Echo the output to stdout as well as the output box. 2010-11-28 15:31:37 +09:00
Bill Currie
1aae3c8174 Get the inspector button displaying properly. 2010-11-28 15:31:37 +09:00
Bill Currie
bb3ea99806 Fix texture names. 2010-11-28 15:31:36 +09:00
Bill Currie
dcc4187a8c Get the timing write for when to restore the rects. 2010-11-28 15:31:36 +09:00
Bill Currie
9cc66c3de1 A bit more code cleanup. 2010-11-28 15:31:36 +09:00
Bill Currie
1e6cdb4bb8 Replace PS*instance. 
It's a little flakey (doesn't always do the right thing), but it's a good
start. I'd like to do much smaller rectangles, and get the timing right.
 2010-11-28 15:31:36 +09:00
Bill Currie
73a82342db Get the inspector button mostly working thanks to Deek's help. 2010-11-28 15:31:36 +09:00
Bill Currie
7c3e6b8bdc Rectirect Sys_Printf's output to the command output box. 2010-11-28 15:31:36 +09:00
Bill Currie
3a6e5ea179 Fix a string comparision mistake. 
This snuck in with the parser changes.
 2010-11-28 15:31:36 +09:00
Bill Currie
4ed7290d9f Fix an uninitizized variable. 2010-11-28 15:31:36 +09:00
Bill Currie
cfa13f1caa Work around a method type mismatch in GNUstep. 2010-11-28 15:31:36 +09:00
Bill Currie
c1fac2cc8a Hopefully fix the flush control and second screen placement. 2010-11-28 15:31:36 +09:00
Bill Currie
ec98bb3b93 Get help working (for what it is worth). 2010-11-28 15:31:36 +09:00
Bill Currie
4b1202d6e6 Remove debugging code. 2010-11-28 15:31:36 +09:00
Bill Currie
73b89ba0b8 Do not use PS* functions. 2010-11-28 15:31:36 +09:00
Bill Currie
4dd0bf5804 Get TextureView working. 2010-11-28 15:31:35 +09:00
Bill Currie
950af620bc Get the Z checker working. 2010-11-28 15:31:35 +09:00
Bill Currie
6509a24a54 KeypairView now seems to work properly. 2010-11-28 15:31:35 +09:00
Bill Currie
c0236955f2 Don't change the font size when scaling the views. 
This keeps the displayed size of the text constant (text size is independent of bounds/frame scaling)
 2010-11-28 15:31:35 +09:00
Bill Currie
6be1f516f6 Get the keyboard controls working. 2010-11-28 15:31:35 +09:00
Bill Currie
27fdf21120 Modernize the camera eye glyph drawing. 2010-11-28 15:31:35 +09:00
Bill Currie
91751d9fbb Get scaling working in the Z view as well. 2010-11-28 15:31:35 +09:00
Bill Currie
a0201728d9 Finally have the scaling working perfectly(?). 
I had to hack around problems in GNUstep's bounds implementation (I don't
know if they're bugs or design limitations), but the fix was just a matter
of making sure the bounds matrix was correct: force the scale to 1 before
adjusting bounds, and then make sure the translation is scaled afterwards.
 2010-11-28 15:31:35 +09:00
Bill Currie
e2f8490f9a Get scale changes halfway working. 
Translation is still wrong, but changing scale to (eg) 200% and back to
100% works correctly.
 2010-11-28 15:31:35 +09:00
Bill Currie
7f5a68023b slow progress in getting things to work 2010-11-28 15:31:35 +09:00
Bill Currie
a229f20525 Get textures sortof displaying. 2010-11-28 15:31:35 +09:00
Bill Currie
e15b963279 Correct alert panel handling. 2010-11-28 15:31:35 +09:00
Bill Currie
0d5bd775cb Get the textureView connection right. 2010-11-28 15:31:35 +09:00
Bill Currie
752ff7d879 Don't segfault when unable to open a file. 2010-11-28 15:31:35 +09:00
Bill Currie
43d2d9645d Get the sizes of the inspectors reasonable. 
The inspector popup button is funky (need to select the desirned inspector
twice), but it can be made to work.
 2010-11-28 15:31:35 +09:00
Bill Currie
0de8e3806d Get the inspectors showing. 
Still can't change them via the pop-up menu, though.
 2010-11-28 15:31:34 +09:00
Bill Currie
3193374257 Accidently commited a failed experiment. 2010-11-28 15:31:34 +09:00
Bill Currie
7d5af7c341 Finish the gorm file, for certain values of finished. 2010-11-28 15:31:34 +09:00
Bill Currie
b215a5e856 Camera view seems to work moderately well. 2010-11-28 15:31:34 +09:00
Bill Currie
f8ce05d862 Entity loading from maps seems to work. 2010-11-28 15:31:34 +09:00
Bill Currie
f6ebcd45ac Use QF's wadfile support. 
Still fragile, but it can load wad files.
 2010-11-28 15:31:34 +09:00
Bill Currie
972e98ec09 Get QUAKED comments working. 2010-11-28 15:31:34 +09:00
Bill Currie
c820735dd3 Get progs source scanning working. 
Of course, this is if the environment is set up just right, but it's
another step towards something to fix.
 2010-11-28 15:31:34 +09:00
Bill Currie
a2ab1c81ce A little more progress: loading a map does not seg. 2010-11-28 15:31:34 +09:00
Bill Currie
0e4259361c Get map loading sort-of working. 
Segfaults, but the Map class can now be instantiated.
 2010-11-28 15:31:34 +09:00
Bill Currie
4fdc34ea86 Get some screen updates happening. 2010-11-28 15:31:34 +09:00
Jeff Teunissen
ef7492f5cf correct fix for ForgeBundle protocol issue 2010-11-28 15:31:33 +09:00
Jeff Teunissen
3dcfd69b50 Update makefile's add'l install dirs 
This rule would create the raw path /Library/Forge three times...fix it to
create Forge dirs with the new scheme.
 2010-11-28 15:31:33 +09:00
Bill Currie
e959a6ee3c Add \n to Sys_Printf calls. 2010-11-28 15:31:33 +09:00
Bill Currie
9ffcc8658d Make the menus and do some connections. 2010-11-28 15:31:33 +09:00
Bill Currie
7f41d1529b Make it run. 
Fix some bad memory handling in XYView and ZView, and remove the unset
CustomView.
 2010-11-28 15:31:33 +09:00
Bill Currie
44942df87f Fixes for building with QF. 2010-11-28 15:31:33 +09:00
Bill Currie
9ec5310ed7 Again, whitespace. 2010-11-28 15:31:33 +09:00
Bill Currie
6500333e91 For now, build an app rather than a bundle. 2010-11-28 15:31:33 +09:00
Bill Currie
f25754813e Fix some bitrot. 
I'm not happy with the fix in Controller.m, but I'm not sure what the best
way to fix it is.
 2010-11-28 15:31:33 +09:00
Bill Currie
81a3eaf93e Initial Gorm file for MapEdit. 2010-11-28 15:31:32 +09:00
Bill Currie
b5f5ad6ce2 Whitespace. 2010-11-28 15:31:32 +09:00
Bill Currie
7ebb7c503b Remove unused file. 2010-11-28 15:31:32 +09:00
Bill Currie
e93bb3fb69 Remove some redundant files. 
Use the functions provided by QuakeForge.
 2010-11-28 15:31:31 +09:00
Bill Currie
e84574400d Can't use UserPath, so remove these. 2010-11-28 15:31:31 +09:00
Bill Currie
6e3df2c68d Possibly get preferences working. 2010-11-28 15:31:31 +09:00
Bill Currie
3e3d8cc9cd clean up some XXXs 2010-11-28 15:31:31 +09:00
Bill Currie
c1e2d4c17a And the header files. 2010-11-28 15:31:31 +09:00
Bill Currie
d23300d58b Pass .m files through indent. 
The result isn't perfect, but it cleans up the whitespace and makes the
code more consistent with the rest of the project.
 2010-11-28 15:31:31 +09:00
Bill Currie
d3a12ee727 Finally, everything does compile. 
However, it still won't work (no gorm, commented code, ...).

Borrow an old implementation of the Storage class until I figure out just
what it's being used for.
 2010-11-28 15:31:31 +09:00
Bill Currie
ddc493d657 Add the rest of the files which I know to build. 2010-11-28 15:31:31 +09:00
Bill Currie
767d871fb8 Make MapEdit (QuakeEd) compile. 
It won't work yet as there's no gorm file and there's code that has been
commented out, but it finally compiles.
 2010-11-28 15:31:31 +09:00