0434a87e3a
Remove trailing whitespace from anything we don't need to rebase from an upstream.
...
git-svn-id: https://svn.eduke32.com/eduke32@5768 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-05 04:46:28 +00:00
6173a8c339
Revert r5496
...
git-svn-id: https://svn.eduke32.com/eduke32@5700 1a8010ca-5511-0410-912e-c29ae57300e0
2016-04-13 04:04:13 +00:00
38553fc0e3
Menus: Adjust the way bottom edges are clipped in rotatesprite to better handle tall text, or text with long Q tails.
...
git-svn-id: https://svn.eduke32.com/eduke32@5693 1a8010ca-5511-0410-912e-c29ae57300e0
2016-04-06 03:07:47 +00:00
fdf4f2d74b
Fix warnings pointed out by Xcode.
...
git-svn-id: https://svn.eduke32.com/eduke32@5678 1a8010ca-5511-0410-912e-c29ae57300e0
2016-03-28 05:15:27 +00:00
3bbe30a6f8
Un-break the iOS build.
...
git-svn-id: https://svn.eduke32.com/eduke32@5672 1a8010ca-5511-0410-912e-c29ae57300e0
2016-03-28 05:15:05 +00:00
ea0e00a431
Play DUKE_GETWEAPON6 in cheat menu
...
git-svn-id: https://svn.eduke32.com/eduke32@5665 1a8010ca-5511-0410-912e-c29ae57300e0
2016-03-14 00:07:48 +00:00
4ea156822d
Android UI work. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@5663 1a8010ca-5511-0410-912e-c29ae57300e0
2016-03-14 00:07:40 +00:00
e2c24bda95
Android stuff. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@5661 1a8010ca-5511-0410-912e-c29ae57300e0
2016-03-14 00:07:28 +00:00
9de3befbba
Fix parental lock
...
git-svn-id: https://svn.eduke32.com/eduke32@5653 1a8010ca-5511-0410-912e-c29ae57300e0
2016-03-14 00:06:58 +00:00
2b357b58f1
Android work. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@5652 1a8010ca-5511-0410-912e-c29ae57300e0
2016-03-14 00:06:54 +00:00
e07fff7d64
iOS: Fix on-screen keyboard, broken in r5625.
...
git-svn-id: https://svn.eduke32.com/eduke32@5634 1a8010ca-5511-0410-912e-c29ae57300e0
2016-02-29 06:33:52 +00:00
d3ff92c5d5
Android shit. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@5629 1a8010ca-5511-0410-912e-c29ae57300e0
2016-02-17 19:08:32 +00:00
5672004ba1
Android crap. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@5625 1a8010ca-5511-0410-912e-c29ae57300e0
2016-02-13 21:06:28 +00:00
cbd659b3b0
Minor cleanup
...
git-svn-id: https://svn.eduke32.com/eduke32@5612 1a8010ca-5511-0410-912e-c29ae57300e0
2016-02-07 02:38:08 +00:00
51bc13a9d7
Break cheat code stuff out of game.c and into cheats.c/h. Remove unnecessary header includes from several modules (all relevant headers are already pulled in by duke3d.h).
...
git-svn-id: https://svn.eduke32.com/eduke32@5611 1a8010ca-5511-0410-912e-c29ae57300e0
2016-02-07 02:38:03 +00:00
db8b4a00b6
Enable -Wwrite-strings and fix all instances where string constants were passed to functions accepting a char ptr.
...
git-svn-id: https://svn.eduke32.com/eduke32@5547 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-11 05:06:10 +00:00
a7e6ed8745
Fix quite a few issues with casting away const and volatile qualifiers, found with -Wcast-qual. If we're going to use const everywhere, we should really mean it!
...
git-svn-id: https://svn.eduke32.com/eduke32@5540 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-11 05:05:38 +00:00
e00115c043
Introduce USE_GLEXT macro and use it to conditionally compile out all GL ARB function calls when compiling for GL ES platforms.
...
This replaces the previous hack where we kept the dynamic pointers null and simply never tried calling any of them by a conspiracy of default runtime settings and disabled menu options.
Code affected: VBO support for models, VPX GLSL decoding, texture compression (texture cache), and multitexturing (glow/detail maps).
This commit also replaces EDUKE32_GLES conditionals with USE_GLEXT where appropriate.
I didn't touch polymer.c because it depends too heavily on extensions for conditionally compiling them to make sense.
git-svn-id: https://svn.eduke32.com/eduke32@5526 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-08 01:33:20 +00:00
c2b5ae8256
Menus: Move "Cheats" from Options to Game Setup.
...
git-svn-id: https://svn.eduke32.com/eduke32@5517 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-08 01:32:47 +00:00
855e9117ff
Fix USE_OPENGL=0 compiler errors introduced in r5475.
...
git-svn-id: https://svn.eduke32.com/eduke32@5515 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-08 01:32:41 +00:00
1d17d2c6f6
Polymer lighting tweaks, mostly internal.
...
git-svn-id: https://svn.eduke32.com/eduke32@5496 1a8010ca-5511-0410-912e-c29ae57300e0
2015-12-28 02:04:29 +00:00
242b6bf870
Appease clang
...
git-svn-id: https://svn.eduke32.com/eduke32@5478 1a8010ca-5511-0410-912e-c29ae57300e0
2015-12-23 04:05:35 +00:00
3b47e9d652
Move vsync option to video setup
...
git-svn-id: https://svn.eduke32.com/eduke32@5475 1a8010ca-5511-0410-912e-c29ae57300e0
2015-12-23 04:05:21 +00:00
3473580f5f
Menus: When RETURN is set to INT32_MIN in EVENT_CHANGEMENU, cancel any animations in addition to not changing the current menu.
...
git-svn-id: https://svn.eduke32.com/eduke32@5471 1a8010ca-5511-0410-912e-c29ae57300e0
2015-12-20 05:19:02 +00:00
cbcef42656
Fix unused global variables in menus.c with DROIDMENU defined.
...
git-svn-id: https://svn.eduke32.com/eduke32@5462 1a8010ca-5511-0410-912e-c29ae57300e0
2015-12-04 11:52:47 +00:00
6a6bfc72fd
Fix an unused variable in menus.c with USE_OPENGL=0.
...
git-svn-id: https://svn.eduke32.com/eduke32@5461 1a8010ca-5511-0410-912e-c29ae57300e0
2015-12-04 11:52:43 +00:00
38dd14b124
More NAM/WWII GI "bluefont" xbetween fixes missed in r5452.
...
git-svn-id: https://svn.eduke32.com/eduke32@5459 1a8010ca-5511-0410-912e-c29ae57300e0
2015-11-28 09:06:31 +00:00
0fdeed231b
Miscellaneous NAM and WWII GI tweaks/fixes.
...
Remaining issues:
- Inventory item gamefuncs still use their Duke 3D names. The buggy way custom gamefunc binds are saved and loaded needs to be addressed first.
git-svn-id: https://svn.eduke32.com/eduke32@5452 1a8010ca-5511-0410-912e-c29ae57300e0
2015-11-25 12:08:31 +00:00
4aae9378d0
Implement NAM and WWII GI's replacement cheats.
...
Whereas Duke starts cheats with DN, NAM starts with NVA and WWII GI starts with WW2. (Hackily: CheatKeys[] is still size 2, and the third character is at the start of every CheatString.)
The cheats hyper (NAM-only), coords, view, skill, weapons, and inventory were not originally present but since they work properly and this is EDuke32, I have re-added them. Non-working cheats are now disabled.
git-svn-id: https://svn.eduke32.com/eduke32@5451 1a8010ca-5511-0410-912e-c29ae57300e0
2015-11-25 12:08:28 +00:00
22724d7841
Fix POLYMER=0 build. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@5424 1a8010ca-5511-0410-912e-c29ae57300e0
2015-11-14 19:54:27 +00:00
b9802a79df
Oops, forgot one. ;)
...
git-svn-id: https://svn.eduke32.com/eduke32@5409 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-24 00:35:19 +00:00
f5346f4732
Menu options to control Polymer light and shadow counts
...
git-svn-id: https://svn.eduke32.com/eduke32@5408 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-24 00:30:35 +00:00
f22dbc6fdb
Add r_pr_lighting 2, which disables the hard-coded lights while leaving lights added in maps enabled.
...
This also adds a menu option to control r_pr_lighting.
git-svn-id: https://svn.eduke32.com/eduke32@5406 1a8010ca-5511-0410-912e-c29ae57300e0
2015-10-23 23:00:21 +00:00
2303da6d7c
Menus: Mostly revert r5326, and instead restrict the starting and stopping text input to touch devices where we need the on-screen keyboard to appear. This maintains the bugfix on targets with a physical keyboard.
...
git-svn-id: https://svn.eduke32.com/eduke32@5331 1a8010ca-5511-0410-912e-c29ae57300e0
2015-08-15 21:28:31 +00:00
8fb903a83a
Menus: don't enable/disable SDL text input.
...
At program start, text input is enabled anyway and it does not seem to have any
adverse effects. However, disabling it after e.g. game save leads to the OSD
not working properly any more: normal keys are passed via handleevent_pollsdl's
SDL_TEXTINPUT case.
git-svn-id: https://svn.eduke32.com/eduke32@5326 1a8010ca-5511-0410-912e-c29ae57300e0
2015-08-09 09:58:47 +00:00
9b68ee5693
Menus: don't repeat #ifdef/#endif for SDL_{Start,Stop}TextInput().
...
git-svn-id: https://svn.eduke32.com/eduke32@5325 1a8010ca-5511-0410-912e-c29ae57300e0
2015-08-09 09:58:46 +00:00
26933ecdc2
More audiolib cleanup, remove 8-bit output support.
...
git-svn-id: https://svn.eduke32.com/eduke32@5272 1a8010ca-5511-0410-912e-c29ae57300e0
2015-07-08 03:34:09 +00:00
87ee51a248
Menus: Call SDL_Start/StopTextInput() at the appropriate times so that touch devices display the on-screen keyboard when the user is prompted for text input.
...
git-svn-id: https://svn.eduke32.com/eduke32@5170 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-03 07:02:23 +00:00
d313e2531a
Set up input so that the menus are navigable under iOS. This also enables the SELECTDIR back button unconditionally instead of restricting it to non-touch devices. DONT_BUILD.
...
git-svn-id: https://svn.eduke32.com/eduke32@5169 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-28 21:30:42 +00:00
5678b690a2
Fix an OOB in the cheats menu when running with the v0.99 GRP.
...
git-svn-id: https://svn.eduke32.com/eduke32@5136 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-12 08:06:37 +00:00
392094ee94
Menus: Modify slider bar so that it uses a scale defined in the data structure instead of auto-scaling to the height of the row.
...
git-svn-id: https://svn.eduke32.com/eduke32@5123 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-09 07:51:26 +00:00
9c89246f7e
Menus: Remove all remaining TEXT_GAMETEXTNUMHACK.
...
git-svn-id: https://svn.eduke32.com/eduke32@5122 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-09 07:51:14 +00:00
4a5886f1b8
Menus: Rename "pickup messages" to "game messages".
...
git-svn-id: https://svn.eduke32.com/eduke32@5121 1a8010ca-5511-0410-912e-c29ae57300e0
2015-04-09 07:51:01 +00:00
75801f2e68
Defs: Add token "forcefilter" to textures, skyboxes, and model skins. It forces the use of GL filtering for the resource in question.
...
git-svn-id: https://svn.eduke32.com/eduke32@5108 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-28 09:49:37 +00:00
ab58a33ec6
Menus: Add a Cheats menu to options.
...
It's old-school.
git-svn-id: https://svn.eduke32.com/eduke32@5084 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-24 10:49:03 +00:00
6d04da0b49
Menus: Rename MenuPassword_t to MenuTextForm_t, modularize more of its attributes into the data structure, and polish its display and behavior.
...
git-svn-id: https://svn.eduke32.com/eduke32@5083 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-24 10:48:34 +00:00
8fc08a71fa
Swap position of "load game" and "options" on main menu so that "load game" follows "new game", for consistency with the slightly different menu you get while in-game.
...
git-svn-id: https://svn.eduke32.com/eduke32@5068 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-24 00:40:08 +00:00
92afedcb11
Replace the drawing code for the level stats with nearly equivalent code that can be much more easily reproduced in CON.
...
git-svn-id: https://svn.eduke32.com/eduke32@5054 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-09 07:37:38 +00:00
7d701ae7e2
Disable EF_HIDEFROMMP pending proper consideration when multiplayer is closer to being ready.
...
git-svn-id: https://svn.eduke32.com/eduke32@5041 1a8010ca-5511-0410-912e-c29ae57300e0
2015-03-08 07:56:45 +00:00
5953541075
Menus: Fix assorted issues in MENU_NETOPTIONS.
...
git-svn-id: https://svn.eduke32.com/eduke32@5034 1a8010ca-5511-0410-912e-c29ae57300e0
2015-02-22 22:15:35 +00:00
hendricks266
terminx
helixhorned