|
|
ace5229473
|
8.28合并
|
2025-08-28 17:13:03 +08:00 |
|
|
|
f4b16c36c6
|
Merge remote-tracking branch 'origin/main_ch_eg' into addRender
# Conflicts:
# gui/gui_manager.py
# main.py
# scene/scene_manager.py
# ui/main_window.py
# ui/property_panel.py
|
2025-08-28 16:32:26 +08:00 |
|
|
|
4f680a3da4
|
1.修改整体布局（有BUG未修改完成）
|
2025-08-28 15:46:38 +08:00 |
|
|
|
0319b13f4a
|
Merge remote-tracking branch 'origin/main_ch_eg' into main_ch_eg
# Conflicts:
# RenderPipelineFile/config/daytime.yaml
# ui/property_panel.py
|
2025-08-21 11:35:17 +08:00 |
|
|
|
a189d027f0
|
Merge pull request 'addRender' (#18) from addRender into main_ch_eg
Reviewed-on: #18
|
2025-08-21 03:34:01 +00:00 |
|
|
|
bb76795478
|
Merge remote-tracking branch 'origin/addRender' into main_ch_eg
# Conflicts:
# .gitignore
# .idea/AugmentWebviewStateStore.xml
# RenderPipelineFile/config/daytime.yaml
# ui/property_panel.py
|
2025-08-21 11:31:31 +08:00 |
|
|
|
1db030309e
|
Ignore pyc files and stop tracking compiled Python files
|
2025-08-21 11:28:54 +08:00 |
|
|
|
960178d31b
|
Ignore pyc files and remove from tracking
|
2025-08-21 11:26:47 +08:00 |
|
