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

11652 Commits

Author SHA1 Message Date
Magnus Norddahl c95a52166d Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom 2017-02-15 13:26:52 +01:00
Magnus Norddahl 01cbb14f14 Change wall project to use the fixed version from GZDoom as it was most likely more tested 2017-02-15 13:26:43 +01:00
Rachael Alexanderson e01895bf80 Merge https://github.com/coelckers/gzdoom 2017-02-15 07:06:52 -05:00
Magnus Norddahl fc97ef0913 Fix palette fog boundary rendering error 2017-02-15 13:01:00 +01:00
Christoph Oelckers d8b8767ee9 - disabled render events pending further discussion and evaluation. 2017-02-15 12:27:50 +01:00
Christoph Oelckers c8db1f151e - fixed: All FNames inside actor classes need to be FNameNoInit or their constructor will overwrite them after copying the defaults. 2017-02-15 12:16:24 +01:00
Christoph Oelckers d8ebbcfc08 - fixed: When loading a savegame the player class in the userinfo needs to be updated. 
- fixed: Class pointers should not be added to the list of garbage collected pointers.
- fixed several warnings in the event code.
 2017-02-15 11:55:08 +01:00
Rachael Alexanderson 5dad292c56 Merge remote-tracking branch 'remotes/gzdoom/master' 2017-02-15 05:43:15 -05:00
Rachael Alexanderson 2b8db72cef Merge commit '2234d36c7ac531fd802803216f747f82b58be8c2' 
# Conflicts:
#	src/r_main.cpp
#	src/r_plane.cpp
#	src/r_things.cpp
 2017-02-15 05:42:57 -05:00
Rachael Alexanderson 959ac8c65b Merge commit '9caf5c641b374848c065059b5152339806fa7734' 2017-02-15 05:28:38 -05:00
Christoph Oelckers 6fef653aa1 - exported GetUDMF methods to scripting. 2017-02-15 01:03:47 +01:00
Christoph Oelckers 8d7a64bd17 - added a virtual 'used' method that gets called when the player presses use on an actor. This method will only be called if the actor does not have the USESPECIAL flag - that one will be handled as before. 2017-02-15 00:43:30 +01:00
Christoph Oelckers c01289e999 - added ZScript property handling for names, sounds and colors. 2017-02-14 23:28:49 +01:00
Christoph Oelckers 2f1b5c375e - fixed: Line_SetPortal crashed with one-way portals. 2017-02-14 23:13:29 +01:00
Christoph Oelckers c5204f34ca - fixed: The code to play the mage lightning's attack sound was converted wrong, because it used the same structure as looping sounds normally so, but doesn't actually loop. 2017-02-14 22:51:53 +01:00
Christoph Oelckers a6156297ce - don't adjust sprite offsets of IWAD sprites in sequences which have been replaced partially. This can be overridden by specifying 'iwadforced' in the SPROFS lump. 2017-02-14 22:04:52 +01:00
Christoph Oelckers 3170591e32 - restated some weird number manipulation in SBARINFO for powerup time. This appears to be needed to distinguish between non-expiring items and non-present items. 2017-02-14 22:04:52 +01:00
alexey.lysiuk a9f650c3f2 Fixed compilation warnings reported by GCC/Clang 
src/events.cpp:167:66: warning: format specifies type 'char *' but the argument has type 'char' [-Wformat]
src/events.cpp:167:84: warning: data argument not used by format string [-Wformat-extra-args]
src/events.cpp:1036:20: warning: comparison of integers of different signs: 'int' and 'unsigned long' [-Wsign-compare]
 2017-02-14 22:13:31 +02:00
alexey.lysiuk dd0f55e8d8 Fixed compilation of Cocoa backend 2017-02-14 22:02:47 +02:00
Christoph Oelckers b7b0e64471 - separated splash detection from water level setting. 
This could cause problems if 3D floors with different properties for slashing and waterlevel were occupied at the same time. By keeping the slash code separate both parts can be handled without having to look out for the other.
 2017-02-14 20:11:30 +01:00
Christoph Oelckers 9e769f29c3 - the native part wasn't saved. 2017-02-14 19:34:01 +01:00
Christoph Oelckers 6e2b0bc961 - renamed the internal InpuEvent to deconflict from the version in the event system. 2017-02-14 19:32:44 +01:00
Christoph Oelckers 2234d36c7a Merge branch 'thereisnospoon' of https://github.com/jewalky/gzdoom 
# Conflicts:
#	src/dobject.h
 2017-02-14 19:10:02 +01:00
Christoph Oelckers 9caf5c641b - don't let menu number widgets not lock up the menu if their associated CVAR does not exist. 2017-02-14 19:06:45 +01:00
Christoph Oelckers 2e5ada5f25 - fixed texture clamping calculations for negative scales. 2017-02-14 18:20:21 +01:00
Christoph Oelckers 2e11b4f346 - fixed: The S_Sound script export did not call the actual function. 2017-02-14 17:03:31 +01:00
Christoph Oelckers 7b1645d239 - fixed the item check in OptionMenuItemCommand. 
This was calling the wrong GetItem function.
 2017-02-14 16:50:10 +01:00
Magnus Norddahl 7f81e0bd26 Merge remote-tracking branch 'gzdoom/master' into qzdoom 2017-02-14 14:55:02 +01:00
Christoph Oelckers 443ac50887 - fixed: DMenu::CallTicker called the Drawer methods of the menu instead of the Ticker methods. 2017-02-14 13:19:37 +01:00
alexey.lysiuk 08bf08f297 Restored effect of negative horizontal texture scale in software renderer 2017-02-14 12:33:27 +02:00
Magnus Norddahl eac98ac226 Calculate sprite dynamic light contribution and pass it along to the sprite drawer 2017-02-14 06:37:06 +01:00
Magnus Norddahl 5ef8ecce2a Fix wall scroller direction 2017-02-14 02:52:41 +01:00
Christoph Oelckers 73ed351144 - don't error out on unknown CVars for optional parameters in menu items. 2017-02-13 23:24:31 +01:00
Rachael Alexanderson 2a71ec89de Merge https://github.com/coelckers/gzdoom 2017-02-13 17:02:56 -05:00
Christoph Oelckers 32da1de385 - fixed: negative texture scales should not affect the direction a wall scrolls in. 2017-02-13 22:37:16 +01:00
Christoph Oelckers cb758f6dab - added a 'nolightfade' MAPINFO option which disables light diminishing in OpenGL. Note that this only works for light modes 0-3. Modes 4 and 8 use special light math that would not work if such a setting was forced. 2017-02-13 22:17:15 +01:00
Christoph Oelckers 1a63450fe2 - fixed a few issues with actor bouncing logic. 2017-02-13 22:00:27 +01:00
Christoph Oelckers 5dd00e44ef - fixed bad parameters for MouseEvent call in menus. 2017-02-13 20:06:07 +01:00
Christoph Oelckers ad178e16c5 - working again. 2017-02-13 20:03:29 +01:00
Christoph Oelckers 7b2ec1f737 - removed obsolete include for zscript. 2017-02-13 20:01:56 +01:00
Christoph Oelckers 6525e04118 - added restrictions to CVAR and CCMD access functions for the menus. CVAR changes are only allowed when the menu is open or for mod-CVARs. The CCMD execution function is now private to the control requiring it and heavily guarded against improper access from the outside so that abuse is mostly impossible. 
This also means that the remaining scriptification of the menu is on hold. The player menu would require even more access to critical game data, which is a no-go, and the other remaining menus offer little benefit from getting scriptified.
 2017-02-13 19:18:45 +01:00
Christoph Oelckers c403fc5635 - renamed a file. 2017-02-13 18:30:03 +01:00
Christoph Oelckers 7877bcbdcb - exported more parts of the joystick menus and also exported all strings for them to the string table. 
- exported the skeleton definition for list menus.
 2017-02-13 17:45:03 +01:00
Magnus Norddahl 9159e3b1f0 Move software canvas drawing to its own file in the software renderer 2017-02-13 17:32:52 +01:00
Magnus Norddahl 10b36934c2 Fix vid_hw2d 0 translation bug 2017-02-13 16:13:24 +01:00
Magnus Norddahl 93f43e8751 Menu code accessed the screen buffer without a lock 2017-02-13 15:42:35 +01:00
Magnus Norddahl 69787fac72 Fix translation issue 2017-02-13 15:08:11 +01:00
raa-eruanna a2edca6032 - fix at least one of the GCC errors 2017-02-13 07:01:44 -05:00
Rachael Alexanderson 8c176575c8 Merge https://github.com/coelckers/gzdoom 2017-02-12 21:39:20 -05:00
Christoph Oelckers 89ef30166d - fixed assembly output for SO instruction. 2017-02-13 00:25:39 +01:00