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

266 Commits

Author SHA1 Message Date
Randy Heit 4c2bcede61 Update VS2005 projects for re2c and zdoom 2016-02-08 21:27:02 -06:00
Braden Obrzut ba54d73e07 Merge branch 'portals2_visual' 2016-02-05 00:10:46 -05:00
Braden Obrzut f3f77a1ba0 Merge branch 'master' into portals2_visual 2016-01-18 09:45:42 -05:00
Christoph Oelckers bf747075e8 Merge branch 'master' into scripting 
Conflicts:
	src/actor.h
	src/g_hexen/a_clericstaff.cpp
	src/p_enemy.cpp
	src/p_interaction.cpp
	src/p_local.h
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
 2016-01-17 20:57:55 +01:00
Christoph Oelckers cfcd2668cc Merge commit '772a5724313f2ad0bd6828fcc28545a9ee5e6068' into scripting 
Conflicts:
	src/p_pspr.cpp
	src/thingdef/thingdef_codeptr.cpp
 2016-01-17 20:00:45 +01:00
Randy Heit bf31d66d31 Use a better packing algorithm for the texture atlases 
- The old algorithm is something I threw together that produced decent,
  but not spectacular results since it had a tendency to waste space by
  forcing everything onto "shelves".
  The new packer is the Skyline-MinWaste-WasteMap-BestFirstFit algorithm
  described by Jukka Jylanki in his paper *A Thousand Ways to Pack the Bin - A
  Practical Approach to Two-Dimensional Rectangle Bin Packing*, which can
  currently be read at http://clb.demon.fi/files/RectangleBinPack.pdf
  This is minus the optimization to rotate rectangles to make better fits.
 2016-01-08 22:37:06 -06:00
Randy Heit 900937929e Use critical sections for WildMidi locking 
...because when you're trying to be thread-safe, it's generally a good
idea to use mechanisms that work across multiple processor cores.
 2015-12-29 17:55:19 -06:00
Randy Heit 14361d9313 Remove midi_timiditylike 
- Did anybody actually use this? Use WildMidi instead if you want
  something that sounds more like Timidity++ without actually being
  Timidity++, since not even the old Timidity manages that.
 2015-12-29 17:51:08 -06:00
Randy Heit afc36544b7 Add a WildMidi softsynth device 
- This removes the preceding psuedo MIDI device for WildMidi.
 2015-12-28 22:16:35 -06:00
Randy Heit a2ebf771d3 Remove '\r' character from beginning of WildMidi error messages 2015-12-28 19:13:34 -06:00
Randy Heit 33a252bf4b Add /LARGEADDRESSAWARE to VC2005 project 2015-12-27 21:52:44 -06:00
ZZYZX cd39c4b8a6 Merged mirrors with portals; Render part of mirrors done, render part of portals needs further testing 2015-06-07 04:19:17 +03:00
Christoph Oelckers 2e0f999fea Merge branch 'master' into scripting 
Conflicts:
	src/p_effect.cpp
	src/p_effect.h
	src/p_local.h
	src/p_map.cpp
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/actor.txt
	wadsrc/static/actors/shared/inventory.txt
	zdoom.vcproj
 2015-04-28 14:45:13 +02:00
Christoph Oelckers ddced06be2 Merge commit '6e45c565a0bc8d05279b0b2458a3fb718ae0924c' into scripting 
Conflicts:
	src/p_mobj.cpp

(This stops right before moving the conversation IDs into MAPINFO because that feature is quite conflict-heavy and will have to merged by itself.)
 2015-04-28 12:59:20 +02:00
Christoph Oelckers 065c0a79cd Merge commit '4f7ec3ad891d556c0d3f680e209a120ed38e9cdb' into scripting 
Conflicts:
	src/d_main.cpp
	src/info.cpp
	src/info.h
	src/p_acs.cpp
	src/p_interaction.cpp
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
	src/thingdef/thingdef_properties.cpp

(scripting branch update part 5)
 2015-04-28 12:48:33 +02:00
Christoph Oelckers 792cad89b3 Merge commit '3849cb86231ce24131a86e9c29795a8cf3706a3d' into scripting 
Conflicts:
	src/g_hexen/a_clericstaff.cpp
	src/g_hexen/a_hexenspecialdecs.cpp
	src/p_acs.cpp
	src/p_enemy.cpp
	src/p_interaction.cpp
	src/thingdef/thingdef_codeptr.cpp
	src/thingdef/thingdef_expression.cpp

(Scripting branch update part 4)
 2015-04-28 11:59:33 +02:00
Randy Heit 0380ba642b Blur de hur 2015-04-26 20:43:01 -05:00
Christoph Oelckers 1f2a431d15 Merge branch 'master' into openal 2015-04-24 09:21:06 +02:00
Randy Heit 3061bcf604 Add p_tags.(cpp|h) to solution 2015-04-22 17:22:57 -05:00
Randy Heit a08e439551 Update VS2005 project 2015-04-03 19:21:23 -05:00
Randy Heit d37f9cbcae Add flies (doomed #112) from the Hexen retail beta 
...because it brought back memories of adding Strife support.
- The search function is radically different, but the flying mechanics are
  the same.
 2015-04-02 17:52:54 -05:00
Randy Heit 5d27bf7742 Add Windows 8+ related bits to the manifest 2015-03-27 00:25:53 -05:00
Chris Robinson a8348b13de Merge remote-tracking branch 'zdoom/master' into openal 
Conflicts:
	output_sdl/CMakeLists.txt
	src/namedef.h
 2015-01-15 13:08:05 -08:00
Randy Heit b5e4153c78 Merge branch 'master' into gonesolong 
Conflicts:
	src/CMakeLists.txt
	src/b_think.cpp
	src/g_doom/a_doomweaps.cpp
	src/g_hexen/a_clericstaff.cpp
	src/g_hexen/a_fighterplayer.cpp
	src/namedef.h
	src/p_enemy.cpp
	src/p_local.h
	src/p_mobj.cpp
	src/p_teleport.cpp
	src/sc_man_tokens.h
	src/thingdef/thingdef_codeptr.cpp
	src/thingdef/thingdef_function.cpp
	src/thingdef/thingdef_parse.cpp
	wadsrc/static/actors/actor.txt
	wadsrc/static/actors/constants.txt
	wadsrc/static/actors/shared/inventory.txt

- Added register reuse to VMFunctionBuilder for FxPick's code emitter.
- Note to self: Need to reimplement IsPointerEqual and CheckClass, which
  were added to thingdef_function.cpp over the past year, as this file no
  longer exists in this branch.
 2014-12-21 21:15:11 -06:00
Randy Heit 2d87eb0ba2 Merge branch 'master' into gonesolong 
Conflicts:
	src/CMakeLists.txt
	src/actor.h
	src/g_heretic/a_hereticmisc.cpp
	src/g_heretic/a_hereticweaps.cpp
	src/g_heretic/a_ironlich.cpp
	src/info.h
	src/namedef.h
	src/p_buildmap.cpp
	src/p_enemy.cpp
	src/p_map.cpp
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
	zdoom.vcproj
 2014-12-20 19:13:14 -06:00
khokh2001 e9075334a3 new opl3 emulator 2014-11-23 00:36:22 +09:00
Chris Robinson ff6eb6df5c Merge remote-tracking branch 'zdoom/master' into openal 
Conflicts:
	src/s_sound.cpp
 2014-09-09 14:45:53 -07:00
Randy Heit bbc3b69a7c Remove polymost stuff 
- Maybe it will be back someday, but it's been essentially dead for nearly
  10 years, so don't hold your breath.
 2014-07-31 19:44:41 -05:00
Chris Robinson 7e7219a84b Merge remote-tracking branch 'zdoom/master' into openal 2014-07-27 06:59:26 -07:00
Randy Heit ff257a0300 Fix compiling with provided VS 2005 projects 2014-07-21 22:31:05 -05:00
Chris Robinson 7ff7c151a8 Merge remote-tracking branch 'origin/master' into openal 
Conflicts:
	src/CMakeLists.txt
 2014-06-15 12:04:15 -07:00
Randy Heit 0442c51d54 Fix building with old VC++ 2005 projects. 
- Also needed to comment out strtod declarations in gdtoaimp.h and gdtoa.h
 2014-01-21 19:41:29 -06:00
Randy Heit 850055a766 Add evaluation of constant unary and binary expressions 
- Added ZCCCompiler class as a place to generate IR and symbols from an
  AST. Right now, all it does is simplify constant expressions into
  constant values.
- Do type promotion on the AST where appropriate.
- Added true and false tokens to the parser driver.
 2013-10-25 22:30:24 -05:00
Randy Heit da02a44126 Consolidate special path functions into m_specialpaths.cpp 
- Also remove CDROM_DIR while I'm at it.
 2013-09-14 21:04:00 -05:00
Chris Robinson 18597a93a7 Merge remote-tracking branch 'origin' into openal 
Conflicts:
	src/sound/fmodsound.cpp
 2013-06-29 19:02:04 -07:00
Randy Heit 4deeb8d8ae Merge branch 'master' into scripting 
Conflicts:
	src/actor.h
	src/g_doom/a_doomweaps.cpp
	src/p_local.h
	src/p_map.cpp
	src/sdl/i_main.cpp
	src/thingdef/thingdef_codeptr.cpp
 2013-06-25 19:28:25 -05:00
Randy Heit a5f5d8adcb - Remove the first parameter from updaterevision, since it isn't needed with git. 2013-06-24 20:58:14 -05:00
Christoph Oelckers 4e77b93a52 - d_dehackedactions no longer exists. 2013-06-23 17:38:51 -05:00
Randy Heit d8f88770fd - baseversion.h was not supposed to make its way into zdoom.vcproj, since it was never used. 2013-06-22 22:39:20 -05:00
Randy Heit 98ac224e53 - Use gitinfo.h instead of svnrevision.h for versioning. 
- Use functions in gitinfo.cpp to retrieve the strings from gitinfo.h so
  that changes to gitinfo.h only require recompiling one file instead of
  several.
 2013-06-22 21:49:51 -05:00
Randy Heit 459ad5abff - Updated scripting branch to latest version in trunk. 
SVN r4337 (scripting)
 2013-06-07 03:31:30 +00:00
Randy Heit e59d7bc8b8 - Since we have two OPL cores now, what's one more? Added a straight, (highly) unoptimized port 
of the Java OPL3 emulator.

SVN r3967 (trunk)
 2012-11-15 05:23:24 +00:00
Randy Heit 3ec387ac32 - Renamed opl_stereo to opl_fullpan, since DOSBox's core is emulating an OPL3, which is stereo 
but only supports three pan positions and not the full 127 MIDI pan positions.
- Added opl_core cvar to select emulator core. 0 is MAME and 1 is DOSBox.
- Added DOSBox's LGPL OPL core, distantly related to one adlibemu.c written by Ken Silverman
  (not to be confused with the ancient MAME-derived and GPL-licensed core also found in DOSBox).
  I believe this corresponds to their "compat" emulator, but I'm not sure.

SVN r3946 (trunk)
 2012-11-08 05:45:58 +00:00
Randy Heit df1e802412 - Make OPL emulation more of a black box. 
SVN r3942 (trunk)
 2012-11-06 05:21:00 +00:00
Randy Heit 0c7955b550 - Remove deleted file a_macil.cpp from the project file. 
SVN r3937 (trunk)
 2012-11-03 03:19:10 +00:00
Randy Heit e7efa1d802 - Update to latest version in trunk. 
SVN r3890 (scripting)
 2012-10-17 04:24:54 +00:00
Randy Heit 4cdf524e6c - Remove wrappers.asm from the project file too. 
SVN r3801 (trunk)
 2012-08-02 03:44:48 +00:00
Randy Heit 562cf04db2 - Update scripting branch to trunk. 
SVN r3758 (scripting)
 2012-07-14 03:04:41 +00:00
Randy Heit 1fec92c921 - Looks like the previous commit was not quite complete... 
SVN r3617 (trunk)
 2012-05-04 02:15:31 +00:00
Randy Heit 6704acc106 - Added shfolder.lib to the linker dependencies of 32-bit builds for Windows 98 compatibility, 
so that SHGetFolderPath is taken from shfolder.dll instead of user32.dll.

SVN r3616 (trunk)
 2012-05-04 02:04:19 +00:00