zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-12-17 15:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity
2416 commits 6 branches 6 tags 107 MiB
Commit graph

2239 commits

Author SHA1 Message Date
Randy Heit
b2b84ad11f - Fixed snd_mididevice so that changing it immediately restarts the song for all devices, not 
just Windows system devices.
- Remove SMF generation from i_music.cpp, since the psuedo-MIDI devices do this now.

SVN r2875 (trunk)
 2010-10-02 04:12:21 +00:00
Randy Heit
90dd40c58f - Reimplemented TiMidity++ playback so that it also can handle XMI subsongs. 
SVN r2874 (trunk)
 2010-10-02 03:36:19 +00:00
Randy Heit
fa429ad844 - Fix incorrect parameters to PrintMidiDevice(). 
- Add music_psuedo_mididevice.cpp to CMakeLists.txt.

SVN r2873 (trunk)
 2010-10-02 02:23:42 +00:00
Randy Heit
b6941be55f - Reimplemented FMOD MIDI playback as a psuedo-MIDI device so that it can take advantage of XMI subsongs. 
SVN r2872 (trunk)
 2010-10-02 02:19:50 +00:00
Christoph Oelckers
024bbeb171 - changed 'load game' menu so that it preselects the last used savegame, either for loading or saving. 
SVN r2867 (trunk)
 2010-09-29 22:24:55 +00:00
Christoph Oelckers
5464676603 - cleaned up i_music.cpp. 
SVN r2866 (trunk)
 2010-09-29 19:29:14 +00:00
Christoph Oelckers
5be9729872 - FScanner::Float is a double so there's no need to cast values to float before assigning them to this variable. 
SVN r2865 (trunk)
 2010-09-29 07:25:14 +00:00
Randy Heit
bc08502132 - Pass SMF files through the MIDI conversion process too, to give TiMidity++ and FMOD some 
degree of support for songs that use loop controllers to loop the song back to a point after
  the very beginning of the song.
- Enable loops during SMF generation. Infinite loops will be clamped to some finite amount. (This is currently 30, so a 3 minute song will still restart from the very beginning after 90 minutes)
- Fixed: The SMF, HMI, and XMI readers all generated invalid MEVT_NOP events.
- Fixed: SMF generation died on songs that set their tempo during the initial beat.


SVN r2864 (trunk)
 2010-09-29 03:35:53 +00:00
Christoph Oelckers
64784b2dc8 - fixed: DOptionMenu::FirstSelectable should not be called when the menu already has a valid selection. 
SVN r2863 (trunk)
 2010-09-29 00:54:14 +00:00
Christoph Oelckers
e2c105b447 - fixed: XMI music files were not converted for playback with FMod or Timidity++. 
- Was there any reason why the MIDI_GUS device was so well hidden from the user? It sure does not sound broken. Added it to MIDI menu and $mididevice.


SVN r2862 (trunk)
 2010-09-29 00:35:47 +00:00
Christoph Oelckers
6014250f3a - fixed: Option menus with no selectable items crashed. 
SVN r2861 (trunk)
 2010-09-28 16:28:44 +00:00
Christoph Oelckers
9414fd2995 - fixed: G_DoLoadLevel must reset level.maptime before calling P_SetupLevel or all actors that read it in their BeginPlay method get the wrong time. 
SVN r2860 (trunk)
 2010-09-28 15:14:53 +00:00
Randy Heit
5a3b3631c3 - Added XMIDI support (including subsongs). 
- Moved unaligned accessors into m_swap.h.

SVN r2859 (trunk)
 2010-09-28 03:58:41 +00:00
Christoph Oelckers
2d5755a80e - fix GCC warning. 
SVN r2858 (trunk)
 2010-09-27 22:42:35 +00:00
Christoph Oelckers
77709f1847 - fixed: The loadgame menu responder did not check for an empty list of savegames. 
SVN r2857 (trunk)
 2010-09-27 22:36:47 +00:00
Christoph Oelckers
9abaaa1785 - added a default cursor for Chex Quest. 
- set 'cursor' as default for Action Doom 2. Doom's bunny is probably not the best thing here...
- made cursor user-settable in the menu.



SVN r2855 (trunk)
 2010-09-26 07:46:34 +00:00
Christoph Oelckers
cf9792ed53 - fixed: The order of items in the main menu was wrong. Doom is supposed to have 'Options' in second place. Many vanilla-compatible mods with special one-patch menus would not work correctly due to this. Fortunately the only mod I could find that relied on ZDoom's order was Action Doom 2, which as an IWAD can easily be handled by a simple configuration option. 
- added 'else' blocks to MENUDEF parser.



SVN r2854 (trunk)
 2010-09-26 06:53:40 +00:00
Randy Heit
17f9e687bd - Added cursorpic gameinfo property to set the mouse cursor image. 
SVN r2852 (trunk)
 2010-09-26 05:31:52 +00:00
Christoph Oelckers
3f69b63873 - fixed: Backing out of a skill confirmation message screen caused that skill to be used for the next game if the menu wasn't fully closed first. 
SVN r2851 (trunk)
 2010-09-25 23:28:44 +00:00
Christoph Oelckers
3f420c97bd - allow setting the startup screen's title through GAMEINFO lump. 
SVN r2850 (trunk)
 2010-09-24 14:27:52 +00:00
Randy Heit
4397ef3323 - Added HMP file support. 
SVN r2849 (trunk)
 2010-09-24 02:46:48 +00:00
Randy Heit
46eebe29a4 - Update the HMI player to use the division information stored in the song and check the full file signature. 
SVN r2848 (trunk)
 2010-09-23 22:37:25 +00:00
Christoph Oelckers
917e93e633 - fixed: The check for savegames without picture was reversed. 
- fixed: Savegames that were saved without picture did not display the 'No picture' message because the empty PNG container was still recognized as image.


SVN r2847 (trunk)
 2010-09-23 06:14:30 +00:00
Randy Heit
b9185f7c62 - Added a NULL skins[] check to AActor::SetState(). 
SVN r2846 (trunk)
 2010-09-23 01:56:04 +00:00
Randy Heit
b8fa340986 - Fixed: ACS's GetActorX, GetActorY, GetActorZ, GetActorFloorZ, GetActorCeilingZ, GetActorAngle, 
and GetActorPitch did not have NULL pointer checks for the TID == 0 case.

SVN r2845 (trunk)
 2010-09-23 01:51:00 +00:00
Christoph Oelckers
16fa8cc249 - Am I the only one who thinks that static_casts can create really clunky code? (Thanks, GCC, for your overly paranoid warning settings that necessitate such ugliness. :( ) 
SVN r2844 (trunk)
 2010-09-22 06:52:48 +00:00
Braden Obrzut
15d74dab56 - Fixed: GCC warnings. 
SVN r2843 (trunk)
 2010-09-21 20:35:40 +00:00
Braden Obrzut
1e83634089 - Fixed: The aspectratio SBarInfo command never ticked its contents. 
SVN r2842 (trunk)
 2010-09-21 20:07:03 +00:00
Christoph Oelckers
385cfc5698 - fixed some texture priorititing problems with Hexen's player displays for the menu. The patches for these should not be placed in the TEX_WallPatch namespace because it's not what modders might expect from them. 
SVN r2841 (trunk)
 2010-09-21 16:50:09 +00:00
Christoph Oelckers
a3e98eb4ab - added automatic centering of Hexen's skill menu so that it can adjust automatically to the different player classes. 
SVN r2840 (trunk)
 2010-09-21 12:58:59 +00:00
Christoph Oelckers
583cbd49a6 - try to encapsulate access to the player class's display name for printing purposes. 
SVN r2839 (trunk)
 2010-09-21 09:43:54 +00:00
Braden Obrzut
0619a2677e - Fixed: SBarInfo couldn't print extended ASCII characters. 
SVN r2838 (trunk)
 2010-09-20 23:00:27 +00:00
Christoph Oelckers
59b19d36fb - Fixed: AActor::Slam mzst check the charging monster's health before setting it back to its See state. Damaging the target may cause action that might have killed it. 
SVN r2837 (trunk)
 2010-09-19 22:33:21 +00:00
Christoph Oelckers
a2673c2cc4 - fixed a misplaced ')' in addkeysection. 
SVN r2836 (trunk)
 2010-09-19 22:23:57 +00:00
Christoph Oelckers
74525ab1d6 - moved some info into the GAMEINFO section: 
* the sprite used for 'pause'.
 * the factor with which a monster's health is multiplied to decide if it's supposed to be gibbed,
 * the decision to make monsters run faster in nightmare mode.
- moved the hard coded lock messages for lock types 102 and 103 into the language lump.
- fixed: Raven's fast monsters could become slower in Nightmare if they had very short walking states.


SVN r2834 (trunk)
 2010-09-19 10:39:34 +00:00
Christoph Oelckers
7dcf9b4738 - fixed: The current level's statistics should not be updated when not actually playing. 
- added a STAT display for the game statistics info.


SVN r2833 (trunk)
 2010-09-19 09:02:44 +00:00
Christoph Oelckers
9a8a446840 - added player class definition through the GAMEINFO section in MAPINFO. Also added a NOMENU flag that can be set for a player class. This means that the use of KEYCONF is now deprecated except for its original purpose: To define mod specific key binding options. 
SVN r2832 (trunk)
 2010-09-19 08:27:20 +00:00
Christoph Oelckers
e1de9f0633 - fixed: The newly accelerated mousewheel scrolling code did not check for the end of the list and could scroll one item too far. It also incremented VisBottom by 3 instead of 2. 
- changed lock failsound lookup so that for each sound it tries to resolve it as a player sound before deciding if it is valid.

SVN r2830 (trunk)
 2010-09-19 06:34:15 +00:00
Randy Heit
c4c69df6dc - Fixed: FOptionMenuItemJoyMap::SetSelection() did not convert from menu selection number to joyaxis number. 
SVN r2829 (trunk)
 2010-09-19 04:04:34 +00:00
Randy Heit
503ae5a9ee - Scroll two rows at a time with the mouse wheel in the options menu. 
SVN r2828 (trunk)
 2010-09-19 03:52:18 +00:00
Randy Heit
94ce4d5d69 - Remove extra *usefail definition for the pig player. 
- Locks can now define more than one LockedSound by separating them with commas. The default setting
  for this property is now "*keytry", "misc/keytry". The first sound that is defined is the one that will
  be played for the lock. Thus, for standard locks, if the player class defines *keytry, that will be
  played. Otherwise, misc/keytry will be played as before.



SVN r2827 (trunk)
 2010-09-19 03:30:31 +00:00
Christoph Oelckers
df138fe4f9 - added a ClearCounters function to AActor that handles everything necessary to un-count an item that is not supposed to be counted but has some of the COUNT* flags set. 
- merged all places where secrets are credited into one common function.
- added the Doom64 COUNTSECRET actor flag.
- fixed: AInventory::CreateCopy did not clear the COUNTITEM flag.
- fixed: Dropping an item did not increase the item count but the dropped item could still have the COUNTITEM flag. Now this flag gets cleared when the item gets picked up so that dropped items don't count a second time.

SVN r2826 (trunk)
 2010-09-19 00:06:45 +00:00
Christoph Oelckers
7b01f7b296 - merged Thing_Destroy extension from Doom64 branch into trunk and extended it by a tid=0, tag!=0 case which will kill all shootable actors in sectors with the specified tag. 
SVN r2825 (trunk)
 2010-09-18 22:39:27 +00:00
Braden Obrzut
b50007ecf6 - Fixed: Compilation errors on Mac OS X. 
SVN r2824 (trunk)
 2010-09-18 20:13:56 +00:00
Braden Obrzut
20513cff41 - Fixed Linux compilation issue with statistics.cpp 
SVN r2823 (trunk)
 2010-09-18 17:45:19 +00:00
Christoph Oelckers
54bdf38fef - resurrected some old statistics code I had and made some minor enhancements to be of more use. 
SVN r2821 (trunk)
 2010-09-18 16:08:10 +00:00
Christoph Oelckers
051ae3224f - fixed: The subsector serializing code accessed the subsector array before validating the index. 
- added episode names to episode definitions of Doom 1 and Chex Quest.


SVN r2820 (trunk)
 2010-09-18 12:37:22 +00:00
Randy Heit
eb031d73e7 - Change the time when walking monsters step down steps to just after the step rather than just before. 
This allows for thrusting walking monsters vertically without them suddenly warping to the ground.



SVN r2819 (trunk)
 2010-09-18 02:55:08 +00:00
Randy Heit
5871712fd4 - Fixed incorrect definition of FLUID_FAILED when building with DYN_FLUIDSYNTH enabled. 
SVN r2818 (trunk)
 2010-09-18 02:12:49 +00:00
Christoph Oelckers
3090ad7be6 - we don't need to include lists.h any longer. 
SVN r2817 (trunk)
 2010-09-17 22:57:04 +00:00
Christoph Oelckers
eeab5ba0e4 - reintegrate savegame menu changes back into trunk 
SVN r2816 (trunk)
 2010-09-17 22:48:55 +00:00
Christoph Oelckers
46b3bb8e41 - moved BFGSplash damage type to BFGExtra actor so that it can be replaced. 
SVN r2808 (trunk)
 2010-09-17 13:22:39 +00:00
Christoph Oelckers
e385de010d - fixed: FValueTextItem::MenuEvent must eat all MKEY_Enter events so that the menu doesn't try to activate the item which results in an attempt to create an invalid submenu. 
SVN r2807 (trunk)
 2010-09-17 10:11:39 +00:00
Christoph Oelckers
fa062aa141 - fixed: DPlayerMenu::ClassChanged needs to call PickPlayerClass before setting the playerclass CVAR. 
SVN r2806 (trunk)
 2010-09-17 08:19:02 +00:00
Christoph Oelckers
ae3c60454f - fixed: M_Ticker should not run any code when the menu is off. 
SVN r2805 (trunk)
 2010-09-17 06:20:08 +00:00
Christoph Oelckers
35aa6e7847 - fixed: The player name input box did not 0-terminate the string when temporarily appending an underscore for the cursor display. 
SVN r2804 (trunk)
 2010-09-16 23:16:06 +00:00
Christoph Oelckers
3424548bec - skip all mouse move events that come right after switching to native mouse. 
Windows sends some when the mouseis ungrabbed even when it does not move.
  This caused the currently selected menu item to get unselected.



SVN r2803 (trunk)
 2010-09-16 22:45:12 +00:00
Christoph Oelckers
198c714dad - fixed the compatibility handler of AAmbientSound::Serialize. 
SVN r2802 (trunk)
 2010-09-16 20:47:41 +00:00
Christoph Oelckers
6789b8936c - fixed: When moving a sector plane P_CheckPosition must do the same anti-overlap checks for monsters like P_Move to avoid monster pile-ups. 
SVN r2801 (trunk)
 2010-09-16 20:15:44 +00:00
Christoph Oelckers
6db772b4e5 - fixed the player class selection fix from r2798. 
SVN r2800 (trunk)
 2010-09-16 17:01:42 +00:00
Christoph Oelckers
491da14d9b - Changed the ambient sound timer to use level.maptime instead of gametic so that it gets paused along with the rest of the game automatically. 
SVN r2799 (trunk)
 2010-09-16 16:29:23 +00:00
Christoph Oelckers
4da5ce74ca - fixed: The menu should not override the user's player class if there is no player class menu. 
SVN r2798 (trunk)
 2010-09-16 16:20:39 +00:00
Christoph Oelckers
09da387689 - added: If a map contains both extended normal and GL nodes the GL nodes loader will now load the prebuilt GL nodes. 
SVN r2797 (trunk)
 2010-09-16 14:26:56 +00:00
Christoph Oelckers
a5be18c1c1 - try not to scale the option menu to more than 3/4 of the screen's width if doable. 
SVN r2796 (trunk)
 2010-09-16 12:48:58 +00:00
Christoph Oelckers
ee87fdc58e - some layout tweaks for the option menu system, in particular to shorten the sliders if the menu is too wide. 
- allow specifying the fractional precision for the numbers behind the sliders.
- took all HUD related options out of the display options menu and created a seaparate one for them.
- added several more display and HUD options to the menu.
- created a new 'Miscellaneous options' menu for a few items that should be accessible but don't fit anywhere else.


SVN r2795 (trunk)
 2010-09-16 10:59:40 +00:00
Christoph Oelckers
deef0e0a88 - oops 
SVN r2794 (trunk)
 2010-09-16 08:36:14 +00:00
Christoph Oelckers
916d4809a9 - added Demolisher's APROP_Target/TracerTID submission. 
SVN r2793 (trunk)
 2010-09-16 07:00:27 +00:00
Christoph Oelckers
3662bf8a15 - reverted r2783 because it was causing problems. 
SVN r2792 (trunk)
 2010-09-16 06:51:42 +00:00
Christoph Oelckers
c948fd08f2 - fixed: GUI mouse events did not take letterboxing into account. 
SVN r2788 (trunk)
 2010-09-15 21:53:12 +00:00
Christoph Oelckers
106cf82f62 - added a fixed version of Demolisher's GetActor** submission for returning the activator's info when the tid is 0. 
SVN r2787 (trunk)
 2010-09-15 21:41:49 +00:00
Christoph Oelckers
5dfc57336e - fixed: The class selection menu crashed when no item in the menu was selected. 
SVN r2786 (trunk)
 2010-09-15 20:11:32 +00:00
Christoph Oelckers
d8fd72e19a - added Khamsin's fix for visible mouse cursors in Linux fullscreen mode with mouse disabled. 
SVN r2785 (trunk)
 2010-09-15 16:50:08 +00:00
Christoph Oelckers
dca03ac76a - changed ACS's print n: cast to use an actor's tag for non-players instead of the class name. 
SVN r2784 (trunk)
 2010-09-15 14:47:44 +00:00
Christoph Oelckers
a0d7693f33 - added Spleen's fix for not running 2 frames of the weapon when the player spawns. 
SVN r2783 (trunk)
 2010-09-15 14:09:48 +00:00
Christoph Oelckers
4ca21e8e38 - added Edward-san's 'changemus' submission for printing the currently playing music track. 
SVN r2782 (trunk)
 2010-09-15 13:49:11 +00:00
Christoph Oelckers
d5f9b0874e - fixed: Lines in the option menu that covered the same vertical space as the back button rendered the back button inoperable. 
SVN r2779 (trunk)
 2010-09-15 10:22:38 +00:00
Christoph Oelckers
087979d6cc - fixed: skipping the skill menu locked up the menu sequence for starting a game. 
SVN r2777 (trunk)
 2010-09-14 22:00:02 +00:00
Christoph Oelckers
5fcac9b5f1 - fixed: The default GetPixelDoubling function in DFrameBuffer returned 1 instead of 0. 
- copied a NULL pointer check for screen from GZDoom.


SVN r2776 (trunk)
 2010-09-14 20:53:12 +00:00
Christoph Oelckers
ecb34b8302 - relaxed conditions for shortening the sliders so that they remain at full size at 800x600. 
SVN r2771 (trunk)
 2010-09-14 19:08:21 +00:00
Christoph Oelckers
8308a35345 - deleted empty old files. 
SVN r2769 (trunk)
 2010-09-14 17:29:54 +00:00
Christoph Oelckers
579502ab74 - merged menu branch back into trunk. 
SVN r2768 (trunk)
 2010-09-14 17:28:18 +00:00
Christoph Oelckers
ec0b07b5e2 - added Entryway's AM_Rotate optimization. 
SVN r2739 (trunk)
 2010-09-10 13:49:08 +00:00
Christoph Oelckers
610ff3956e - fixed P_LoopSideDefs could crash on the second P_LoopSidedefs call if there were unconnected linedefs in the map. 
SVN r2716 (trunk)
 2010-09-08 08:53:39 +00:00
Christoph Oelckers
ce2c2bd825 - replaced AM_Rotate with a more precise floating point version posted by Entryway. 
SVN r2713 (trunk)
 2010-09-07 20:23:44 +00:00
Braden Obrzut
31754a582d - Fixed: when using the border property of drawbar, interpolation didn't work quite right. 
SVN r2705 (trunk)
 2010-09-06 20:12:44 +00:00
Christoph Oelckers
e9211aaad3 - added some NULL pointer checks to the kill CCMD and APlayerPawn::PostBeginPlay. 
SVN r2697 (trunk)
 2010-09-05 20:51:13 +00:00
Braden Obrzut
3dbf807345 - Applied Chris's patch to fix hmi compilation error on Linux. 
SVN r2689 (trunk)
 2010-09-04 18:21:51 +00:00
Randy Heit
61d438e1eb - Don't call M_NotifyNewSave() before closing the new savegame. 
- Disallow negative read lengths in FileReader::Read().

SVN r2685 (trunk)
 2010-09-04 03:02:13 +00:00
Randy Heit
84b9de8c14 - Make sure Tempo is initialized before creating SMFs. 
SVN r2684 (trunk)
 2010-09-04 02:57:36 +00:00
Randy Heit
070ec75785 - Cleaned up the ugly MIDI song creating code a little. 
- Added a generic Standard MIDI File creator that works with any of the sequencers. mus2midi.cpp
  is no longer used but is kept around as a reference.

SVN r2677 (trunk)
 2010-09-03 05:08:05 +00:00
Randy Heit
092cbfd55b - Fixed: When the game nodes were the same as the render nodes, their pointers would not be NULLed. 
SVN r2676 (trunk)
 2010-09-03 02:11:35 +00:00
Randy Heit
81e21b0688 - Renamed music_midi_midiout.cpp to music_smf_midiout.cpp. 
- Moved MIDI precaching logic into MIDIStreamer so that SMF and HMI files can both use the
  same implementation.
- Added a player for HMI midi files.

SVN r2675 (trunk)
 2010-09-02 23:17:58 +00:00
Braden Obrzut
241e09c271 - Fixed: font monospacing didn't apply to the space character. 
SVN r2666 (trunk)
 2010-09-01 22:26:07 +00:00
Randy Heit
0202c0c3a9 - Added the am_zoom command to zoom the automap by a specific step and set default mouse wheel 
bindings for it. I'm not sure how this should be exposed through the menu, however. Technically,
  it's different from the pan keys, but from an end user's point of view, they both zoom the
  automap, so they should both be listed under the Zoom in and out controls. But the menu code
  can't handle that.

SVN r2663 (trunk)
 2010-09-01 05:03:17 +00:00
Randy Heit
7bf0cd13a6 - Fixed: The mouse pointer stayed hidden on startup because the CursorState variable was not 
set until the mouse was grabbed.

SVN r2662 (trunk)
 2010-09-01 04:24:56 +00:00
Randy Heit
c25f206fbb - Disable framebuffer debug spew. All those OutputDebugString messages from DCanvas::DrawLine()'s 
Lock and Unlock calls were slowing things down extremely when looking at a software-drawn
  automap.

SVN r2661 (trunk)
 2010-09-01 04:13:36 +00:00
Randy Heit
a2573e4bb3 - Fixes to compile with GCC 4.5.0. 
SVN r2660 (trunk)
 2010-09-01 03:30:18 +00:00
Randy Heit
4b817cfd8b - Fix an ICE when compiling with GCC 4.5.0. 
SVN r2659 (trunk)
 2010-09-01 03:22:43 +00:00
Braden Obrzut
230178bf98 - Added drawshadow flag to drawstring. 
SVN r2656 (trunk)
 2010-08-31 21:36:30 +00:00
Christoph Oelckers
88f0fa270a - added kgsws-cz's FBF_NOFLASH submission. 
SVN r2655 (trunk)
 2010-08-31 21:24:03 +00:00