zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,267 Commits 139 Branches 144 Tags 184 MiB
Commit Graph

6267 Commits

Author SHA1 Message Date
Christoph Oelckers 2657c08831 - fixed: stacked sector portals were not added to the render list 2016-01-13 21:33:27 +01:00
Christoph Oelckers cd778b6bdc - fixed CollectPortalSectors 2016-01-13 00:15:04 +01:00
Christoph Oelckers 7c925e39fe Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-12 21:36:48 +01:00
Christoph Oelckers 4d2ca0da45 - empty gl_portals.cpp file. 2016-01-12 21:36:33 +01:00
Christoph Oelckers d234a6af5d Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-12 21:35:18 +01:00
Christoph Oelckers 37f18055af - turned sector_t::FloorSkyBox and CeilingSkyBox into an array. 
- removed unused SpreadCeilingPortal function.
 2016-01-12 21:34:41 +01:00
Randy Heit dc66f4cb3f Make _WM_AdjustNoteVolume's pan_ofs a signed int 2016-01-12 06:35:05 -06:00
Christoph Oelckers aa69c39ff1 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/CMakeLists.txt
 2016-01-12 11:23:45 +01:00
coelckers db527c02f3 Merge pull request #472 from edward-san/wildmidi_fix 
- Fixed Clang warning on wildMIDI code.
 2016-01-12 11:21:07 +01:00
Edoardo Prezioso b87c612aba - Fixed Clang warning on wildMIDI code. 
Now that '_event_data.data' is changed to 'unsigned int', the 'unsigned long' cast is not needed anymore.
 2016-01-12 11:12:19 +01:00
Christoph Oelckers 9e33599536 - at least get the terms being used right. Of course it's not EDF (which would way beyond the scope of what's intended here) but only Extradata, that's being supported. 
(For EDF an external converter would make more sense.)
 2016-01-12 09:13:55 +01:00
Randy Heit 46f04830e2 Update VC2005 project files 2016-01-11 21:11:36 -06:00
rheit 8408aec347 Merge pull request #456 from alexey-lysiuk/lzma_1514 
Updated LZMA SDK to version 15.14
 2016-01-11 20:53:51 -06:00
Randy Heit 141cd660eb Didn't need note_off_decay in the WildMidi sample struct 2016-01-11 20:07:14 -06:00
Randy Heit 27bf86e1eb Fix(?) dBm_pan_volume table 
- The missing comma on the first line of dBm_pan_volume's definition
  looked suspicious, so I checked the MIDI specification at
  http://www.midi.org/techspecs/rp36.php and found the equations
  there gave different dB values than were in the table. So I
  rebuilt it using the equation given there:

    20*log (sin (Pi /2* max(0,CC#10 – 1)/126))
 2016-01-11 20:06:07 -06:00
Randy Heit 268d2faaf6 Import volume handling changes from current WildMidi git 
- Description there reads:
  > Major work done on “log” volumes. Calculations are now based on decibels.
 2016-01-11 20:06:07 -06:00
Randy Heit 5b4a6483b5 Remove get_decay_samples. Not needed. 2016-01-11 20:06:06 -06:00
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