Rowland/EG
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100 Commits 11 Branches 0 Tags 3.9 GiB
e62ae89289
Commit Graph

100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hector
e62ae89289 Merge remote-tracking branch 'origin/main_ch_eg' into addRender 
# Conflicts:
#	ui/property_panel.py
 2025-09-17 17:56:31 +08:00
Hector
3a8439851b 聚焦功能 2025-09-17 17:48:20 +08:00
Hector
2a76703b89 聚焦功能 2025-09-17 17:48:06 +08:00
陈横
f9bd83c876 1.优化碰撞面板 2025-09-17 17:34:23 +08:00
Hector
1c660c781a Merge remote-tracking branch 'refs/remotes/origin/main_ch_eg' into addRender 
# Conflicts:
#	RenderPipelineFile/config/daytime.yaml
#	scene/scene_manager.py
#	ui/main_window.py
 2025-09-17 15:57:32 +08:00
Hector
d3c6665163 聚焦功能 2025-09-17 15:42:42 +08:00
陈横
39a52b3953 1.增加碰撞面板 2025-09-17 15:41:55 +08:00
陈横
9a997c4036 1.优化 2025-09-17 11:11:46 +08:00
Hector
a8082bd656 保存系统持续完善 2025-09-16 16:09:54 +08:00
Hector
0ec780792e Merge remote-tracking branch 'origin/main_ch_eg' into addRender 
# Conflicts:
#	RenderPipelineFile/config/daytime.yaml
#	scene/scene_manager.py
#	ui/main_window.py
 2025-09-15 16:56:28 +08:00
陈横
dff3726bbf Merge remote-tracking branch 'origin/addRender' into main_ch_eg 
# Conflicts:
#	RenderPipelineFile/config/daytime.yaml
#	scene/scene_manager.py
#	ui/main_window.py
 2025-09-15 16:45:37 +08:00
陈横
63801cfb0a 1.修改保存层级数 2025-09-15 16:32:23 +08:00
Hector
9f1879cf95 保存脚本... 2025-09-15 16:31:35 +08:00
Hector
8a2f1f802c 保存 2025-09-15 09:17:05 +08:00
Hector
fc7f0d55f3 2dGUI场景保存，3D模型，（地形，信息面板除外） 2025-09-15 09:14:16 +08:00
陈横
7fd52d3458 1 2025-09-11 17:16:59 +08:00
陈横
8f6bcc9b5a Merge remote-tracking branch 'origin/addRender' into main_ch_eg 
# Conflicts:
#	scene/scene_manager.py
 2025-09-11 17:11:51 +08:00
Hector
c05911d7d6 1.优化启动页 
2.加载层级树（未完成）
 2025-09-11 17:07:08 +08:00
陈横
ace7804578 添加更多保存节点 2025-09-11 17:03:20 +08:00
Hector
fb863f8e2b Merge remote-tracking branch 'origin/main_ch_eg' into addRender 2025-09-11 09:33:48 +08:00
陈横
6b4dcd14e6 Merge remote-tracking branch 'origin/addRender' into main_ch_eg 2025-09-11 09:27:55 +08:00
Hector
c87f26a0ec 1.新加启动页打开项目相关逻辑（添加启动页开始入口） 2025-09-11 09:27:39 +08:00
陈横
5b814a8376 Merge remote-tracking branch 'origin/addRender' into main_ch_eg 2025-09-11 09:25:29 +08:00
陈横
4222200ae2 3d信息面板文字信息 2025-09-11 09:24:07 +08:00
Hector
e02a0762bd 1.新加启动页打开项目相关逻辑 2025-09-11 09:24:01 +08:00
Hector
9fc8f2f5ca Merge remote-tracking branch 'origin/main_ch_eg' into addRender 
# Conflicts:
#	RenderPipelineFile/rpcore/pynative/internal_light_manager.py
#	core/terrain_manager.py
#	gui/gui_manager.py
#	scene/scene_manager.py
#	ui/interface_manager.py
#	ui/widgets.py
 2025-09-10 09:32:54 +08:00
陈横
26d10f4117 1.修改Bug（20250910） 2025-09-10 09:12:38 +08:00
Hector
605f2bbdcd 信息面板GUI完成，http数据连接成功，9.10合并 2025-09-10 09:11:46 +08:00
Hector
f27b4a0bbf 处理模型导入问题。。。 2025-09-05 14:40:43 +08:00
Hector
ce43355167 限制材质名称长度防止属性面板各项属性宽度过长 2025-09-05 11:37:26 +08:00
Hector
bc90a4521e 项目保存时剔除坐标轴模型以及项目不会加载多余天空盒 2025-09-05 10:33:38 +08:00
Hector
4ca5068b2c 视频屏幕可播放视频流，修改部分名称过长问题 2025-09-03 17:22:28 +08:00
Hector
5e68ff5ee6 3d视频屏幕和2d视频屏幕 2025-09-02 10:21:46 +08:00
Hector
d980330d9d 8.28合并 2025-09-01 09:06:16 +08:00
陈横
95395bdb05 1.整合菜单栏（2D图片、3D图片、地形） 2025-08-29 16:04:25 +08:00
陈横
c39ebeb345 Merge remote-tracking branch 'origin/main' into main_ch_eg 2025-08-28 17:14:39 +08:00
Hector
c45bb54927 Merge pull request 'addRender' (#25) from addRender into main 
Reviewed-on: Hector/EG#25
 2025-08-28 09:13:31 +00:00
Hector
ace5229473 8.28合并 2025-08-28 17:13:03 +08:00
Hector
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
陈横
e94bf83196 更新daytime配置，添加新的资源文件和终端配置 2025-08-28 16:18:13 +08:00
陈横
6e4cd17d75 Merge remote-tracking branch 'origin/main' into main_ch_eg 2025-08-28 15:58:07 +08:00
Hector
fc846e296d Merge pull request 'addRender' (#22) from addRender into main 
Reviewed-on: Hector/EG#22
 2025-08-28 07:52:51 +00:00
Hector
bbd63d99e5 Merge branch 'addRender' of http://10.0.0.99:4000/Hector/EG into addRender 
# Conflicts:
#	core/event_handler.py
#	core/terrain_manager.py
#	main.py
#	ui/interface_manager.py
#	ui/main_window.py
#	ui/property_panel.py
 2025-08-28 15:51:34 +08:00
陈横
4f680a3da4 1.修改整体布局（有BUG未修改完成） 2025-08-28 15:46:38 +08:00
Hector
78dae899cf 3d_image和2d_image 
根据高度图创建地形
 2025-08-28 15:45:32 +08:00
Hector
0fefb33f44 Merge pull request '3d_image和2d_image' (#21) from addRender into main 
Reviewed-on: Hector/EG#21
 2025-08-27 09:18:23 +00:00
Hector
afb4a4bb50 3d_image和2d_image 
根据高度图创建地形
 2025-08-27 17:17:54 +08:00
Hector
54aec1778d Merge pull request '补充Cesium文件' (#20) from addRender into main 
Reviewed-on: Hector/EG#20
 2025-08-25 09:49:41 +00:00
Hector
c66b9003f5 补充Cesium文件 2025-08-25 17:48:13 +08:00
Hector
167fa4bdd0 Merge pull request 'addRender' (#19) from addRender into main 
Reviewed-on: Hector/EG#19
 2025-08-25 09:42:27 +00:00