Commit Graph

9124 Commits

Author SHA1 Message Date
Christoph Oelckers 3db7d9ad84 - fixed: AActor::alternative was not declared as a pointer. 2016-09-18 12:22:56 +02:00
raa-eruanna e47e6d1d6e Merge http://github.com/coelckers/gzdoom 2016-09-17 20:06:22 -04:00
Christoph Oelckers 6b4aee28bc Merge branch 'master' of https://github.com/rheit/zdoom 2016-09-17 20:22:43 +02:00
Major Cooke 80c1baa596 Fixed: Pitch was rotating around the wrong axis. 2016-09-17 12:10:22 -05:00
raa-eruanna 962291d18e Merge http://github.com/coelckers/gzdoom 2016-09-17 11:32:57 -04:00
Christoph Oelckers bec17bd222 - FLATSPRITE fixes. 2016-09-17 08:26:30 +02:00
Magnus Norddahl f2a3b8978d Added declaration in the shader that was missing 2016-09-17 00:30:03 +02:00
Gaerzi d99d43aeba Fixes to fuzz shaders 2016-09-17 00:30:03 +02:00
Major Cooke d01b0e061e Moved flatsprite code into CalculateVertices. 2016-09-16 12:07:28 -05:00
Major Cooke 66d20726c2 Reintroduced flat sprites once more.
- Take note, current flat sprites will change. With no pitch involved, sprites are now flat across the ground.
2016-09-16 11:47:20 -05:00
raa-eruanna 922360ae35 Merge http://github.com/rheit/zdoom 2016-09-16 11:49:45 -04:00
raa-eruanna 7da94e5aca Merge http://github.com/coelckers/gzdoom 2016-09-16 11:49:42 -04:00
Christoph Oelckers 7c2886e8ea - fixed the last commit:
The altered vertices must always be copied to the actual buffer and it's not necessary to copy everything, copying the 4 changed ones is sufficient.
2016-09-16 08:10:19 +02:00
raa-eruanna 476b727d5d "actorlist" and "actornum" no longer return already-owned inventory objects 2016-09-16 00:47:56 -04:00
Magnus Norddahl 3c1868f7e6 Fix wrong flash rectangle size after window resize 2016-09-16 02:53:19 +02:00
raa-eruanna a83477e549 Merge http://github.com/rheit/zdoom 2016-09-15 19:18:56 -04:00
raa-eruanna ac70f77e44 Added the following ccmds:
actorlist, actornum, monsternum, itemsnum, countitemsnum
Modified the following ccmds:
 monster, items, countitems

All commands with "num" at the end simply print a count of their respective filters, all other listed commands now print a list and a count.
2016-09-15 15:09:36 -04:00
Magnus Norddahl 0d27996a64 Replace CheckRatio with AspectTallerThanWide in DrawHUD 2016-09-15 07:52:53 +02:00
Magnus Norddahl 48f491cfd1 Fix video mode selection bug 2016-09-15 07:52:53 +02:00
raa-eruanna 976cf07f9c Merge http://github.com/coelckers/gzdoom 2016-09-14 20:26:37 -04:00
Magnus Norddahl 95fef44200 Merge remote-tracking branch 'gzdoom_upstream/master' into lightmath 2016-09-15 00:31:34 +02:00
Christoph Oelckers d128e28044 Merge branch 'master' of https://github.com/rheit/zdoom 2016-09-14 21:05:45 +02:00
Christoph Oelckers f3a4036dc5 - lgpl.txt 2016-09-14 21:05:25 +02:00
Leonard2 cb17e109f1 Added "division by zero" to the VM-aborting errors 2016-09-14 20:47:00 +02:00
Leonard2 65af26f962 The VM now properly aborts on critical errors 2016-09-14 20:46:18 +02:00
raa-eruanna 4ccba9c49e Merge http://github.com/rheit/zdoom 2016-09-14 14:08:41 -04:00
raa-eruanna 343cde4595 Merge http://github.com/coelckers/gzdoom 2016-09-14 14:08:19 -04:00
Christoph Oelckers 8b6e09ca09 - changed the license of the OpenGL renderer to LGPL v3.
This was done to clean up the license and to ensure that any commercial fork of the engine has to obey the far stricter requirements concerning source distribution. The old license was compatible with GPLv2 whereas combining GPLv2 and LGPLv3 force a license upgrade to GPLv3. The license of code that originates from ZDoomGL has not been changed.
2016-09-14 20:01:13 +02:00
raa-eruanna 842558384a Forgot to set vid_renderer defaults for Linux and Mac. 2016-09-14 07:33:31 -04:00
raa-eruanna b0029fcd1e Set version to 0.0 (prerelease), set render defaults for true-color software renderer since that is the focus of this project 2016-09-14 06:38:08 -04:00
raa-eruanna 3ebf8c7e74 More code fixes - now it compiles. 2016-09-14 06:28:39 -04:00
raa-eruanna 004c7de89b Part 1 of code merge 2016-09-14 04:03:39 -04:00
raa-eruanna b17b7446cb Merge http://github.com/coelckers/gzdoom 2016-09-14 03:15:56 -04:00
raa-eruanna 81545d9b4e Merge http://github.com/rheit/zdoom
# Conflicts:
#	src/v_video.cpp
2016-09-14 02:24:59 -04:00
raa-eruanna b85e3b56e3 Establish QZDoom 2016-09-14 02:21:35 -04:00
Major Cooke 3b2359959e Quakes must use their own independent falloffs.This caused discrepencies and sudden drop-outs in stacked quakes otherwise. 2016-09-13 23:06:57 -05:00
Braden Obrzut fd53aefbf2 Added warning if building on Visual Studio 2015 without v140_xp. 2016-09-13 20:55:31 -04:00
Braden Obrzut f1bca9d20e The old DirectX setup is required to utilize v140_xp.
Revert "- removed DirectX setup from CMakeLists for Visual Studio"

This reverts commit 954ac8ce5e.
2016-09-13 20:12:59 -04:00
Magnus Norddahl c54b4e74f5 Merge remote-tracking branch 'gzdoom_upstream/master' into lightmath 2016-09-13 23:44:12 +02:00
Magnus Norddahl 017d1cee29 Change canvas rendering to use the aspect ratio of the canvas and generalize 5:4 rendering as AspectTallerThanWide 2016-09-13 23:42:05 +02:00
Magnus Norddahl 172f58c165 Fix 5:4 aspect ratio gun and status bar 2016-09-13 23:42:05 +02:00
Christoph Oelckers 0c0e716ccd Merge remote-tracking branch 'remotes/zdoom/master' 2016-09-13 23:37:30 +02:00
Christoph Oelckers a98f364cc3 - added another missing nullptr check. 2016-09-13 23:37:19 +02:00
alexey.lysiuk dcabcaa5b6 Fixed compilation on non-Windows platforms 2016-09-13 22:10:07 +03:00
Christoph Oelckers ba68cfd611 - do not even allow creation of names in C_RemoveTabCommands if there are no tab commands, so that FindName cannot be called after the NameManager has been destroyed. 2016-09-13 21:01:50 +02:00
Christoph Oelckers e10abcad06 - fixed: The TabCommands array needs to be cleared before the NameManager is destroyed.
TabCommands use an FName to store the command's name so once the NameManager is destroyed its data will become invalid.
This is a problem because C_RemoveTabCommand is being called from FBaseCVar's destructor and most CVARs are global variables.
2016-09-13 10:43:53 +02:00
Christoph Oelckers c593dda8f3 - added missing nullptr check. 2016-09-12 23:03:27 +02:00
Magnus Norddahl 0fc5ee1ffd Merge remote-tracking branch 'gzdoom_upstream/master' into lightmath 2016-09-12 22:30:46 +02:00
Christoph Oelckers 3778799f92 Merge branch 'master' of https://github.com/rheit/zdoom 2016-09-12 21:33:49 +02:00
Christoph Oelckers 823f75e592 - fixed: UDMF user value lists need to be sorted for binary search to work but weren't. 2016-09-12 21:32:17 +02:00