Commit graph

6331 commits

Author SHA1 Message Date
plagman
76be874e7e Only invoke pkg-config for non-Windows platforms.
git-svn-id: https://svn.eduke32.com/eduke32@1881 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-11 22:15:35 +00:00
plagman
8c5492ec2e Fix two warnings I introduced a while back.
git-svn-id: https://svn.eduke32.com/eduke32@1880 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-11 22:14:06 +00:00
plagman
bfd38b4a89 Fixes for building on OpenBSD. Doesn't break Linux, pending Win32 synthesis
results.



git-svn-id: https://svn.eduke32.com/eduke32@1879 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-11 21:58:19 +00:00
helixhorned
a0ca3ed041 fix a.m32 script, inserted light SEs now have nonzero repeat
git-svn-id: https://svn.eduke32.com/eduke32@1878 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-08 20:12:16 +00:00
helixhorned
203cf0b7b1 A crapload of random stuff.
* Polymer light access to m32script (light[<lightidx>].<field>). As an application, provide a state 'insertlights' that takes the currently active lights and puts them into the map as SEs (e.g. for maphack recovery).
* Prototype of a mechanism to gray out certain portion of a map, making them inactive to various, but not all, editing operations. Highlighting a set of sectors and pressing Ctrl-R will make the Z bounds be [(least ceiling z), (greatest floor z)] of all selected ones, pressing Ctrl-R when no sectors are highlighted will reset them. Not sure if it's for production use at this stage...
* The 'align walls' feature [.] now has three independently toggleable behaviours: recurse nextwalls (toggled when Ctrl is pressed), iterate point2s (disabled when Shift is pressed), and also copy pixel width (toggled when Alt is pressed).
* Make shades clamp instead of overflowing in the editor

Fixes:
* crash when carrying out certain operations on walls with xrepeat 0
* the Pause key on linux. Also make demo recording start on Shift-ScrollLock because ScrollLock alone is too easily pressed when pausing


git-svn-id: https://svn.eduke32.com/eduke32@1877 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-07 18:23:34 +00:00
helixhorned
bd410d8557 fixes a horrible uninitialized value bug with the tag-labeling system
git-svn-id: https://svn.eduke32.com/eduke32@1876 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-02 21:33:11 +00:00
helixhorned
367afadf39 tweak point deleting for less checksectorpointer calls
git-svn-id: https://svn.eduke32.com/eduke32@1875 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-02 16:58:11 +00:00
helixhorned
9c3889e59b Fix more overheadmap crashes, this time with 'Last Pissed Time'. Mapster32 now asks to jump to a sector, wall, sprite, or coordinates with 'J. Also fix crash when pressing '-' (not KP-) when aiming at something with tile 0.
git-svn-id: https://svn.eduke32.com/eduke32@1874 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-28 21:28:33 +00:00
plagman
c7280a140b Fix the bug where Mapster32 tile selection would display the detail map of a
tile.



git-svn-id: https://svn.eduke32.com/eduke32@1873 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-27 14:30:48 +00:00
helixhorned
d9a047df8a Fix two overheadmap-related crashes.
git-svn-id: https://svn.eduke32.com/eduke32@1872 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-25 19:50:08 +00:00
terminx
942c0fc852 Fix NAM/WW2GI support...
git-svn-id: https://svn.eduke32.com/eduke32@1871 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-25 18:58:14 +00:00
helixhorned
9a0aa6f81e ahem...
git-svn-id: https://svn.eduke32.com/eduke32@1870 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-22 22:51:03 +00:00
helixhorned
243e50db4b Insert two divide-by-zero checks that seem to fix the overhead map crash, but only with NOASM=1. Fix a couple of Mapster32 bugs and prettify some code there. Fix EDuke32 bug where the demo system overwrote boardname[] while using the file picker, making navigation between directories impossible.
git-svn-id: https://svn.eduke32.com/eduke32@1869 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-22 22:48:06 +00:00
helixhorned
e35be69a0c fix compilation warning
git-svn-id: https://svn.eduke32.com/eduke32@1868 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-17 17:37:20 +00:00
helixhorned
64e22b9c6f * Support for entering names instead of numbers in various contexts (TAB-autocompletion included): first, when querying for a tile number, and second:
* Tag labeling system for 'link'-type tags, including saving and restoring the tag labels to a separate file '<mapname>.maptags'.  Whether a tag is eligible for linking, is determined by a hardcoded (but extensible via m32script) function.


git-svn-id: https://svn.eduke32.com/eduke32@1867 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-17 17:01:20 +00:00
helixhorned
a2b3b6006c * Correctly draw floor-aligned sprites with non-power-of-two textures in classic renderer.
* Sprite cstat 2048 ('use own shade', [N]) now works more or less. (Issues may arise when combined with sector light effects.)
* Begin work on 'smart' tag labeling system for Mapster32.  Right now, it only displays a '+' after tags with linking semantics.
* 


git-svn-id: https://svn.eduke32.com/eduke32@1866 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-14 20:48:08 +00:00
helixhorned
1e937bb5aa slightly better linehighlight handling in 2d side-view mode
git-svn-id: https://svn.eduke32.com/eduke32@1865 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-11 22:28:58 +00:00
helixhorned
621da89b37 fix demo playback on 64-bit systems; bump demo minor version number to reflect changes in r1857
git-svn-id: https://svn.eduke32.com/eduke32@1864 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-09 22:38:39 +00:00
terminx
6127590367 Add missing ENet license
git-svn-id: https://svn.eduke32.com/eduke32@1863 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-09 18:58:40 +00:00
helixhorned
5d91ec502a Revert 'move sprites with ceiling/floor'-behaviour, maybe fix tile drawing?
git-svn-id: https://svn.eduke32.com/eduke32@1862 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-09 15:35:46 +00:00
helixhorned
a1c4c6dce7 another 64-bit fix
git-svn-id: https://svn.eduke32.com/eduke32@1861 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-09 13:28:28 +00:00
helixhorned
76a7799d7c Revise shade preview; fix PGUP/PGDN with selected sectors; allow INS/DEL in 2D side-view mode; 64-bit printf cleanup
git-svn-id: https://svn.eduke32.com/eduke32@1860 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-09 13:27:08 +00:00
terminx
8eda9d683d Fix crash from http://forums.duke4.net/topic/3719-svn1857-dukeplus/page__view__findpost__p__80340
git-svn-id: https://svn.eduke32.com/eduke32@1859 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-08 22:05:32 +00:00
terminx
ef39c49049 Fuck, oops
git-svn-id: https://svn.eduke32.com/eduke32@1858 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-07 17:36:11 +00:00
terminx
1fdafcdad6 Cleaning out my tree... mostly internal changes. Adds workaround to disable texture compression with the crappy fglrx driver on Linux, fixes FIRE sprites so that they don't render at their sector's floorz all the time, changes CON compiler around a bit to use a loop instead of calling C_ParseCommand() 10 million times.
git-svn-id: https://svn.eduke32.com/eduke32@1857 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-07 01:16:29 +00:00
helixhorned
958c207622 editor and makefile tweaks
git-svn-id: https://svn.eduke32.com/eduke32@1856 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-25 11:42:07 +00:00
terminx
f037cdc827 Fix this fuckery: http://forums.duke4.net/index.php?showtopic=3646
git-svn-id: https://svn.eduke32.com/eduke32@1855 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-24 16:55:44 +00:00
helixhorned
46964b322b * Lazy hightile loading in Mapster32 tile selector (first display all as lowtiles, then load each one while allowing movement)
* Consolidate the various, slightly different, methods of bounding a sprite between a sector's ceiling and floor into one common function
* Fixes for accumulated bugs: shade preview, r_shadescale_unbounded, and a couple of unreported ones
* Yaks, gnus, and bisons...


git-svn-id: https://svn.eduke32.com/eduke32@1854 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-23 17:41:01 +00:00
helixhorned
a01f69c8e3 remove my mudflap related code in makefile.common
git-svn-id: https://svn.eduke32.com/eduke32@1853 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-19 18:16:41 +00:00
helixhorned
06afc4dcc5 * Comment out some practically dead code (rendmode 1 and 2, pcx screenshots), cutting some 8k from the release binary.
* Refactor two nearly identical chunks in polymost.c into one function in the hope of getting some more, but interestingly that did nothing at all. At least it's more readable this way...
* Commit, but don't enable, code for writing PNG screenshots (I'm tired of converting them every time). Requires libpng which in turn requires zlib.

git-svn-id: https://svn.eduke32.com/eduke32@1852 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-19 18:07:12 +00:00
terminx
cfd4661b0b Don't return the "out of memory" error code from daskinloader() if kplib reports either of the dimensions are 0. Instead, return the generic failure code.
git-svn-id: https://svn.eduke32.com/eduke32@1851 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-19 18:01:13 +00:00
terminx
9b0cd02e8a angry nerd rage
git-svn-id: https://svn.eduke32.com/eduke32@1850 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-19 17:59:09 +00:00
terminx
0517f094be Update s_buildDate in preparation for an update of http://eduke32.com/VERSION and eduke32_current.zip
git-svn-id: https://svn.eduke32.com/eduke32@1849 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-19 17:35:49 +00:00
helixhorned
4dba12a5d3 Tweakery in various places.
Engine stuff:
 * Add 'r_shadescale_unbounded' cvar. When set to 0, OpenGL renderers should never
   draw completely black objects (currently only implemented for Polymost)

Mapster32:
 * Add 'r_shadescale' to config
 * In 3D mode, make SPACE behave the same as holding down a mose button: the
   currently pointed-at object is locked. Required some modification of a.m32
   to play well (i.e. not reset SPACE). This is useful by itself but more so
   in conjunction with the next point
 * make Alt behave as a modifier with PGUP/PGDN: when aiming at a 2-sided wall,
   move the other side's sector's ceiling or floor (only this is new).
 * Auto-alignment of walls can be controlled in a finer grained fashion now:
   When pressing '.', only the immediate neighbors get aligned. Use Ctrl-. for
   the old behaviour.
 * When inserting a point in 2D mode, auto-align the neighboring wall


git-svn-id: https://svn.eduke32.com/eduke32@1848 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-17 23:37:38 +00:00
plagman
9a51ea8b95 Don't warp mouse if DEBUGGINGAIDS is enabled; this'll make us ignore events if
they happen to exactly go the the center of the screen, but not that big of a
deal.



git-svn-id: https://svn.eduke32.com/eduke32@1847 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-17 01:27:24 +00:00
helixhorned
bdc993bb3c fix getnumber256 crash
git-svn-id: https://svn.eduke32.com/eduke32@1846 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-14 20:00:13 +00:00
helixhorned
900a115b5a fix lone sector drawing
git-svn-id: https://svn.eduke32.com/eduke32@1845 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-14 17:36:46 +00:00
terminx
faead764ad SDL 1.3 fixes
git-svn-id: https://svn.eduke32.com/eduke32@1844 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-14 03:10:25 +00:00
helixhorned
16557ff1bb fixes: various ones accumulated in the forum (falling into infinity, stuck in doors), crash in polymer mouse picker when in void space, creation of surplus loops on sector split when sector has weird geometry.
addition: disable sprite sectnum checking with m32script expert mode enabled.

git-svn-id: https://svn.eduke32.com/eduke32@1843 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-13 11:59:32 +00:00
plagman
0c2157f5eb svn merge -r 1800:1841 ../polymer
git-svn-id: https://svn.eduke32.com/eduke32@1842 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-13 02:23:18 +00:00
terminx
44ab4b6ca1 Disable texture compression when ATI's horrible OpenGL implementation is detected
git-svn-id: https://svn.eduke32.com/eduke32@1841 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-12 16:37:45 +00:00
terminx
3eb9d8fb5c Addresses http://forums.duke4.net/index.php?s=&showtopic=2961&view=findpost&p=77346
git-svn-id: https://svn.eduke32.com/eduke32@1840 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-11 21:28:04 +00:00
plagman
ebfb0b1ad6 MD3 export script for Blender, based off the XReal hosted one and modified to
not prompt you for shader paths, collapsed into a single file and to avoid
transforming normals. This might break for rotations, but I don't think such
transforms should happen with a straight import from ASE -> export to MD3.


git-svn-id: https://svn.eduke32.com/eduke32@1839 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-11 08:01:43 +00:00
plagman
f1c2dcaef8 Blender ASE: fix animation import.
git-svn-id: https://svn.eduke32.com/eduke32@1838 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-11 04:55:02 +00:00
terminx
e17a4834eb fix mikesnd
git-svn-id: https://svn.eduke32.com/eduke32@1837 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-09 18:53:04 +00:00
helixhorned
b158521449 Besides catching a few more corner cases, there's better mouselook handling and a warning (but no fix) for a rare and bad corruption when splitting a sector in this revision.
git-svn-id: https://svn.eduke32.com/eduke32@1836 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-08 23:02:38 +00:00
plagman
c4f613e021 Add animation support to the ASE import script.
git-svn-id: https://svn.eduke32.com/eduke32@1835 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-08 06:54:48 +00:00
plagman
7034f78413 Checking in ASE import script for Blender, improved with vertex normal support.
git-svn-id: https://svn.eduke32.com/eduke32@1834 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-08 05:46:33 +00:00
helixhorned
2f5a8a0f6b minor fixes
git-svn-id: https://svn.eduke32.com/eduke32@1833 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-07 22:56:00 +00:00
helixhorned
148f3cadef mapster32: new command-line switch '-namesfile <filename>' for overriding NAMES.H; new 'drawlabel <quotenum> <x> <y> <z> <col> <backcol>' m32script command for drawing small labels, see end of a.m32 for an example; some special handling for sprites whose tile yoffset is greater or equal their pixel height.
git-svn-id: https://svn.eduke32.com/eduke32@1832 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-07 16:30:06 +00:00