Randy Heit
7f01a6a30a
Import envelope tweaks for current WildMidi git
2016-01-11 20:06:06 -06:00
Randy Heit
50ecec199f
More stuff we don't need in WildMidi removed
2016-01-11 20:06:05 -06:00
Randy Heit
88beae55bd
Add separate NRPN coarse/fine adjustment for WildMidi
2016-01-11 20:06:05 -06:00
Randy Heit
7f44bc6d0e
Add Yamaha and GM reset sysex handling to WildMidi
2016-01-11 20:06:05 -06:00
Randy Heit
a74d352490
Update gus_pat.cpp's envelope fudging to current git version
2016-01-11 20:06:04 -06:00
Braden Obrzut
0c3b468e42
Merge branch 'osx_start_wnd'
2016-01-11 20:47:06 -05:00
Christoph Oelckers
7c8d48bbfc
Merge branch 'edf-gl'
...
Conflicts:
src/actor.h
src/p_spec.cpp
2016-01-12 00:02:17 +01:00
Randy Heit
56f7ace9be
include <limits.h> in the bin packers to make GCC happy
2016-01-11 17:01:29 -06:00
Christoph Oelckers
2f2bd91083
Merge branch 'master' of https://github.com/rheit/zdoom
2016-01-11 23:59:35 +01:00
Christoph Oelckers
61e48013dc
- fixed a warning in WildMidi code.
2016-01-11 23:46:12 +01:00
Christoph Oelckers
cd9e18a72b
- fixed: operator<< (FArchive &arc, secspecial_t &p) erroneously read the old special in the compatibility handler as a short, but it must be read as an int.
...
- bumped savegame version to bring it in line with a GZDoom exclusive change.
2016-01-11 23:44:13 +01:00
coelckers
f539803d49
Merge pull request #471 from MajorCooke/FriendlyFireFix
...
Small LaxTelefragDmg Flag Fix
2016-01-11 22:45:37 +01:00
Christoph Oelckers
65022b780a
- implemented 'copy portal to wall' linedef type.
2016-01-11 22:44:53 +01:00
MajorCooke
7843ece01a
Fixed: Friendly fire damage didn't take LAXTELEFRAGDMG into account.
2016-01-11 15:08:38 -06:00
Christoph Oelckers
196c9bc34d
- cleaned up the skybox type detection logic.
2016-01-11 20:29:24 +01:00
Christoph Oelckers
0e017f1e2d
- cleaned up the merge and consolidated redundant code.
2016-01-11 15:40:25 +01:00
Christoph Oelckers
f83b21ff26
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
src/p_spec.cpp
2016-01-11 15:35:01 +01:00
Christoph Oelckers
011385a20e
Merge branch 'master' of https://github.com/rheit/zdoom
2016-01-11 15:30:04 +01:00
Christoph Oelckers
7115590c1d
- moved setup code for Eternity-style skyboxes to p_spec.cpp and consolidated most of it with nearly identical parts of the stacked sector portal setup code.
2016-01-11 15:29:44 +01:00
Christoph Oelckers
d5cf31f821
Merge branch 'zmaster' into edf-gl
...
Conflicts:
src/actor.h
2016-01-11 15:10:10 +01:00
Christoph Oelckers
ef7bcb3a66
- implement Eternity-Style flat and horizon portals. Not tested yet due to lack of material to work with.
2016-01-11 15:07:58 +01:00
Randy Heit
42e9a6a711
Make atlas size a macro definition and default it to 512x512 (was 256x256)
2016-01-10 22:14:35 -06:00
Randy Heit
aaac5ac7a1
Use not so brilliant backgrounds for allocated atlas backgrounds
2016-01-10 22:01:29 -06:00
Randy Heit
670058fa3c
Switch to the bottom-left picker for the Skyline Bin Packer
2016-01-10 21:54:28 -06:00
Randy Heit
4f0046105d
Change texture atlas display to show allocated rectangles
2016-01-10 21:09:16 -06:00
Christoph Oelckers
ab1bf2bca3
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
src/actor.h
2016-01-10 22:43:34 +01:00
Christoph Oelckers
918a2ed562
-fixed: Eternity-style skyboxes must check if some portal copy definitions have been set for them.
2016-01-10 22:26:08 +01:00
Christoph Oelckers
2c0f64cf9f
- refactoring of R_PointToAngle2 when used to calculate direction between two actors.
2016-01-10 20:46:26 +01:00
Christoph Oelckers
1e2ce9a622
- some refactoring of P_AproxDistance calls into newly defined AActor method AproxDistance.
...
The main reason here is to reduce the number of instances where AActor::x and AActor::y are being referenced.
2016-01-10 17:52:41 +01:00
Christoph Oelckers
76b0971067
Merge branch 'master' into edf-gl
2016-01-10 10:31:00 +01:00
Christoph Oelckers
bfbc160b0c
Merge branch 'zmaster'
2016-01-10 10:30:23 +01:00
Christoph Oelckers
39cdb7cf30
- implement 'loadacs' option for MAPINFO.
2016-01-10 10:21:17 +01:00
Christoph Oelckers
1e193206bf
- removed unused RemoveLineIDs function.
2016-01-10 10:08:06 +01:00
Christoph Oelckers
d0978d0760
- added EDF sector handling.
2016-01-10 10:05:06 +01:00
Christoph Oelckers
4fd0a726b1
- more work on EDF handling. Vaporware demo is now loading.
2016-01-10 10:05:06 +01:00
Christoph Oelckers
feeaf29c46
- set translations for Eternity's linked portals for testing.
2016-01-10 10:05:05 +01:00
Christoph Oelckers
bdfac02f69
- EDF parser for linedefs and sectors. Also extended the Eternity xlat table to handle the parameterized types to the point EDF needs.
2016-01-10 10:05:05 +01:00
Christoph Oelckers
9fe016d6d0
- EDF parser part 1: Mapthings.
2016-01-10 10:05:04 +01:00
ZZYZX
4bbec2a7fe
Fixed skybox clipping: sprite columns shouldn't be clipped against the current portal if rendered on root level of a skybox.
2016-01-10 05:48:06 +02:00
ZZYZX
605fce9008
Fixed skybox clipping: things in a skybox shouldn't be clipped against current portal. Fixed: portal inside of a skybox sets CurrentPortalInSkybox to false.
2016-01-10 05:45:26 +02:00
ZZYZX
4d518a220c
Fixed skybox clipping: lines in a skybox shouldn't be clipped against current portal
2016-01-10 05:22:33 +02:00
Randy Heit
1f34372abc
Remove the upper limit on midi_voices.
...
- Black MIDIs can be brutal, and there's really no reason that this needs
to be artificially limited to a paltry 256 voices.
2016-01-09 17:55:39 -06:00
Christoph Oelckers
68b4c23a82
Merge branch 'master' of https://github.com/rheit/zdoom
2016-01-09 21:10:46 +01:00
Christoph Oelckers
53d385a596
- need to validate SetSectorTerrain's 'plane' parameter,
2016-01-09 21:10:12 +01:00
Christoph Oelckers
f391216ab9
Merge branch 'master' of https://github.com/rheit/zdoom
2016-01-09 19:48:01 +01:00
coelckers
725408d9fe
Merge pull request #468 from alexey-lysiuk/osx_fullscreen_shortcut
...
Shortcut to toggle fullscreen on OS X
2016-01-09 18:23:43 +01:00
alexey.lysiuk
b27fdcffb5
Added shortcut to toggle fullscreen on OS X
...
Press Command+F to toggle fullscreen mode in native OS X backend
Set k_allowfullscreentoggle CVAR to false to disable the shortcut
2016-01-09 17:12:58 +02:00
Christoph Oelckers
23cfd29dbb
- let's save the terrain properties as names so that they survive a change in the definition files.
2016-01-09 12:28:42 +01:00
Christoph Oelckers
7f454358b9
- added ACS SetSectorTerrain function.
2016-01-09 12:16:41 +01:00
Christoph Oelckers
71c7f2b42c
- added 'floorterrain' and 'ceilingterrain' sector properties for UDMF. These will take precedence over texture based terrain if used.
...
'ceilingterrain' is needed because the top of 3D-floors refers to the model sector's ceiling, so in order to give a 3D floor a terrain it must be assignable to the sector's ceiling.
Note that although it is basically the same property, its actual function bears no relevance to its use in Eternity.
2016-01-09 12:10:36 +01:00