c2e91293d2
Merge pull request #310 from MajorCooke/telefogfix
...
- Allow teleport fogs to set the teleporting actors as their targets, so...
2015-04-30 09:02:10 +02:00
7d90c65427
- mask out Strife mapthing flags when starting an original Hexen map.
2015-04-29 08:42:54 +02:00
3c1fa3bed9
- fixed some GCC warnings.
2015-04-29 00:19:21 +02:00
a2100410f2
- fix in GL nodes loader.
2015-04-28 22:13:50 +02:00
f087903fca
- remove some redundancy from TeleportFog code.
2015-04-28 22:11:43 +02:00
15fbf2510a
Merge pull request #320 from edward-san/clang_3_5_crash_solved
...
- Clang 3.5.1+ fixed the compiler bug in ACS code.
2015-04-28 22:06:50 +02:00
ce4adc48a7
Merge pull request #319 from edward-san/inventory
...
Little TakeInventory refactoring.
2015-04-28 22:06:31 +02:00
319671b54a
- let cheats only give weapons in weapon slots.
...
This avoids problems which replace the entire arsenal and don't want the original weapons in there.
2015-04-28 22:05:43 +02:00
92fe265abe
- Clang 3.5.1+ fixed the compiler bug in ACS code.
...
Referring to commit 1c96039d7a
2015-04-28 19:25:06 +02:00
b51fac344d
Little TakeInventory refactoring.
...
Introduce AActor::TakeInventory, which unifies DoTakeInv from ACS and DoTakeInventory from Decorate, and AInventory::DepleteOrDestroy, which is extracted from the DoTakeInv core function, and use both where they're needed.
I don't know if the differences between DoTakeInv and DoTakeInventory were intentional, so I kept both behaviors.
2015-04-28 15:45:11 +02:00
a93c30238b
Merge branch 'master' of https://github.com/rheit/zdoom
2015-04-27 20:38:09 +02:00
c6fe0835d3
- fixed: The check for unblocking overlapping actors was a bit too lax.
...
The code never checked the starting position of the move and could be erroneously triggered in rare situations where the distance increased between actors but the hit boxes started overlapping because x or y distance got below the radius.
Changed it so that the code only gets executed when there's already an overlap before the move.
2015-04-27 20:37:01 +02:00
9ba5e30bed
- Moved autoload initialization to a separate function so that the rest of the ini can be loaded as before. Some platforms do indeed place zdoom.pk3 elsewhere.
2015-04-27 14:15:03 -04:00
98029a12ec
Merge branch 'master' of https://github.com/rheit/zdoom into zmaster
2015-04-27 18:19:44 +02:00
ae16e5d195
- Assigned editor number 5006 to SkyCamCompat class, to match Eternity's definition.
2015-04-27 18:18:46 +02:00
f3105797f4
Merge pull request #318 from edward-san/c++11_fixes
...
- Fixed C++11 warnings from recent commits.
2015-04-27 17:38:50 +02:00
346fcf584c
- Fixed C++11 warnings from recent commits.
2015-04-27 15:22:09 +02:00
47e7a30cab
- reshuffled some stuff to satisfy Linux compilers (hopefully)
2015-04-27 13:19:34 +02:00
d46ba7bfb7
- added pickup sprite for Chex Quest's Mini Zorcher (i.e. pistol replacement.)
2015-04-27 10:24:49 +02:00
aedd8f89cb
Merge branch 'master' of https://github.com/rheit/zdoom
2015-04-27 08:58:06 +02:00
020808ff40
- updated pistol pickup sprite with one from original beta graphics.
2015-04-27 08:57:36 +02:00
68e43fe65d
You never want to blindly switch between widechar and ANSI functions
2015-04-26 20:53:16 -05:00
0380ba642b
Blur de hur
2015-04-26 20:43:01 -05:00
13fb76db21
- changed lump reader setup for music so that for uncompressed data it opens a new FILE instead of caching the lump.
...
This reinstates behavior of pre-OpenAL versions but still uses the FileReader interface to keep the simplified code of the OpenAL branch.
2015-04-26 23:28:05 +02:00
4294b94728
- since Wads.ReopenLumpNum already performs caching on the lump data it is not really necessary anymore to maintain a separate musiccache, so this code can be removed.
2015-04-26 22:09:19 +02:00
43053b89a5
- Set the morphing and unmorphing actor as target for the teleport fog. This will allow for better interactions on what should happen between the morphee without needing to make monster AI needing to search for them in particular or rely upon TIDs.
2015-04-26 10:06:13 -05:00
aecff68a4d
- cleanup of sound system startup and menu handling:
...
* added global functions that check whether FMod and OpenAL are present, without initializing the sound backend.
* make sound init code more fault tolerant. It will now try to switch between FMod and OpenAL if the currently active one cannot be found but the other one can.
* added 'ifoption' checks for sound backend to menu code.
* only show sound backends which are present and hide the options for the ones which are not.
2015-04-26 12:13:21 +02:00
8e70a9b894
- added a NULL check to FMODStreamCapsule destructor, just to be safe.
2015-04-26 09:58:10 +02:00
a23afbd7ce
Merge branch 'master' into openal
2015-04-26 09:37:49 +02:00
46e975418d
- fixeed: Sound sequence overrides took the parameter from the wrong data structure.
2015-04-26 08:48:49 +02:00
6bb79be85c
- got rid of std::auto_ptr, courtesy of Blzut3's patch.
2015-04-25 17:50:57 +02:00
b9fdc21547
Merge pull request #317 from Edward850/master
...
Slightly more information on ACS serialize errors
2015-04-25 13:14:58 +02:00
d880783784
- make OpenAL and the decoder libraries delay loaded so that ZDoom can still start without them being present.
...
This required the addition of a few exception handlers so to avoid #ifdef overuse I also added some #defines for non-Windows systems that allow using __try and __except directly in the code without #ifdef'ing them out.
2015-04-25 12:25:10 +02:00
12118550d2
- fixed some warnings in OpenAL code.
2015-04-25 10:34:47 +02:00
dccd35ef29
- uncoupled OpenAL music updates from UpdateSounds.
...
UpdateSounds will not be called during screen wipes and the entire setup of this function suggests that this is not advisable at all.
The OpenAL stream updates were done deep inside this function implicitly.
This caused music to stop while a wipe was in progress. So in order to allow uninterrupted music playback during screen wipes the music updates need to be handled separately from sound updates and be called both in the main loop and the wipe loop.
I think that the OpenAL music updating should be offloaded to a separate thread but at least it's working now without causing interruptions during wipes.
2015-04-25 10:26:14 +02:00
54c2a14145
Merge branch 'master' into openal
2015-04-25 09:13:11 +02:00
682f3e230a
- fixed: We should not try calling unicode functions on ASCII strings.
...
Should ZDoom ever switch to unicode I_GetLongPathName will have to be adjusted, but for now it must call GetLongPathNameA, not GetLongPathNameW.
2015-04-25 09:08:59 +02:00
0fd93cc033
Slightly more information on ACS serialize errors
2015-04-25 18:10:26 +12:00
75471df787
- Made a few Win32 calls optional in order to restore capatibility with Windows NT 4.0 (not that anyone is using NT 4, but it was a trivial fix)
2015-04-24 23:07:32 -04:00
0da6939e84
- unmark OpenAL as 'advanced' in CMake so we can set its include and library paths in the IDE without having to enable the advanced display which isn't really helpful.
2015-04-24 22:30:28 +02:00
c91745c714
- some fixes to make OpenAL branch compile with VC++ 2013 and OpenAL support.
2015-04-24 17:42:56 +02:00
1f2a431d15
Merge branch 'master' into openal
2015-04-24 09:21:06 +02:00
920a4fbf45
- fixed: The HashTags function considered sector and line #0 invalid.
2015-04-23 21:27:36 +02:00
45b006252a
Merge pull request #316 from Doom2fan/RailgunSpiralOffset
...
Added SpiralOffset parameter to railgun functions.
2015-04-23 21:17:41 +02:00
6a6836b1e7
Added SpiralOffset to railgun functions.
2015-04-23 15:11:54 -03:00
a54404074a
- fixed: IDs that map to nothing must be removed from the spawn/conversation ID maps.
2015-04-23 20:09:12 +02:00
8d501fdb9f
Fix some issues with changing player viewheight at runtime
...
- Viewheight change was delayed: Viewheight must be copied to player
structure as well as the PlayerPawn. Not sure if should actually use
deltaviewheight to spread the change out over a few tics instead of
being instant.
- Viewheight not preserved when travelling: player->viewheight must be
restored from pawn->ViewHeight, because the temporary player set it back
to the default viewheight.
2015-04-22 23:22:27 -05:00
ca16d99445
Fixed: FOptionMenuItem::GetIndent() did not handle localized strings
2015-04-22 22:57:15 -05:00
0cbb3132e6
Don't spam Dropped packet messages for disconnected players
2015-04-22 22:35:38 -05:00
d6b8603cb6
Ignore sv_unlimited_pickup on items that stay
...
- See http://forum.zdoom.org/viewtopic.php?f=2&t=47790
2015-04-22 22:27:56 -05:00
coelckers
Christoph Oelckers
Edoardo Prezioso
Braden Obrzut
Christoph Oelckers
Randy Heit
MajorCooke
Edward Richardson
Chronos Ouroboros