Christoph Oelckers
d8ea128f38
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
2015-07-16 20:37:17 +02:00
ZZYZX
31cad858d9
Fixed odd merge bugs
2015-06-07 20:54:36 +03:00
alexey.lysiuk
2200569793
Fixed build on OS X without FMODEx
2015-06-07 11:31:53 +03:00
Christoph Oelckers
5f1c4d157c
Merge branch 'master' into scripting
...
Conflicts:
src/g_shared/a_sharedglobal.h
src/thingdef/thingdef_codeptr.cpp
src/thingdef/thingdef_data.cpp
2015-04-30 12:30:36 +02:00
Christoph Oelckers
84351419a3
Merge branch 'master' of https://github.com/crimsondusk/zdoom
...
Conflicts:
src/actor.h
2015-04-30 10:03:50 +02:00
Christoph Oelckers
137e624b55
- needed one more fix in CMake project.
2015-04-28 15:12:21 +02: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
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
Christoph Oelckers
7898e189df
- fixed problems in CMake project files:
...
* thingdef_function.cpp no longer exists
* the build rule for zcc-parse.c was not correct.
2015-04-28 09:40:57 +02:00
Christoph Oelckers
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
Christoph Oelckers
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
Christoph Oelckers
1f2a431d15
Merge branch 'master' into openal
2015-04-24 09:21:06 +02:00
Christoph Oelckers
6326cd74b4
- moved tag iterators to their own file.
2015-04-19 09:07:05 +02:00
arezey
810a1dc28d
Fixed the way mt.exe is invoked
2015-04-12 02:44:12 +03:00
arezey
a6287a4706
Fix compilation with CMake on Windows when some other building tool than
...
msbuild is used.
2015-04-12 02:11:51 +03:00
Christoph Oelckers
ccd9fb9c23
- moved FDoomEdMap to its own file to make the upcoming changes a bit nicer to handle.
2015-04-03 10:54:55 +02: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
Christoph Oelckers
c249157876
Merge branch 'master' into openal
2015-03-24 17:59:08 +01:00
Braden Obrzut
b958e930cf
- Cleared developer warnings with modern (3.0+) versions of CMake.
2015-03-23 23:28:18 -04:00
Randy Heit
719dfbe5a9
Don't die on configuration if xinput.h is not found
2015-02-27 21:51:04 -06:00
Randy Heit
775e33ede7
Merge branch 'master' into scripting
...
Conflicts:
src/actor.h
src/g_doom/a_archvile.cpp
src/g_shared/a_morph.cpp
src/p_enemy.h
src/p_local.h
src/p_mobj.cpp
src/sc_man_tokens.h
src/thingdef/thingdef_codeptr.cpp
src/thingdef/thingdef_exp.h
src/thingdef/thingdef_expression.cpp
src/thingdef/thingdef_states.cpp
wadsrc/static/actors/actor.txt
2015-01-29 20:53:08 -06: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
alexey.lysiuk
aa1f51d3d2
Reimplemented gaming controllers support in native OS X backend using pure IOKit
2015-01-04 14:08:53 +02:00
alexey.lysiuk
a67dc4148b
Split implementation of native OS X backend into several files
2014-12-28 16:35:00 +02: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
alexey.lysiuk
1433bf3f78
Put all non-Windows source code into posix directory and its subdirectories
2014-12-18 11:52:29 +02:00
alexey.lysiuk
84b12d23b5
Native OS X backend no longer requires SDL
2014-12-16 23:20:54 +02:00
alexey.lysiuk
3c76e5689a
Fixed path to SDL specific Obj-C++ file
2014-12-16 23:20:14 +02:00
alexey.lysiuk
83c8f44cc4
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_pure
2014-12-16 10:25:34 +02:00
alexey.lysiuk
8bc890c995
Rearranged files to avoid usage of symbolic links
2014-12-15 17:40:30 +02:00
alexey.lysiuk
9d135a0586
Get rid of SDL in more parts of native OS X backend
2014-12-14 16:28:31 +02:00
alexey.lysiuk
8d16c2e3c0
OS X native backend no longer use files from src/sdl directly
...
Cocoa backend is compiling but failed to link
Some files are referenced using symbolic links
Apple's HID Utilities were moved to own directory
2014-12-14 11:57:08 +02:00
Braden Obrzut
86372fce34
- Added Steam detection for Stife: Veteran Edition.
...
- Added Steam install scanning for Linux and OS X. (OS X and Win32 not yet tested.)
2014-12-12 16:23:46 -05:00
Braden Obrzut
da8f2185d8
- Adapt SDL2 changes for the Mac (both using SDL2 backend and Cocoa).
2014-12-11 16:54:38 -05:00
Edoardo Prezioso
372f7e7002
- Various CMake fixes for two problems.
...
1) Don't show OSX_COCOA_BACKEND option if the host is not OSX;
2) Don't use the '-msse' compiler flag in dumb/ if the architecture does not support it.
2014-12-10 21:11:26 +01:00
Braden Obrzut
a7b33a8ce3
- Removed XCursor code since SDL2 has proper color cursor support.
...
- Improved international keyboard support by falling back to scan codes if we don't recognize a keycode.
- Clear out any residual mouse movement when entering relative mouse mode.
2014-12-10 01:53:22 -05:00
Braden Obrzut
d625caf03c
- Ported SDL backend to SDL 2.0. Still needs a little bit of polish, but it works.
2014-12-08 18:46:10 -05:00
Christoph Oelckers
4a3427fe50
Merge branch 'opl3emu' of https://github.com/khokh2001/zdoom
2014-11-25 16:32:52 +01:00
khokh2001
e9075334a3
new opl3 emulator
2014-11-23 00:36:22 +09:00
alexey.lysiuk
3e1bb9017b
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-11-22 12:09:50 +02:00
Braden Obrzut
601852d224
- Fixed: fixrtext isn't needed with Win64 builds.
2014-11-17 21:56:16 -05:00
alexey.lysiuk
64e34d883b
Fixed build on UNIX systems other than OS X
2014-11-17 14:54:46 +02:00
alexey.lysiuk
b63bd56da8
Removed .xib file and, therefore, dependency from ibtool
...
Menu is now created in code
2014-11-15 13:32:37 +02:00
alexey.lysiuk
d2d6d2a7f8
Lowered minimum OS requirement to 10.5 Leopard
2014-11-08 13:30:41 +02:00
alexey.lysiuk
949325df68
Merge branch 'fix_cmake_unix' into z_osx_clean
2014-10-18 12:36:09 +03:00
alexey.lysiuk
1715b25a3e
Fixed Unknown CMake command "CHECK_LIBRARY_EXISTS" error on Unix targets
...
Previously it worked somehow but not with CMake 3.0.2
2014-10-18 12:33:39 +03:00
alexey.lysiuk
49dca4d9cb
Native Cocoa back-end is enabled by default
2014-09-20 11:56:15 +03: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
alexey.lysiuk
9479a89b66
Fixed crash on Release targets
2014-08-16 13:55:05 +03:00
alexey.lysiuk
96a3e0f729
Set more descriptive name for SDL source files list in CMake file
2014-08-10 12:30:19 +03:00
alexey.lysiuk
82e8c514e9
Renamed SDL specific source file with GUI related code
2014-08-09 13:20:52 +03:00
Braden Obrzut
177112603d
Added support for Cocoa back-end in CMake build system
2014-08-03 12:38:56 +03:00
alexey.lysiuk
fecd1b6401
Moved cursor and timer implementations into separate files
2014-08-03 12:33:29 +03: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
e8233d7e87
Merge remote-tracking branch 'zdoom/master' into openal
2014-07-16 08:31:12 -07:00
Edoardo Prezioso
d83f048858
- Miscellaneous CMakeLists.txt fixes.
...
- fixed a CMake warning about uninitialized use of the variable CROSS_EXPORTS in the tools subfolder when CMAKE_CROSSCOMPILING is off;
- fixed a variable typo: CMAKE_CURRENTY_BINARY_DIR instead of CMAKE_CURRENT_BINARY_DIR;
- in src/CMakeLists.txt, fixed a missing merge of a portion of code from maint branch to master.
2014-07-01 19:13:05 +02:00
Chris Robinson
48df515dd1
Merge remote-tracking branch 'zdoom/master' into openal
2014-06-28 23:29:48 -07:00
Edoardo Prezioso
1a3ac9d0b3
- Simplify CMake GCC and Clang checking.
...
Introduce the variable 'ZD_CMAKE_COMPILER_IS_GNUC(XX)_COMPATIBLE' and replace any occurrence of '"${CMAKE_C(XX)_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C(XX)_COMPILER_ID}" STREQUAL "Clang"' with it. This makes it possible to add more GCC compatible compilers in just one place.
2014-06-26 01:23:41 +02:00
Chris Robinson
eeae36fbf7
Rename the decoder sources
2014-06-19 17:53:37 -07:00
Chris Robinson
77b1febd0e
Add an mp3 decoder using libmpg123
...
Does not currently handle direct file sources
2014-06-19 06:40:27 -07:00
Chris Robinson
14618cbf30
Remove use of SDL_sound
2014-06-19 04:33:00 -07:00
Chris Robinson
b38589e2dc
Implement and use a libsndfile decoder
2014-06-19 04:13:42 -07:00
Chris Robinson
7ff7c151a8
Merge remote-tracking branch 'origin/master' into openal
...
Conflicts:
src/CMakeLists.txt
2014-06-15 12:04:15 -07:00
Chris Robinson
82de7e6357
Convert line-endings
2014-06-15 11:36:49 -07:00
Chris Robinson
0e21057a2a
Merge remote-tracking branch 'origin/openal' into openal
...
Conflicts:
src/sound/fmodsound.cpp
src/sound/oalsound.cpp
src/sound/oalsound.h
2014-06-15 09:59:24 -07:00
Christoph Oelckers
9d846395bc
- replaced console buffer with a significantly more efficient new version that also can hold a lot more data.
2014-05-24 21:05:00 +02:00
Braden Obrzut
efa9e0c3ee
Merge branch 'maint'
2014-01-18 18:10:48 -05:00
Braden Obrzut
6f7885210b
- Fixed: Some setups require the dynamic linking library to be linked explicitly, so specify it when using DYN_FLUIDSYNTH
2014-01-18 14:58:39 -05:00
Christoph Oelckers
6824e8c931
Merge branch 'maint'
2014-01-18 01:12:06 +01:00
Christoph Oelckers
1fd1ac9bab
Merge branch 'cmake_uninitialized_fix' of https://github.com/edward-san/zdoom into maint
2014-01-18 01:10:33 +01:00
Edoardo Prezioso
b329a34a58
- Fixed some cmake --warn-uninitialized messages
2014-01-17 23:36:59 +01:00
Christoph Oelckers
e126c3ec2f
Merge branch 'maint'
2014-01-17 20:45:20 +01:00
Edoardo Prezioso
aafea851f0
- Remove clang check from GCC-related workaround
...
It caused a clang warning/error regarding the non-existing flags '-fno-tree-dominator-opts' and '-fno-tree-fre'.
2014-01-17 19:11:29 +01:00
Braden Obrzut
d8ff4ec281
- Fixed: All clang 5.0 warnings.
...
- Renamed autostart/autozend since Xcode’s build process links in strictly alphabetical order.
2014-01-05 19:50:09 -05:00
Christoph Oelckers
74dee4cd63
- removed ddraw.lib from CMake files because that library is not used anymore.
2013-12-09 11:24:58 +01:00
Braden Obrzut
c04a800e2b
- When doing OLDSTYLE builds we can use the RUNTIME_OUTPUT_DIRECTORY_<CONFIG> properties to force the output location properly.
2013-11-29 17:10:29 -05:00
Christoph Oelckers
b9c032461e
- add a CMake option to enable/disable SSE2 with Visual C++. This is necessary because since VC 2012 SSE2 is the default instruction set.
2013-11-29 12:35:45 +01:00
Braden Obrzut
a8090dc22c
- Remove a hardcoded "zdoom" so that the name passed into the copy operation should always match that passed to /MAP.
2013-11-29 02:09:27 -05:00
Braden Obrzut
c21beb0b6c
- Fixed: Some versions of Visual Studio put the map file in a different location.
2013-11-29 01:54:46 -05:00
Braden Obrzut
0c1d92834a
- Fixed: Some setups require the dynamic linking library to be linked explicitly, so specify it when using DYN_FLUIDSYNTH
2013-11-26 17:58:55 -05:00
Braden Obrzut
c7632174d8
- Fixed error in manifest embedding that stopped the binary from working on Windows XP.
...
- Tweaked PK3 copying commands so that it shouldn't be possible to end up with files named Debug/Release.
2013-11-26 12:49:23 -05:00
Christoph Oelckers
8bf5872fc0
- always add DelayImp.lib for MSVC.
2013-11-24 10:27:08 +01:00
Braden Obrzut
c7099744bd
- Minor changes to the CMake since it looks like VS2005 doesn't support a few things that were added.
2013-11-11 23:56:58 -05:00
Braden Obrzut
f0b946c3cf
- Allow use of system GME library. It defaults to forcing the use of the internal library at least for now though.
2013-11-06 13:37:34 -05: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
Braden Obrzut
97d7b1e59e
Merge branch 'origin/maint'
...
Conflicts:
src/sound/fmodsound.cpp
2013-10-23 19:39:22 -04:00
Braden Obrzut
7dbf4ec38f
- Slight cleanup and I accidentally inverted the map generation flag.
2013-10-12 01:58:39 -04:00
Braden Obrzut
0759a4b438
- Actually, lets not use /Gm since it's incompatible with /MP which will be much faster on multi-core machines.
...
- Added ZDOOM_GENERATE_MAPFILE which enables linker map file generation.
2013-10-12 01:44:57 -04:00
Braden Obrzut
03b75ae7c1
- Fixed a few flags for Visual Studio compilation.
2013-10-12 00:56:49 -04:00
Braden Obrzut
b9a1528747
- DYN_FLUIDSYNTH now defaults to ON.
...
- Added ZDOOM_OUTPUT_OLDSTYLE (could probably use a more descriptive name) which causes CMake to vary the executable name by build type and place the exes and pk3s into the directory specified in ZDOOM_OUTPUT_DIR.
- ALL_BUILD will now launch ZDoom.
2013-10-10 17:40:15 -07:00
Christoph Oelckers
03f19a12fa
Merge branch 'maint'
2013-10-09 12:52:33 +02:00
Christoph Oelckers
8170cfbf98
- added my own FMOD path to CMakeLists.txt so that I can use it to create VC++ 2010 files with it.
2013-10-09 12:52:07 +02:00
Braden Obrzut
4ced90756a
- Let CMake know about noncompiled cpp files so they can appear in project files.
...
- Fixed: Somehow when I added a way to disable generator expressions I inverted the meaning of NO_GENERATOR_EXPRESSIONS.
2013-10-08 15:35:50 -04:00
Braden Obrzut
f386d6b1e3
- Embed the proper manifest file and group soure files when building Visual Studio projects with CMake. (The groups probably also apply to other project types as well.)
2013-10-06 14:37:51 -04: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
Randy Heit
9c86f1c220
Merge branch 'master' into scripting for plugged userinfo memory leak
...
Conflicts:
src/d_player.h
src/p_interaction.cpp
src/thingdef/thingdef_codeptr.cpp
2013-07-23 21:01:13 -05:00
Braden Obrzut
02ff428d54
- Allow generator expressions to be turned off during pk3 building with CMake.
...
- On Mac OS X, ensure assembly code is disabled by default (since it won't work).
2013-07-01 16:57:46 -04:00
Chris Robinson
69af01d629
Use SDL_sound when available to decode files
2013-06-30 07:45:57 -07:00
Chris Robinson
4f2e367ec6
Remove GStreamer support
2013-06-30 01:07:09 -07: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
d1835b2db8
- DavidPH's patch for Linux compilation.
2013-06-23 17:38:51 -05:00
Christoph Oelckers
ef42955053
- added DavidPH's patch for compiling with FModEx 4.44.01.
2013-06-23 17:38:51 -05:00
Christoph Oelckers
054899ea53
- added Edward-san's patch for allowing 'clang' compiler to use the same 'gcc' cmake settings
2013-06-23 17:38:51 -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
Braden Obrzut
3fe31668a6
- More Visual Studio with CMake fixes.
...
SVN r4176 (trunk)
2013-03-08 19:23:06 +00:00
Braden Obrzut
01fed92920
- Added support for Visual Studio to the CMake project.
...
SVN r4166 (trunk)
2013-02-25 00:12:21 +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
31ab5ed866
- Added zcc-parse.c dependency to CMakeLists.txt
...
SVN r3916 (scripting)
2012-10-27 03:56:44 +00:00
Randy Heit
38d7b7d203
- Fixed errors and warnings when compiling with GCC. (Unfortunately, the VC++ debug builds
...
become ungodly slow when using mods with complex DECORATE. The GCC debug builds run just
fine, however. Hopefully this is something that can be fixed later with an assembly-optimized
version of the main VM loop, because I don't relish the thought of being stuck with GDB
for debugging.)
- Fixed: The ACS_Named* action specials were erroneously defined as taking strings instead of
names.
- Fixed: Copy-paste error caused FxMultiNameState::Emit to generate code that called
DecoNameToClass instead of DecoFindMultiNameState.
- Updated FxActionSpecialCall::Emit for named script specials.
- Fixed inverted asserts for FxMinusSign::Emit and FxUnaryNotBitwise::Emit.
SVN r3893 (scripting)
2012-10-18 03:19:27 +00:00
Randy Heit
562cf04db2
- Update scripting branch to trunk.
...
SVN r3758 (scripting)
2012-07-14 03:04:41 +00:00
Christoph Oelckers
75dc6cb0b2
- changed damage screen blending code so that the same version can be used by any renderer.
...
- added GZDoom's version of blending for Strife's hazard sectors as an option to the paletteflash CVAR.
SVN r3613 (trunk)
2012-05-01 11:27:54 +00:00
Christoph Oelckers
4df1ea63b5
- added DavidPH's sqrt for DECORATE submission.
...
SVN r3586 (trunk)
2012-04-22 08:17:27 +00:00
Randy Heit
29369b4d34
- Change some of the CMake GCC build flags from appending new ones to prepending them so they
...
can be overridden.
SVN r3416 (trunk)
2012-03-09 23:30:47 +00:00
Braden Obrzut
449bd90121
- Fixed: Runtime error on Mac OS X. For whatever reason merely having the call to CFUserNotificationDisplayAlert() in I_FatalError caused exception handling to quit working. Moving it to a separate file seems to fix this. Also removed the warning about FRenderer having a non-virtual destructor.
...
SVN r3367 (trunk)
2012-02-16 22:58:17 +00:00
Braden Obrzut
6f17e0f51b
- Fixed: Mac universal binary build. (I actually just realized that my DRDTeam build script ended up just working because of this modification.)
...
SVN r3362 (trunk)
2012-02-16 20:18:46 +00:00
Braden Obrzut
9c8bb236ec
- Backport r1253 through r1256 and r1259 of GZDoom.
...
* By pressing request, allow Linux users to build ZDoom with an FMOD version that doesn't give them 3D sound positioning. :p
* Fixed severe copy-pasta portal copy bug.
* 3D floors hidden by being moved above the ceiling or below the floor will no longer show in the automap.
* Reject TEXTURES scale of 0. They'd do nothing but provoke a division by zero error.
* Maybe fixed Linux compilation?
SVN r3297 (trunk)
2011-09-27 01:14:31 +00:00
Braden Obrzut
f6ddad95b7
- Set the CMAKE_MODULE_DIR so that we can use find_package instead of include for FluidSynth.
...
- Fixed: FadeTo() accepted parameters out of range.
- Fixed: "Enable autosaves" menu option didn't handle all possible values of disableautosave.
SVN r3280 (trunk)
2011-08-16 21:59:35 +00:00
Braden Obrzut
dc50487432
- Lets try using semaphores on Linux instead of sleeping to implement cl_capfps.
...
SVN r3270 (trunk)
2011-07-11 02:35:33 +00:00
Christoph Oelckers
f84368677a
- updated OpenAL branch.
...
SVN r3269 (openal)
2011-07-08 22:00:23 +00:00
Braden Obrzut
85bd2e02c9
- Fixed Linux build issues.
...
SVN r3265 (trunk)
2011-07-07 20:49:55 +00:00
Christoph Oelckers
5bfcaab25c
- separation of software renderer from the rest of the code complete. All external access to the renderer is routed through the FRenderer interface class now, with two exceptions (2D texture drawing to a canvas and polymost testing code) that are handled by #defines.
...
SVN r3263 (trunk)
2011-07-07 15:37:47 +00:00
Christoph Oelckers
fbff5ca932
- moved r_interpolate.cpp and r_translate.cpp to r_data.
...
- merged r_jpeg.h into jpegtexture.cpp because that's the only place where it's ever used.
SVN r3255 (trunk)
2011-07-06 08:50:15 +00:00
Christoph Oelckers
5c6fd66ed5
- rename src/resources to src/r_data.
...
SVN r3254 (trunk)
2011-07-06 07:35:36 +00:00
Christoph Oelckers
5bf6398d85
- moved render style and border drawing code out of r_draw.cpp.
...
SVN r3251 (trunk)
2011-07-05 20:41:53 +00:00
Christoph Oelckers
17ed7aaabd
- moved the code from r_data.cpp to some better fitting places and deleted this file and r_data.h because the remaining parts of it were just a random collection of unrelated functions.
...
SVN r3248 (trunk)
2011-07-05 10:02:38 +00:00
Christoph Oelckers
2a3d1a4493
- updated CMakeLists.txt for last commit.
...
SVN r3247 (trunk)
2011-07-05 08:20:15 +00:00
Christoph Oelckers
4626492f50
- separated all colormap related code from v_palette.cpp and r_data.cpp into its own file.
...
SVN r3245 (trunk)
2011-07-03 10:47:35 +00:00
Christoph Oelckers
5d65ab6e6c
- cleaned up setPointer interface.
...
- ZDoom part of setPointer/setActivator, submitted by FDARI.
SVN r3230 (trunk)
2011-06-13 10:22:47 +00:00
Randy Heit
e6de6fed3c
- Revert r3214, which added some completely useless warnings for GCC.
...
I'm sure there are good reasons even GCC doesn't enable them by default when you use -Wall.
SVN r3225 (trunk)
2011-06-12 19:17:21 +00:00
Christoph Oelckers
81ae38c072
- added submission for disabling some new and rather pointless GCC warnings.
...
SVN r3214 (trunk)
2011-05-26 23:19:20 +00:00
Randy Heit
d3b44a4172
- Fix errors/warnings from MinGW 4.5.0 (tdm-1).
...
- Disable the missing field initializers warnings that -Wextra produces from GCC.
SVN r3173 (trunk)
2011-03-29 05:20:33 +00:00
Randy Heit
9ab6ac39a0
- Undo unintentional commit of src/CMakeLists.txt.
...
SVN r3163 (trunk)
2011-03-10 22:52:34 +00:00
Christoph Oelckers
1993e969b7
- GCC warning fixes (GCC stupidity for the most part.)
...
SVN r3154 (trunk)
2011-02-19 08:59:43 +00:00
Randy Heit
060d740275
- Fixed: Fake floor's validcounts were not initialized.
...
- Fixed: When loading non-UDMF maps, things did not have their conversation field zero'ed.
- Added an assert for the FAKE3D_REFRESHCLIP case at the end of R_RenderMaskedSegRange(), because Valgrind indicates this is being run
without ds->bkup being set to something valid. I do not immediately know how this should be fixed.
SVN r3130 (trunk)
2011-02-02 02:07:36 +00:00
Christoph Oelckers
fae8ed444c
- merged 3dfloors2 branch into trunk.
...
SVN r3124 (trunk)
2011-01-29 11:09:38 +00:00
Randy Heit
2add3fb381
- Merge voxels back into trunk. Even if it needs further tweaking, it should at least be stable now.
...
SVN r3086 (trunk)
2011-01-02 18:02:27 +00:00
Christoph Oelckers
d851040ad6
- fixed GCC compilation.
...
SVN r3028 (trunk)
2010-12-12 07:59:38 +00:00
Braden Obrzut
72f589c8c3
- Fixed what appears to be a copy/paste error in the CMakeLists.txt.
...
SVN r3020 (trunk)
2010-12-02 21:45:38 +00:00
Christoph Oelckers
f3d05e2699
- applied Chriss OpenAL patch to make it uzable without GStreamer.
...
SVN r2984 (openal)
2010-11-07 07:17:57 +00:00
Braden Obrzut
0d10718e67
- Added SDL joystick support.
...
SVN r2939 (trunk)
2010-10-13 16:29:37 +00:00
Christoph Oelckers
0595724d68
- updated CMakeLists.txt for intermission changes.
...
SVN r2921 (trunk)
2010-10-07 21:34:21 +00:00
Christoph Oelckers
6d78ff3469
- Backported GZDoom revisions 1018-1019: Fixed spelling of "pseudo" because it bugged me too much. ;)
...
SVN r2880 (trunk)
2010-10-02 13:49:33 +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
5a3b3631c3
- Added XMIDI support (including subsongs).
...
- Moved unaligned accessors into m_swap.h.
SVN r2859 (trunk)
2010-09-28 03:58:41 +00:00