sin365/AxibugEmuOnline
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

master #75

Closed
Alienjack wants to merge 510 commits from Alienjack/AxibugEmuOnline_old:master into master
pull from: Alienjack/AxibugEmuOnline_old:master
merge into: sin365:master
Conversation 0 Commits 510 Files Changed 5 +302
Alienjack commented 2024-12-30 23:12:12 +08:00
Contributor
Copy Link
No description provided.
Alienjack added 510 commits 2024-12-30 23:12:15 +08:00 
Reviewed-on: #1
Reviewed-on: #2
Reviewed-on: #3
Reviewed-on: #4
Reviewed-on: #5
Reviewed-on: #6
Reviewed-on: #7
Reviewed-on: #8
Reviewed-on: #9
Reviewed-on: #10
Reviewed-on: #11
Reviewed-on: #12
Reviewed-on: #13
Reviewed-on: #14
Reviewed-on: #15
Reviewed-on: #17
Reviewed-on: #18
Reviewed-on: #19
Reviewed-on: #20
Reviewed-on: #21
Reviewed-on: #22
Reviewed-on: #23
Reviewed-on: #24
Reviewed-on: #25
Reviewed-on: #26
# Conflicts:
#	References/virtuanessrc097-master/NES/ApuEX/emu2413/emu2413.c
#	References/virtuanessrc097-master/NES/ApuEX/emu2413/emu2413.h
Reviewed-on: #27
Reviewed-on: #28
Reviewed-on: #29
实现XMB主菜单效果
XMB UI控件迭代
Reviewed-on: #30
Reviewed-on: #31
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Plugins/Demigiant/DOTween/DOTween.dll.meta
Reviewed-on: #32
Reviewed-on: #33
Reviewed-on: #34
Reviewed-on: #35
Reviewed-on: #36
Reviewed-on: #37
Reviewed-on: #38
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Script/UI/CommandDispatcher/CommandDispatcher.cs
Reviewed-on: #39
Reviewed-on: #40
Reviewed-on: #41
Reviewed-on: #42
Reviewed-on: #43
Reviewed-on: #44
Reviewed-on: #45
Reviewed-on: #46
Reviewed-on: #47
Reviewed-on: #48
Reviewed-on: #49
Reviewed-on: #50
Reviewed-on: #51
Reviewed-on: #52
Reviewed-on: #53
Reviewed-on: #54
Reviewed-on: #55
rename BgSetting_Color.cs->UI_BgSettingItem_Color.cs
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Script/App.cs
Reviewed-on: #56
Reviewed-on: #57
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity
Reviewed-on: #58
Reviewed-on: #59
Reviewed-on: #60
-:q::Qqq;Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline
Reviewed-on: #61
Reviewed-on: #62
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Script/AppMain/Filter/FixingPixelArtGrille/FixingPixelArtGrille.cs
Reviewed-on: #63
Reviewed-on: #64
Reviewed-on: #65
Reviewed-on: #66
Reviewed-on: #67
处理部分代码文件的编码文件
部分代码经过了rider调教
GamingChanger.cs和NormalChanger.cs不再属于legacy了,因为InputSystem已经作废了:)
Reviewed-on: #68
Reviewed-on: #69
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OverlayUI/OverlayManager.cs
Reviewed-on: #70
Reviewed-on: #71
filtereffect派生类现在自动加载，
StripAttribute用于标记滤镜不在某些平台自动加载
Reviewed-on: #72
优化滤镜机制
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Script/AppMain/Filter/FilterManager.cs
Reviewed-on: #73
sin365 closed this pull request 2024-12-30 23:16:01 +08:00

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: sin365/AxibugEmuOnline#75
No description provided.
Delete Branch "Alienjack/AxibugEmuOnline_old:master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?