-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
更新 #2
Open
zxcvbnmascq
wants to merge
9,263
commits into
MergHQ:release
Choose a base branch
from
zxcvbnmascq:release
base: release
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
更新 #2
Conversation
This file contains 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
…on the projector light component Copied from Perforce Change: 2020298
Copied from Perforce Change: 2020335
…al-settings will also affect the headlines in the material's properties Copied from Perforce Change: 2020526
… each level Copied from Perforce Change: 2021081
… choppy, causes crashes, triggers assert and doesn't render the whole sphere if a high subdiv amount is entered Copied from Perforce Change: 2021488
…dered when drawn on top of the viewport and MFC tools. Also fixed an issue with notifications not spawning in the right place when the window was not maximized Copied from Perforce Change: 2021594
!F (Console) (CE-21329) Allow commands from console batch files run through the exec command !F (Console) Warn about config entries that cannot be resolved and commands in config files !R (Asserts) (CE-21329) Change sys_asserts and sys_log_asserts back to being CVars !R (Asserts) 'Ignore all' setting for asserts removed in favor of 'Disable Asserts' to avoid ambiguities !F (Asserts) Added CVar 'sys_assert_dialogues' !XB (System) sys_crashtest_thread would loop its command Copied from Perforce Change: 2021800
!F (Console) (CE-21329) Allow commands from console batch files run through the exec command !F (Console) Warn about config entries that cannot be resolved and commands in config files !R (Asserts) (CE-21329) Change sys_asserts and sys_log_asserts back to being CVars !R (Asserts) 'Ignore all' setting for asserts removed in favor of 'Disable Asserts' to avoid ambiguities !F (Asserts) Added CVar 'sys_assert_dialogues' !XB (System) sys_crashtest_thread would loop its command Copied from Perforce Change: 2022012
!B (3DEngine) (CE-21777) Fixed permanent render object invalidation in RenderSectorUpdate_Finish Copied from Perforce Change: 2022024
Copied from Perforce Change: 2022139
…shes the Editor, CryDesigner.dll!Designer::UVMapping::UVMappingEditor::SetTool Copied from Perforce Change: 2022223
…PS4Pro configs for pfx1 and pfx2. Copied from Perforce Change: 2022478
… = 0 Copied from Perforce Change: 2022541
… virtual memory !T (Core) (CE-21633) Changed ThreadSafePushContainer iterator to forward only !T (Core) (CE-21633) Changed ThreadSafePushContainer's maximum capacity to a soft limit !XB (Renderer) (CE-21633) Permanent render object capacity of CRenderView was too low Copied from Perforce Change: 2022773
!XB (DEV-8757) AI: Behavior Tree using Shoot Node cannot be saved Copied from Perforce Change: 2022796
!B (AI) (CE-20840) CRASH: Changing the faction of an AI while Physics/AI is enabled, crashes the Editor (CryAISystem.dll!BehaviorTree::Shoot::OnTerminate) Copied from Perforce Change: 2022797
!XB (AI) (CE-21549) ASSERT: Duplicating an Entity with AI-components and then deleting them triggers an assertion failure (CollisionAvoidanceAgent.cpp L 32) Copied from Perforce Change: 2022798
Copied from Perforce Change: 2022820
…ment or state change. Added CBoundsMerger static bounds list manager. Copied from Perforce Change: 2022903
…for special characters in the engine path when generating project solutions Copied from Perforce Change: 2023246
!XB (AI) (DEV-8834) AI: Fix typo in Behavior Tree Editor Copied from Perforce Change: 2023510
Copied from Perforce Change: 2023514
Copied from Perforce Change: 2023591
Copied from Perforce Change: 2023863
!T (Audio) (DEV-8839) ACE: Hide rename option from context menu when a default control is selected !T (Audio) (DEV-8840) ACE: Add option to rename a control to the name of a selected connection Copied from Perforce Change: 2023967
Copied from Perforce Change: 2024111
!B (CMake) error if XboxOne XDK environment variable doesn't exist !XT (CMake) adjusted platform name to be not all uppercase !XT (CMake) print out compiler location during the XB1 configuration step !XT (CMake) minor cleanup of the XboxOne toolchain file !XT (CMake) minor cleanup in the XboxOne Ninja toolchain file !T (Core) (CMake) Add project command to root CMakeLists.txt Copied from Perforce Change: 2024169
Copying from 2024111 Copied from Perforce Change: 2024225
…from //ce/task_HNTCRASHA-2824. !T (Animation) Removed shared ownership semantics from the IAttachment interface. Lifetime of IAttachment objects is now managed fully internally within CryAnimation. !XT (Animation) Removed CAttachmentManager::ExecProcFunction() - dead code. !XR (Animation) Removed some legacy debug bookkeeping code from CAttachmentManager: AddEntityAttachment(), RemoveEntityAttachment(), IsFastUpdateType(). !XB (Animation) Introduced an owning reference to character instance of the external attachment in CSwapAttachmentObject. This covers the last edge case to ensure no attachment ever outlives its character instance (and, by extension, its attachment manager). !XT (Animation) Removed clear of the SAttachmentBase::m_pAttachmentManager back reference pointer and all of its associated nullchecks. SAttachmentBase is now expected to never outlive its character instance (and, by extension, its attachment manager). !XB (Animation) CAttachmentManager::UpdateBindings() and ::RebuildProcessingBuffer() are now executed through the animation update context queue (i.e. only for instances that have been StartAnimationProcessed) in SyncAllAnimations(). This restores the former behavior of UpdateBindings and also mitigates a potential delete of dependent character instance while the character vector is being iterated over. Copied from Perforce Change: 2082261
…ze object in the level explorer through shortcuts. Copied from Perforce Change: 2085662
… Explorer according Visible, Frozen and Color state. Copied from Perforce Change: 2085664
…CommandHelper in order to solve integration issues in main. Copied from Perforce Change: 2086114
…stabilisation !XDT (Audio|DSP) removing CrySpatial runtime files from Build because it is built from source !XT (Audio|Oculus) removing Oculus Spatializer from cmake Copied from Perforce Change: 2087342
Copied from Perforce Change: 2088310
Copied from Perforce Change: 2088977
Copied from Perforce Change: 2088981
…imation Driven Motion" Copied from Perforce Change: 2089148
…nnot be read due to internal spelling errors Copied from Perforce Change: 2091183
…andard Copied from Perforce Change: 2098343
…iversal query and closing the UQS Editor !XI Cherry pick CL 2049846 from ce/main Copied from Perforce Change: 2103009
!B (DEV-10673) (System) Fix CCryPak::IsFolder bit flag check !B (DEV-10673) (CrySystem) Fix CCryPak::IsFolder to not give a warning when folder doesn't exist. Copied from Perforce Change: 2105259
This reverts commit e5de34e.
This reverts commit 8f7f5c6.
…angelist 2088981 Copied from Perforce Change: 2119786
…FG node. Copied from Perforce Change: 2119889
!B (CMake) (DEV-11021) Fix configuration when SubstanceEngines SDK is not present and remove OPTION in cmake Copied from Perforce Change: 2122018
…y slot !IB (Physics) (CE-22332) (CE-22333) (CE-22334) several local grids fixes (automatic phys areas placement in grids, phys tool tracing from inside grids, ignore ocean in grids, FG node impulse on objects in grids) !IF (Components/Physics) (DEV-9104) added statobj support to vehicle wheel components !IO (Physics) (DEV-9057) improved phys proxy auto-generation !IO (Sandbox) allow shape objects to draw general entity preview helpers !IB (Physics) (DEV-9328) improved vehicle wheel collisions in tilted state !IB (Physics/3dengine) some fixes to boolean cutting !IO (Components) changed thruster component to use physics poststep to improve accuracy !IB (Physics) (CE-22318) fixed severely broken points and normals on pierceable ray hits !IO (Physics) improved handling of flipped tetrahedra in softbody sim; don't check collisions for non-surface vertices !IB (Physics) local grid fixes: multithreading issues, acceleration impulse application, water volume sync !IB (Physics) fixed issue with queueing pe_params_sensors !IB (Sandbox/Physics) fixed occasional snapping on phystool's initial attachment !IB (3dengine) (HNT-34779) (CE-21031) et al.; fixed asynchronous softbody/cloth rendermesh sync !IB (Components) fixed Rigidbody Actor jump function !IB (Physics/Components) fixed some issues with rigidbody actors on moving objects Copied from Perforce Change: 2123722
…icsProxy' shows 'LOD6' instead !XI merging CL2079331 //ce/main to main_stabilisation (//ce/main_stabilisation) Copied from Perforce Change: 2125404
Copied from Perforce Change: 2126424
Copied from Perforce Change: 2126448
…lisation !XB (Audio|FMOD) releasing all events on bank unload Copied from Perforce Change: 2126480
…nDrivenMotion setting after change in @2089148 Copied from Perforce Change: 2127365
!XB (DX12) fixed error C7626: unnamed class used in typedef name cannot declare members other than non-static data members, member enumerations, or member classes !XB (LevelSystem) fixed error C7626: unnamed class used in typedef name cannot declare members other than non-static data members, member enumerations, or member classes Copied from Perforce Change: 2128125
…ected Copied from Perforce Change: 2134575
Copied from Perforce Change: 2137923
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.