Merge med changes into rewrite branch#4227
Merged
thojkooi merged 69 commits intomedical-rewritefrom Aug 20, 2016
Merged
Conversation
Improve SSN hash
shotbullet, shotShell don't seem to explode when touching water, so don't create frags Fix #4134
Fix #3842 PFEH FUNC(handleCamera) will set camera position using GVAR(camPos)
Fix spectator map click not changing cam pos
* Fix refuel not respecting time acceleration and pause * Make lastTickMissionTime local
Use GVAR Macro Where Applicable
deprecate sort function
Bump CBA's version in Issue Template
reenable pickup action, because related bug has been fixed
log file and line numbers for warnings/errors/debug msgs
Minor cleanup of fired EH listeners
- Fix #4200 (add delay for units created via zeus) - Use ace_settingsInitialized to add events
Also Fix CBA_fnc_addPlayerEventHandler
dragging - Don't run animChanged event on all units
* Only use addActionEventHandler when needed -Only install addActionEventHandler when the interaction menu is actually open -Less SQF running each frame, -it should help with issue #4066 * Cleanup debug
* Fix default values Fix default values, so we don't get two custom attributes per unit, even when the unit is not handcuffed/surrendered * Add parentheses to avoid conversion
Heal hitpoint after bandage sets bodyPartStatus
The current mass makes it take a LOT of inventory space (~half of an assault pack) which makes it impractical to carry around as a tool. Signed-off-by: freghar <freghcz@gmail.com>
Tagging Framework and Improvements
Improve stringRemoveWhitespace function header
Add dogtags $PBOPREFIX$ and Improve function headers
Convert common to CBA hashes
remove some broken functions
deprecate ACE hash functions in favor of CBA versions
Fix tagging cstring
Fix wrong config path in FUNC(calculateMass)
remove deprecated functions
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge #4202 and #4216 into rewrite branch (along with master)
Fixed a few efuncs in f12feae