GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,741 Commits 14 Branches 0 Tags
4e45ac6ef4ca8c2cadbf6504df4a86b0c0c30e1e
Commit Graph

6741 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Menotdan
4e45ac6ef4 Merge branch 'FlaxEngine:master' into visject_grid_snap 2023-10-01 23:32:21 -04:00
Wojtek Figat
6d92d0b58f Merge branch 'RuanLucasGD-Remove-Background_From-CollisionDataWindow' 2023-10-01 12:35:27 +02:00
Wojtek Figat
2db55a3711 Merge branch 'Remove-Background_From-CollisionDataWindow' of https://github.com/RuanLucasGD/FlaxEngine into RuanLucasGD-Remove-Background_From-CollisionDataWindow 2023-10-01 12:35:22 +02:00
Wojtek Figat
8de9e06b58 Merge branch 'Tryibion-main-win' 2023-10-01 12:33:59 +02:00
Wojtek Figat
fc499b763d Merge branch 'main-win' of https://github.com/Tryibion/FlaxEngine into Tryibion-main-win 2023-10-01 12:33:54 +02:00
Wojtek Figat
9acff68209 Merge branch 'Tryibion-rot-around-fix' 2023-10-01 12:32:51 +02:00
Wojtek Figat
4f5e7988c9 Merge branch 'rot-around-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-rot-around-fix 2023-10-01 12:32:42 +02:00
Wojtek Figat
20797fce5a Merge branch 'Tryibion-base-win-size' 2023-10-01 12:30:19 +02:00
Wojtek Figat
883abc2f3b Merge branch 'base-win-size' of https://github.com/Tryibion/FlaxEngine into Tryibion-base-win-size 2023-10-01 12:30:14 +02:00
Wojtek Figat
1e96bb7647 Merge branch 'GoaLitiuM-vs_android_intellisense_fix' 2023-10-01 12:29:43 +02:00
Wojtek Figat
ec7dcc4cfb Merge branch 'vs_android_intellisense_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-vs_android_intellisense_fix 2023-10-01 12:29:36 +02:00
Wojtek Figat
acc7d0893f Merge branch 'GoaLitiuM-vscode_csharp_build_tasks' 2023-10-01 12:28:38 +02:00
Wojtek Figat
3ae0e4f65e Merge branch 'vscode_csharp_build_tasks' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-vscode_csharp_build_tasks 2023-10-01 12:28:30 +02:00
Wojtek Figat
92382b42c4 Merge branch 'GoaLitiuM-assembly_load_fix' 2023-10-01 12:28:09 +02:00
Wojtek Figat
7dc3a3c1a2 Merge branch 'assembly_load_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-assembly_load_fix 2023-10-01 12:27:54 +02:00
Wojtek Figat
3f8c91c83a Merge branch 'GoaLitiuM-build_engine_bindings' 2023-10-01 12:27:22 +02:00
Wojtek Figat
5832d995eb Merge branch 'build_engine_bindings' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-build_engine_bindings 2023-10-01 12:27:14 +02:00
Wojtek Figat
3754b5c958 Merge branch 'GoaLitiuM-sln_generation_fix2' 2023-10-01 12:26:44 +02:00
Wojtek Figat
6e47db0ebe Merge branch 'sln_generation_fix2' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-sln_generation_fix2 2023-10-01 12:26:39 +02:00
Wojtek Figat
38cf756f1f Merge branch 'Tryibion-blur-fix' 2023-10-01 12:25:44 +02:00
Wojtek Figat
8c61b6d41b Merge branch 'blur-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-blur-fix 2023-10-01 12:25:39 +02:00
Wojtek Figat
18a2824753 Merge branch 'GoaLitiuM-sceneanim_null_check_fix' 2023-10-01 12:12:33 +02:00
Wojtek Figat
19a0eab966 Merge branch 'sceneanim_null_check_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-sceneanim_null_check_fix 2023-10-01 12:12:21 +02:00
Wojtek Figat
4e839c2e3d Merge branch 'Arcnor-renameNewActor' 2023-10-01 12:10:33 +02:00
Wojtek Figat
26040f27cc Merge branch 'renameNewActor' of https://github.com/Arcnor/FlaxEngine into Arcnor-renameNewActor 2023-10-01 12:08:01 +02:00
Wojtek Figat
450d49b0e7 Merge branch 'Arcnor-labelSetBaselineGap' 2023-10-01 12:07:04 +02:00
Wojtek Figat
da647d3403 Merge branch 'labelSetBaselineGap' of https://github.com/Arcnor/FlaxEngine into Arcnor-labelSetBaselineGap 2023-10-01 12:06:57 +02:00
Wojtek Figat
2dd6297d18 Merge branch 'GoaLitiuM-visualscript_valuetype_fix' 2023-10-01 12:06:19 +02:00
Wojtek Figat
3f3f31f70f Merge branch 'visualscript_valuetype_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-visualscript_valuetype_fix 2023-10-01 12:06:00 +02:00
Wojtek Figat
e8a093f0b3 Merge branch 'Tryibion-font-size-fixes' 2023-10-01 12:05:24 +02:00
Wojtek Figat
5e3bb4d51e Merge branch 'font-size-fixes' of https://github.com/Tryibion/FlaxEngine into Tryibion-font-size-fixes 2023-10-01 12:05:20 +02:00
Wojtek Figat
3078a9d212 Merge branch 'davevanegdom-Statusbar-Imrpovements' 2023-10-01 12:04:01 +02:00
Wojtek Figat
4d6a27c92a Merge branch 'Statusbar-Imrpovements' of https://github.com/davevanegdom/FlaxEngine into davevanegdom-Statusbar-Imrpovements 2023-10-01 12:01:31 +02:00
Wojtek Figat
e0f840563d Merge branch 'M-3-H-master' 2023-10-01 12:00:50 +02:00
Wojtek Figat
a761a7e857 Merge branch 'master' of https://github.com/M-3-H/FlaxEngine into M-3-H-master 2023-10-01 12:00:40 +02:00
Wojtek Figat
5e283b3d16 Merge branch 'Tryibion-fix-tooltip' 2023-10-01 11:59:36 +02:00
Wojtek Figat
818b2c3bb5 Merge branch 'fix-tooltip' of https://github.com/Tryibion/FlaxEngine into Tryibion-fix-tooltip 2023-10-01 11:59:30 +02:00
Wojtek Figat
0690d8695d Merge branch 'Chikinsupu-Visject-PrettierConnectionBezier' 2023-10-01 11:59:10 +02:00
Wojtek Figat
c35a21a1dc Merge branch 'Visject-PrettierConnectionBezier' of https://github.com/Chikinsupu/FlaxEngine into Chikinsupu-Visject-PrettierConnectionBezier 2023-10-01 11:57:08 +02:00
Wojtek Figat
0eda67bd73 Fix nested profiler events usage 
#https://github.com/FlaxEngine/FlaxEngine/issues/1380
 2023-10-01 11:56:54 +02:00
Wojtek Figat
659a70dc81 Merge branch 'Tryibion-bool-fix' 2023-10-01 11:36:26 +02:00
Wojtek Figat
3a85b27cbe Merge branch 'bool-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-bool-fix 2023-10-01 11:36:21 +02:00
Wojtek Figat
8c69363fba Merge branch 'Zode-master' 2023-10-01 11:35:11 +02:00
Wojtek Figat
f4ee709bc6 Merge branch 'master' of https://github.com/Zode/FlaxEngine into Zode-master 2023-10-01 11:35:06 +02:00
Wojtek Figat
ecda813b4a Merge branch 'AndrejStojkovic-master' 2023-10-01 11:34:36 +02:00
Wojtek Figat
bd8240c5a5 Merge branch 'master' of https://github.com/AndrejStojkovic/FlaxEngine into AndrejStojkovic-master 2023-10-01 11:34:30 +02:00
Wojtek Figat
5bfcbd907a Merge branch 'Tryibion-output-win' 2023-10-01 11:27:19 +02:00
Wojtek Figat
0d0dc9bc07 Merge branch 'output-win' of https://github.com/Tryibion/FlaxEngine into Tryibion-output-win 2023-10-01 11:27:11 +02:00
Chandler Cox
b943c7ca3e Add extra check for stationary rotation. 2023-09-30 22:19:09 -05:00
Chandler Cox
113307ddf9 Simplify to return main window even in editor. 2023-09-30 21:36:41 -05:00