Commit graph

174 commits

Author SHA1 Message Date
nashmuhandes
4dfc4fb468 Merge branch 'master' of https://github.com/coelckers/gzdoom
# Conflicts:
#	src/r_things.cpp
#	src/sound/fmod_wrap.h
#	src/sound/fmodsound.cpp
#	src/sound/fmodsound.h
2016-08-29 17:28:07 +08:00
Magnus Norddahl
945d5b154a Remove gl_vid_multisample 2016-08-28 18:10:39 +02:00
Christoph Oelckers
abafcd5486 Merge branch 'master' of https://github.com/rheit/zdoom
# Conflicts:
#	wadsrc/static/language.enu
2016-08-28 10:00:19 +02:00
Christoph Oelckers
e04055dbb2 - added multiple message levels for 'developer' CVAR so that the important stuff won't get drowned in pointless notification spam that's of no use to anyone.
- made 'developer' CVAR persist across launches and added some menu entries for it.
- added checks for 'developer' to ACS's CheckInventory function.
2016-08-28 09:55:04 +02:00
nashmuhandes
f6cb797504 Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-08-26 00:50:52 +08:00
alexey.lysiuk
f79c442df5 Fixed compilation of SDL backend 2016-08-24 16:44:40 +03:00
Magnus Norddahl
276fb7dbb2 Add vid_maxfps support for Windows and Linux 2016-08-22 22:00:44 +02:00
nashmuhandes
87516e6f58 Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-08-20 22:50:57 +08:00
nashmuhandes
cf34e6f3e1 Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-08-18 03:40:30 +08:00
Magnus Norddahl
0c2db5447c Save gl_debug in ini file and add support in Linux 2016-08-17 20:57:00 +02:00
Magnus Norddahl
4e38f31a86 Change GetClientWidth/GetClientHeight on macOS to grab size from view.
Fix that GetClientWidth/Height returns 0 when queried before initial show.
Allow window to be resizable on macOS.
2016-08-14 09:05:51 +02:00
Magnus Norddahl
c817979eae Remove GetTrueHeight from GL renderer and concentrate all viewport calculations in SetOutputViewport 2016-08-14 09:05:48 +02:00
Torbjörn Rathsman
d44d83bb70 Fixed #3. The default value of vid_renderer is already set to 1, so we shall use that value when initializing renderer 2016-08-02 17:04:20 +02:00
nashmuhandes
f045a44706 Merge branch 'master' of https://github.com/coelckers/gzdoom
# Conflicts:
#	src/r_things.cpp
2016-07-31 22:05:37 +08:00
alexey.lysiuk
d3457f4508 Implemented hardware gamma support for macOS
Hardware gamma is limited to main display only, use shader-based correction for other displays
2016-07-31 12:19:08 +03:00
Christoph Oelckers
a69182f9ef Merge branch 'master' of https://github.com/rheit/zdoom 2016-07-31 09:19:36 +02:00
alexey.lysiuk
bd3fd22ac9 Do not use unicode characters in macOS console window
The same characters as in stdout are now used to draw bars in console window on macOS
All messages are treated as in ISO Latin 1 encoding and bars looked like garbage output
2016-07-30 16:21:48 +03:00
alexey.lysiuk
c0b86278e3 Removed old cruft from macOS OpenGL backend
The only thing left unimplemented is gl_smooth_rendered CVAR
2016-07-30 12:57:30 +03:00
nashmuhandes
c2fb7706d6 Merge branch 'master' of https://github.com/coelckers/gzdoom
# Conflicts:
#	src/r_things.cpp
2016-07-28 17:50:47 +08:00
Magnus Norddahl
e82c38e4f9 Update copyright and typo fix 2016-07-27 11:15:20 +02:00
Magnus Norddahl
aeb7df09de Added hardware gamma option and improved window handling on Windows 2016-07-27 11:15:19 +02:00
nashmuhandes
c7ba0e0aac Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-07-22 16:19:27 +08:00
Christoph Oelckers
881731d76b Merge branch 'master' of https://github.com/rheit/zdoom 2016-07-21 08:28:56 +02:00
alexey.lysiuk
39042dc4bf macOS application controller is now using proper delegate protocol
Fixes compilation error with Xcode 8:
cannot initialize a parameter of type 'id<NSApplicationDelegate> _Nullable' with an lvalue of type 'ApplicationController *'
2016-07-17 08:02:55 +02:00
nashmuhandes
c55351bbbf Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-06-17 02:17:53 +08:00
Christoph Oelckers
18ebe92cfc Merge branch 'master' of https://github.com/rheit/zdoom
# Conflicts:
#	src/g_level.cpp
2016-06-01 11:45:57 +02:00
alexey.lysiuk
89016020a8 Used ISO Latin 1 encoding for title text in startup window on OS X
Windows version uses ANSI_CHARSET to handle the corresponding text
This solves the problem like in https://github.com/alexey-lysiuk/gzdoom/issues/63:
*** Assertion failure in -[NSTextFieldCell _objectValue:forString:errorDescription:], /Library/Caches/com.apple.xbs/Sources/AppKit/AppKit-1404.47/AppKit.subproj/NSCell.m:1684
Invalid parameter not satisfying: aString != nil
2016-05-29 10:58:12 +03:00
nashmuhandes
6baecf5009 Merge branch 'master' of https://github.com/coelckers/gzdoom
# Conflicts:
#	src/r_bsp.cpp
2016-05-26 18:22:55 +08:00
Christoph Oelckers
a0dc4ae738 Merge branch 'master' of https://github.com/rheit/zdoom 2016-05-24 13:53:52 +02:00
alexey.lysiuk
aa6753383d Fixed fullscreen mode on non-default monitor in OS X backend
Fullscreen window was incorrectly placed on the main screen instead of the current one
Honestly I have no idea what was the reason behind that [NSWindow setFrameOrigin:] call
Apparently it's redundant and moreover it's incorrect for multi-monitor configuration
2016-05-22 13:22:07 +03:00
nashmuhandes
89d25e23f1 Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-05-11 13:29:49 +08:00
Christoph Oelckers
0cc57c6141 - fixed: BoundTextureDraw2D must reset the texture mode. 2016-05-10 20:50:01 +02:00
nashmuhandes
9f9e4310a1 Merge branch 'master' of https://github.com/coelckers/gzdoom
# Conflicts:
#	src/r_bsp.cpp
#	src/r_swrenderer.cpp
#	src/r_swrenderer.h
#	src/sound/fmodsound.cpp
#	src/sound/fmodsound.h
2016-05-02 21:25:57 +08:00
alexey.lysiuk
333560086d Calculate color values for gamma correction directly in shader
Gamma table texture is no longer needed
2016-05-02 11:24:42 +03:00
alexey.lysiuk
44b019413c Implemented gamma correction in OS X native backend using shader effect 2016-05-02 10:04:09 +03:00
alexey.lysiuk
138c6ea25e Fixed black screen issue in OS X native backend
There was inconsistency with global render state
2016-05-01 11:45:57 +03:00
nashmuhandes
4a2a0cf2e3 Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-05-01 10:43:54 +08:00
alexey.lysiuk
8fa5fb6a95 Disabled gamma shader in OS X native backend 2016-04-30 13:35:03 +03:00
alexey.lysiuk
3816b46938 Fixed compilation of OS X with native backend
TODO: check Linux build
2016-04-30 11:53:31 +03:00
nashmuhandes
8e02787dcd Relicense all Doom Source Code License files to GPL. 2016-04-27 22:04:59 +08:00
nashmuhandes
eec89b7575 Removal of the software renderer, part 1. 2016-04-27 19:00:22 +08:00
Christoph Oelckers
6e1b21d513 - added back sprite splitting for low end, plus some dynamic light code. 2016-04-26 21:31:24 +02:00
Christoph Oelckers
7ce670951b Merge branch 'master' of https://github.com/rheit/zdoom
# Conflicts:
#	src/CMakeLists.txt
2016-04-11 10:49:11 +02:00
Christoph Oelckers
db86385cf6 - removed STACK_ARGS.
The only reason this even existed was that ZDoom's original VC projects used __fastcall. The CMake generated project do not, they stick to __cdecl.
Since no performance gain can be seen by using __fastcall the best course of action is to just remove all traces of it from the source and forget that it ever existed.
2016-04-11 10:46:30 +02:00
alexey.lysiuk
93c334059a Made title text always visible in OS X startup window
Added temporary solution for the same foreground and background colors of the title in OS X startup window
It's used in graphical startup screen, with Hexen style in particular (for example WolfenDoom - Blade of Agony)
Native OS X backend doesn't implement this yet
2016-04-10 14:06:18 +02:00
Christoph Oelckers
12129b0f07 - added a system-include independent wrapper for Windows's OutputDebugString, so that this can be used more easily in files that cannot include windows.h. 2016-04-10 13:03:44 +02:00
Christoph Oelckers
f7553fcd51 Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt
# Conflicts:
#	src/r_defs.h
2016-04-02 22:17:33 +02:00
Christoph Oelckers
046ee3e803 - removed a few leftover FRACUNITs. 2016-04-02 20:07:18 +02:00
Christoph Oelckers
8680391e0b - floatified the global view variables.
The software renderer still uses internal copies of the fixed point version.
2016-04-01 12:22:16 +02:00
Christoph Oelckers
ae14268989 Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt
# Conflicts:
#	src/r_utility.cpp
2016-03-29 10:09:03 +02:00