Commit graph

3911 commits

Author SHA1 Message Date
hendricks266
d1f6dbeaea Mac: Programmatically create the primary program menu since we no longer have a nib or a modal window to do it for us.
git-svn-id: https://svn.eduke32.com/eduke32@5966 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:02:31 +00:00
hendricks266
25f2a5f457 Mac: Change the startup windows display the window normally and start a mini runloop instead of calling using runModalForWindow.
This way, the Quit function works.

git-svn-id: https://svn.eduke32.com/eduke32@5965 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:02:27 +00:00
hendricks266
dc1bbcd419 Mac: Port the startup window to entirely programmatic code. Death to nibs!
git-svn-id: https://svn.eduke32.com/eduke32@5964 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:02:22 +00:00
hendricks266
2c96410b39 Address a number of harmless instances of "code never reached" identified by Xcode.
git-svn-id: https://svn.eduke32.com/eduke32@5961 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:02:06 +00:00
hendricks266
a31ad532dd Fix an error introduced in cleanup of the WWII GI Devastator weapon reload animation, as pointed out by Xcode.
Also perform similar cleanup on a similar line elsewhere.

git-svn-id: https://svn.eduke32.com/eduke32@5959 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:01:57 +00:00
hendricks266
e258ca51f8 Rename E_PostInitTables back to E_PostInit and move it back to where it belongs in engine.c (i.e. preinitengine, initengine, "postinitengine"). It should not have been changed.
git-svn-id: https://svn.eduke32.com/eduke32@5952 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:01:32 +00:00
hendricks266
d2934c4ba5 Win32 Startup Window: This should be tokenized.
git-svn-id: https://svn.eduke32.com/eduke32@5951 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:01:28 +00:00
hendricks266
c102a6620a Fix problems with handling of the default crosshair color.
git-svn-id: https://svn.eduke32.com/eduke32@5950 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:01:24 +00:00
hendricks266
c20e41d0c8 Restore pre-r5821 floor glass behavior: nothing.
git-svn-id: https://svn.eduke32.com/eduke32@5949 1a8010ca-5511-0410-912e-c29ae57300e0
2016-12-26 06:01:18 +00:00
hendricks266
1c18f9d4de Fix linking of mdpause variable with POLYMER=0 in screens.c, exposed by Visual Studio. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@5944 1a8010ca-5511-0410-912e-c29ae57300e0
2016-11-29 07:56:18 +00:00
hendricks266
a7cc4e8419 Makefile: Fold OSX_STARTUPWINDOW into STARTUP_WINDOW. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@5941 1a8010ca-5511-0410-912e-c29ae57300e0
2016-11-28 04:35:27 +00:00
hendricks266
d8f31187e1 Avoid unused variable warning with the startup window disabled. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@5940 1a8010ca-5511-0410-912e-c29ae57300e0
2016-11-28 04:35:21 +00:00
terminx
be6069fc6d Support vsync in classic mode (SDL 2.x only), and properly handle failure to enable "adaptive" vsync on systems that don't support it.
git-svn-id: https://svn.eduke32.com/eduke32@5938 1a8010ca-5511-0410-912e-c29ae57300e0
2016-11-15 21:55:30 +00:00
terminx
cd8775dd28 Fixes issue where freezing GREENSLIME repeatedly would increase the player's kill counter by one each time
git-svn-id: https://svn.eduke32.com/eduke32@5937 1a8010ca-5511-0410-912e-c29ae57300e0
2016-11-15 21:55:25 +00:00
terminx
6e94f29ee2 Default internal frame wait counter to 17ms to match the default r_maxfps value of 60. Fixes issue where the framerate counter wasn't enforced after setting it to 60 and restarting the game.
git-svn-id: https://svn.eduke32.com/eduke32@5936 1a8010ca-5511-0410-912e-c29ae57300e0
2016-11-15 21:55:22 +00:00
terminx
643b9962a6 Fix menu option for pixel doubling
git-svn-id: https://svn.eduke32.com/eduke32@5935 1a8010ca-5511-0410-912e-c29ae57300e0
2016-11-15 21:55:14 +00:00
terminx
fc2b9118e4 Fixes issue where sounds weren't pausing when pausing the game
git-svn-id: https://svn.eduke32.com/eduke32@5934 1a8010ca-5511-0410-912e-c29ae57300e0
2016-11-15 21:55:09 +00:00
terminx
0bdbc463c0 Fixes issue with picnum 0 sprites used as map geometry
git-svn-id: https://svn.eduke32.com/eduke32@5933 1a8010ca-5511-0410-912e-c29ae57300e0
2016-11-14 23:47:11 +00:00
terminx
55532bb571 Fixes an issue with enemies waking up when using security cameras
git-svn-id: https://svn.eduke32.com/eduke32@5932 1a8010ca-5511-0410-912e-c29ae57300e0
2016-11-14 23:47:06 +00:00
terminx
31fa18aab0 Fix a couple of issues with savemapstate/loadmapstate.
git-svn-id: https://svn.eduke32.com/eduke32@5930 1a8010ca-5511-0410-912e-c29ae57300e0
2016-11-09 22:51:42 +00:00
terminx
466f3aca30 Support building without a startup window through the Makefile. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@5928 1a8010ca-5511-0410-912e-c29ae57300e0
2016-11-09 22:51:33 +00:00
hendricks266
4ca5e25e2c Add support for MOD, XM, IT, and S3M tracker music through libxmp-lite.
Building with support must be manually enabled by invoking make with HAVE_XMP=1 on platforms other than Windows, because libxmp-lite is not common in package managers. This setup will be improved in the future.

git-svn-id: https://svn.eduke32.com/eduke32@5927 1a8010ca-5511-0410-912e-c29ae57300e0
2016-11-08 02:59:05 +00:00
terminx
f79993a7c9 Mapster32: support sprite blending mode and statnum in clipboard.
git-svn-id: https://svn.eduke32.com/eduke32@5925 1a8010ca-5511-0410-912e-c29ae57300e0
2016-11-01 01:35:41 +00:00
terminx
959099b852 Remove Menu_MouseWithinBounds() in favor of negating the result of Menu_MouseOutsideBounds().
git-svn-id: https://svn.eduke32.com/eduke32@5924 1a8010ca-5511-0410-912e-c29ae57300e0
2016-11-01 01:35:36 +00:00
terminx
54b22b182a Rename menu functions to what I consider to be more sane names. No other changes.
git-svn-id: https://svn.eduke32.com/eduke32@5923 1a8010ca-5511-0410-912e-c29ae57300e0
2016-11-01 01:35:32 +00:00
terminx
1139c58e27 Add menu option to control r_maxfps, default r_maxfps to 60, add cvar for pixel doubling (r_pixeldoubling).
git-svn-id: https://svn.eduke32.com/eduke32@5922 1a8010ca-5511-0410-912e-c29ae57300e0
2016-11-01 01:35:24 +00:00
hendricks266
b064563a23 Amend r5911 to use undefinetile instead of only zeroing out the MIRROR tile's dimensions.
git-svn-id: https://svn.eduke32.com/eduke32@5916 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-25 05:43:56 +00:00
hendricks266
5e63453301 Duke: Move the nulling of the MIRROR tile to after defs are parsed so that tilefromtexture does not interfere with mirror function.
git-svn-id: https://svn.eduke32.com/eduke32@5911 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-24 21:30:39 +00:00
hendricks266
95452a5a8a C-CON and M32script: Only accept hex literals beginning with '0' and not any other digit.
git-svn-id: https://svn.eduke32.com/eduke32@5908 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-23 19:47:33 +00:00
hendricks266
942964ec3d Implement "divscale" and "scalevar" (scale()) in C-CON and "scalevar" in M32script.
git-svn-id: https://svn.eduke32.com/eduke32@5901 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-20 06:26:10 +00:00
hendricks266
60231e53a4 Duke: Adjust alphatabs checking to activate features when numalphatabs >= 15 instead of 16 so that my precise mode can be used.
git-svn-id: https://svn.eduke32.com/eduke32@5900 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-20 06:26:04 +00:00
hendricks266
c9de8faefb AudioLib: Fix improper matching of loop tags with initial substrings of them, and add proper support for LOOP as a synonym of LOOP_START.
git-svn-id: https://svn.eduke32.com/eduke32@5899 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-14 07:40:59 +00:00
hendricks266
52e6cd09cf C-CON: Fix addlogvar command, broken in r5835.
git-svn-id: https://svn.eduke32.com/eduke32@5895 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-14 07:40:47 +00:00
hendricks266
c8f1e9bf37 C-CON: Allow gamestartup to read in one additional parameter (MAXFLAMETHROWERAMMO). Do nothing with it yet.
git-svn-id: https://svn.eduke32.com/eduke32@5894 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-14 07:40:44 +00:00
hendricks266
3ce371d84d C-CON: Implement "ifplaybackon" conditional, used by World Tour to determine if the replay feature is enabled. In our case, it is always false.
git-svn-id: https://svn.eduke32.com/eduke32@5893 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-14 07:40:41 +00:00
hendricks266
259d51bec0 Replace all "g_scriptVersion == 14" with "g_scriptVersion >= 14".
git-svn-id: https://svn.eduke32.com/eduke32@5892 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-14 07:40:38 +00:00
hendricks266
9ce6cd2009 Apply the same bugfix as r4947 to XA sounds so that they only loop when intended.
git-svn-id: https://svn.eduke32.com/eduke32@5891 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-14 07:40:35 +00:00
terminx
d7328f738d Minor changes to gamevar error handling
git-svn-id: https://svn.eduke32.com/eduke32@5885 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-09 00:15:18 +00:00
terminx
b18db99691 Exterminate the smurfs! This fixes the problem where everything in the game was drastically hue shifted on certain hardware configurations, particularly the Raspberry Pi.
git-svn-id: https://svn.eduke32.com/eduke32@5884 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-09 00:15:14 +00:00
terminx
231c22d654 Misc cleanup. Removed ability to use .CON files found in the .GRP when the .CON files found in the directory can't be compiled.
git-svn-id: https://svn.eduke32.com/eduke32@5883 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-09 00:15:10 +00:00
terminx
cf6790b23e Fix MSVC warnings
git-svn-id: https://svn.eduke32.com/eduke32@5882 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-09 00:15:06 +00:00
hendricks266
6780fecfdc Duke: Don't unpause sounds when exiting the menu back to a Game Paused state.
git-svn-id: https://svn.eduke32.com/eduke32@5880 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-03 02:43:57 +00:00
hendricks266
f046d6bef4 Menus: Remove the Polymer aspect ratio option, as it was always broken, and I don't know what purpose it has besides configuring non-square pixel stretching, which we have a long way to go in terms of configuring anyway.
Use r_pr_customaspect from the console instead.

git-svn-id: https://svn.eduke32.com/eduke32@5879 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-03 02:43:54 +00:00
hendricks266
0feb1e0273 Menus: Fix the Widescreen and Texture Mode video settings to use my menu system properly.
git-svn-id: https://svn.eduke32.com/eduke32@5878 1a8010ca-5511-0410-912e-c29ae57300e0
2016-10-03 02:43:51 +00:00
terminx
f5363194ff Fix detection of menu sounds in EVENT_SOUND
git-svn-id: https://svn.eduke32.com/eduke32@5875 1a8010ca-5511-0410-912e-c29ae57300e0
2016-09-18 03:54:45 +00:00
hendricks266
03a8877f55 Fix erroneous display of MESSAGES: ON when it should be OFF.
git-svn-id: https://svn.eduke32.com/eduke32@5871 1a8010ca-5511-0410-912e-c29ae57300e0
2016-09-16 21:58:46 +00:00
hendricks266
295c654740 Fix TEST_SYNC_KEY macro to always return 1 or 0.
git-svn-id: https://svn.eduke32.com/eduke32@5870 1a8010ca-5511-0410-912e-c29ae57300e0
2016-09-16 21:55:45 +00:00
hendricks266
e99dbb858e Fix undefined behavior: null pointer passed as argument which is declared to never be null
git-svn-id: https://svn.eduke32.com/eduke32@5868 1a8010ca-5511-0410-912e-c29ae57300e0
2016-09-16 21:55:39 +00:00
hendricks266
dcbb2891ae Fix warning: suggest parentheses around '&&' within '||' [-Wparentheses]
git-svn-id: https://svn.eduke32.com/eduke32@5863 1a8010ca-5511-0410-912e-c29ae57300e0
2016-09-16 21:55:24 +00:00
hendricks266
6f194b7f7c Fix pausing MIDI music on Windows, regressed in r5817.
git-svn-id: https://svn.eduke32.com/eduke32@5861 1a8010ca-5511-0410-912e-c29ae57300e0
2016-09-16 21:55:09 +00:00