Commit graph

7941 commits

Author SHA1 Message Date
helixhorned
2428b11152 More OSX build fixery and printf/scanf cleanup for 64-bit systems
git-svn-id: https://svn.eduke32.com/eduke32@1791 1a8010ca-5511-0410-912e-c29ae57300e0
2011-02-12 13:25:24 +00:00
helixhorned
cf9e3fd3f6 * Fix a serious logic mistake with checksectorpointer. Previously, a white wall could 'connect' to a red one, leaving the reverse link intact and creating a situation like this: w_new <-> w <-- w_old.
* Have the corruption checker catch this case among a few other new ones. Rename OSD command 'autocorruptcheck' to simply 'corruptcheck' with options 'corruptcheck <seconds>', 'corruptcheck now' and 'corruptcheck tryfix'.
* When pasting sector selection into valid player space (releasing AltGr), ask whether a surrounding outer loop should be created since this is probably not always desired.

git-svn-id: https://svn.eduke32.com/eduke32@1790 1a8010ca-5511-0410-912e-c29ae57300e0
2011-02-10 23:15:02 +00:00
helixhorned
f4b4234ce1 fix some issues with compilation on mac osx; make B, N, M keys behave the same as KP1, KP2, KP3 when pointing at a polymer light (hack around keyboard strangeness)
git-svn-id: https://svn.eduke32.com/eduke32@1789 1a8010ca-5511-0410-912e-c29ae57300e0
2011-02-06 22:57:32 +00:00
helixhorned
17a0887086 make [ and ] keys cycle search matches and Alt-[ and Alt-] cycle corrupt places; make Alt behave the same as Shift when panning/resizing textures in 3D mode to work around dead Shift+KP5+KP2/8 combination.
git-svn-id: https://svn.eduke32.com/eduke32@1788 1a8010ca-5511-0410-912e-c29ae57300e0
2011-02-05 17:16:15 +00:00
helixhorned
8bf5f5f848 Fix handling of lotag and friends in generic sprite search. Tags like 65535 which are really (int16_t)(-1) are now also found.
git-svn-id: https://svn.eduke32.com/eduke32@1787 1a8010ca-5511-0410-912e-c29ae57300e0
2011-02-03 17:44:03 +00:00
terminx
201ed79dcc Oops, missed a segment when applying the patch from bioman by hand
git-svn-id: https://svn.eduke32.com/eduke32@1786 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-31 18:16:11 +00:00
terminx
76e1ac5e08 Patch from bioman to fix an issue with static linking GTK and to correct the alignment of the fullscreen checkbox in the startup window when building with POLYMER=0
git-svn-id: https://svn.eduke32.com/eduke32@1785 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-31 04:13:53 +00:00
helixhorned
e24a1058f5 print 'cached tile' messages only from 5 ms up so as not to flood the OSD/log; quit on out of mem in one more place; new tool md2tool to query MD2 model info or change the scale/translate fields so that desired bounds are produced
git-svn-id: https://svn.eduke32.com/eduke32@1784 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-30 11:02:28 +00:00
plagman
32d58b3839 Change highpal maps to 6-bit and add corresponding scale and bias to bypass linear interpolation around the borders.
git-svn-id: https://svn.eduke32.com/eduke32@1783 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-27 07:57:52 +00:00
plagman
87b71fd3da Hook basepal up to highpal.
git-svn-id: https://svn.eduke32.com/eduke32@1782 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-27 07:05:12 +00:00
plagman
b6dce8a559 Move the new basepal table one step further so that the engine is now aware of it.
git-svn-id: https://svn.eduke32.com/eduke32@1781 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-27 06:35:52 +00:00
helixhorned
f3bf6b542e With the help of Coccinelle, eliminate a few sector[-1] accesses and calculations of &sector[-1] (bound checking code not committed).
git-svn-id: https://svn.eduke32.com/eduke32@1780 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-23 15:30:28 +00:00
terminx
eb2070e9c9 Make audio initialization failures non-fatal
git-svn-id: https://svn.eduke32.com/eduke32@1779 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-23 04:59:04 +00:00
helixhorned
b3cd9a73fe fix non-Polymer build
git-svn-id: https://svn.eduke32.com/eduke32@1778 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-20 21:46:15 +00:00
helixhorned
1a661b4d23 Fix clipshape bug reported by DeeperThought. Reason was absent-mindedness while coding :/
git-svn-id: https://svn.eduke32.com/eduke32@1777 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-20 19:00:12 +00:00
helixhorned
801845fa3b fix false save failure message and clean up begindrawing/enddrawing pairs
git-svn-id: https://svn.eduke32.com/eduke32@1776 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-20 10:52:33 +00:00
plagman
c54304217c Unbreak polymer-broken.
git-svn-id: https://svn.eduke32.com/eduke32@1775 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-19 03:22:25 +00:00
plagman
653a58574c Creating polymer-perf private branch. AKA polymer-broken, so use at your own risk.
git-svn-id: https://svn.eduke32.com/eduke32@1774 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-19 03:13:05 +00:00
plagman
658c3b66f1 Fix the lighting model so that lights don't get the modulated diffuse (defeats the purpose if they do, since you wouldn't be able to light a fully shaded room). That means the highpal lookup has to be performed twice now, once with the modulated diffuse to apply to the result and once with no modulation to make a diffuse that the lighting code can use. That means that lighting isn't 100% accurate with respect to the highpal result, but that's the best approach I could think of.
git-svn-id: https://svn.eduke32.com/eduke32@1773 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-18 01:34:39 +00:00
plagman
4a2fd12f4b Manage base palette as IDs instead of passing pointers around ($10 says I broke something). Corresponding engine change will be coming up; this is in prevision of highpal handling of game palettes.
git-svn-id: https://svn.eduke32.com/eduke32@1772 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-17 03:49:34 +00:00
plagman
517bb2aa50 Don't use -rdynamic on platforms that don't necessarily support it.
git-svn-id: https://svn.eduke32.com/eduke32@1771 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-16 07:20:11 +00:00
plagman
7812be9b67 Define OV_EXCLUDE_STATIC_CALLBACKS before including vorbisfile.h to avoid having some unused global structures (and warnings) around.
git-svn-id: https://svn.eduke32.com/eduke32@1770 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-16 07:19:29 +00:00
terminx
6420384b6c Sync ENet with latest cvs commit
git-svn-id: https://svn.eduke32.com/eduke32@1769 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-16 04:13:40 +00:00
plagman
cdad4ea850 Fix more MinGW warnings.
git-svn-id: https://svn.eduke32.com/eduke32@1768 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-16 03:57:44 +00:00
plagman
ce8291e923 Don't include compat.h from protocol.c and define UNREFERENCED_PARAMETER directly instead to fix the MinGW build.
git-svn-id: https://svn.eduke32.com/eduke32@1767 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-16 03:56:12 +00:00
plagman
15c94e6fa2 Fix all the remaining warnings (except the warn_unused_result stuff, pass -Wno-unused-result).
git-svn-id: https://svn.eduke32.com/eduke32@1766 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-16 03:53:27 +00:00
plagman
3da48fe31a Build game_banner.o and editor_banner.o with -Wno-pointer-sign.
git-svn-id: https://svn.eduke32.com/eduke32@1765 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-16 03:43:48 +00:00
plagman
8da4e5cc58 Remove some warnings.
git-svn-id: https://svn.eduke32.com/eduke32@1764 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-16 03:33:48 +00:00
terminx
7cef706c7c Add "Bstrstr" to compat header
git-svn-id: https://svn.eduke32.com/eduke32@1763 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-16 02:51:22 +00:00
terminx
ef912658a0 Run engine source through new version of astyle, add printf() call to OSD_Printf() to facilitate console access through stdin/stdout for dedicated server mode, minor changes to sdlayer to allow operating without actually initializing SDL
git-svn-id: https://svn.eduke32.com/eduke32@1762 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-16 02:50:27 +00:00
terminx
1579d2edd3 Switch back to using GL_COMPRESSED_RGB_ARB and GL_COMPRESSED_RGBA_ARB instead of explicitly asking for DXT1 and DXT5 (maybe fix white boxes on ATI?), change check for Radeon X1xxx cards to work on mobile cards with different GL_RENDERER strings
git-svn-id: https://svn.eduke32.com/eduke32@1761 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-16 02:45:54 +00:00
helixhorned
51eb2c7cd3 Too much stuff for one commit.
engine:
* sector-like sprite clipping now works with x- xor y-flipped actual sprites

mapster32:
* corruption checker has been hooked up to loading/saving routines to inform/warn the user
* also warn if mouse pointer is over corrupt wall which is shown in pink then: you should not move such a wall!
* faster map loading by deferring polymer_loadboard to 3d mode entrance (also removes some 'glGetTexLevelParameteriv returned GL_FALSE' warnings)
* more logical maphack light handling, the logic is still a bit dodgy though
* some menu and misc. function fixup
* redundancy elimination...

API:
* added consts various for 'char *filename' parameters
* loadboard() now accepts bit 4 for flags (formerly 'fromwhere')

git-svn-id: https://svn.eduke32.com/eduke32@1760 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-16 00:23:39 +00:00
plagman
8d01b7f403 Fix a problem with model skins introduced by highpal. Liztroops would turn blue on death.
git-svn-id: https://svn.eduke32.com/eduke32@1759 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-14 19:50:01 +00:00
plagman
07ca533c4d Fix editor picking in Polymer; sorry!
git-svn-id: https://svn.eduke32.com/eduke32@1758 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-12 17:10:41 +00:00
plagman
1ececc94ea Perform the highpal lookup after the diffuse modulation and detail to hit more range in the highpalookup map. This shuffles a fair bit of lighting model around, so I wouldn't be surprised if I broke something.
git-svn-id: https://svn.eduke32.com/eduke32@1757 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-12 02:31:50 +00:00
plagman
e4d8e53a5a Hook highpal to model skins.
git-svn-id: https://svn.eduke32.com/eduke32@1756 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-12 02:06:51 +00:00
helixhorned
4bc5ed0e83 have gltexcompr option in mapster32; fix prhighpal.py script
git-svn-id: https://svn.eduke32.com/eduke32@1755 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-09 22:49:50 +00:00
helixhorned
e66bec5e31 Make mapster32 know r_downsize parameter. For best caching performance, this and glusetexcache should be the same as for the game. Highpalookup script can now generate maps equivalent to the current PHRP tint defs.
git-svn-id: https://svn.eduke32.com/eduke32@1754 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-09 18:53:06 +00:00
plagman
69feee634b Move the highpalookup python helper scripts somewhere that makes sense and
that's packaged by synthesis source snapshots (zebioman request).



git-svn-id: https://svn.eduke32.com/eduke32@1753 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-07 01:50:23 +00:00
plagman
e1a6dcbe94 Fix build.
git-svn-id: https://svn.eduke32.com/eduke32@1752 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-03 23:50:20 +00:00
helixhorned
e745f3abf9 A bunch of mutually unrelated updates.
First, there's a new script for the generation of highpalookup images. Python 2.6, NumPy and PIL are required.
Next, the map corruption checker has been ported to C. This is so that Mapster32 will be able to take decisions more cleverly based on the corruptness of the map. It also catches a few more issues like inconsistent nextwall/nextsector tags now.
Finally, link the executables with --large-address-aware on Windows. This gives a gig more private virtual memory on XP when booting with /3GB. YMMV, but I can play IW2 with Polymer now.

git-svn-id: https://svn.eduke32.com/eduke32@1751 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-03 22:04:20 +00:00
helixhorned
79a52e1bc5 Make deferred polymer model processing not crash; make tile name search case-insensitive.
git-svn-id: https://svn.eduke32.com/eduke32@1750 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-01 18:35:59 +00:00
helixhorned
002ac54ca8 (ATM broken) support for PNG highpal files; their dimensions must be the same as the TGA ones.
git-svn-id: https://svn.eduke32.com/eduke32@1749 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-31 01:35:00 +00:00
plagman
3d2bcbfba8 Highpalookup support is more or less ready, also checked in sample script to
generate the highpalookup maps offline (only with a few incomplete pals right
now).

New DEF token: highpalookup [pal] [filename]
New cvar: r_pr_highpalookups



git-svn-id: https://svn.eduke32.com/eduke32@1748 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-30 08:13:37 +00:00
plagman
b3231e5c9b Get the glTexImage3D function pointer from the ICD, not from dlsym/GetProcAddress. This fixes OpenGL on Windows since opengl32.dll only has version 1.1 symbols.
git-svn-id: https://svn.eduke32.com/eduke32@1747 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-29 20:46:11 +00:00
plagman
1467c7b0b6 Fix release builds.
git-svn-id: https://svn.eduke32.com/eduke32@1746 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-29 09:17:48 +00:00
plagman
5582d41553 Highpalookup maps implementation on the renderer side. Currently set to a hardcoded highpalookup of 6:6:6->RGB and causes a noticeable quality drop. Use the debug1 cvar to toggle ingame.
git-svn-id: https://svn.eduke32.com/eduke32@1745 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-29 06:23:49 +00:00
helixhorned
d3a17f62a2 Split MD3 model post-processing into common and Polymer parts and defer the latter if the game is started with a different renderer. This has the benefit of faster startup times and much less memory consumption in that case. When the user switches to Polymer later in-game, all processing is done in one run. I've observed crashes due to the music system if it takes too long, so the it may be unreliable. Also some calloc->malloc where the clearing is unnecessary.
git-svn-id: https://svn.eduke32.com/eduke32@1744 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-24 15:44:37 +00:00
helixhorned
b3194b18cd d'oh
git-svn-id: https://svn.eduke32.com/eduke32@1743 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-20 16:55:37 +00:00
plagman
c2768ccf98 Fix the build for everything else; it looks like the macro definition for
ATTRIBUTE was just missing from helixhorned's change.



git-svn-id: https://svn.eduke32.com/eduke32@1742 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-20 03:34:18 +00:00