Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
14,265 Commits 16 Branches 23 Tags
master
Commit Graph
14265 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
mafiesto4 fa57440a2f Fix typo 2023-10-09 14:48:19 +02:00
mafiesto4 bfab9d68db Bump up version for future 2023-10-09 14:39:22 +02:00
mafiesto4 8a018977d6 Merge branch 'MineBill-fix-transition-data' 2023-10-09 14:35:24 +02:00
mafiesto4 26ffe31a0f Merge branch 'fix-transition-data' of https://github.com/MineBill/FlaxEngine into MineBill-fix-transition-data 2023-10-09 14:35:15 +02:00
mafiesto4 09f2be907e Merge remote-tracking branch 'origin/master' into 1.7 
# Conflicts:
#	Flax.flaxproj
 2023-10-09 12:40:47 +02:00
mafiesto4 8e23781153 Fix updating time left when destroying large amount of objects 
#1584
 2023-10-09 12:13:09 +02:00
mafiesto4 64d4076615 Minor tweaks 2023-10-09 12:06:55 +02:00
mafiesto4 d7e9e2ed16 Fix AssetsCache to include project path and reject cache when project gets duplicated with cache 
#1631
 2023-10-09 11:33:02 +02:00
mafiesto4 1ac4fef8d0 Merge branch 'nothingTVatYT-fix-linux-systeminfo' 2023-10-09 10:44:17 +02:00
mafiesto4 6c0011bef5 Merge branch 'fix-linux-systeminfo' of https://github.com/nothingTVatYT/FlaxEngine into nothingTVatYT-fix-linux-systeminfo 2023-10-09 10:44:08 +02:00
mafiesto4 481a3cfba5 Minor tweaks 2023-10-08 23:33:51 +02:00
mafiesto4 fd7ef38639 Merge branch 'MineBill-linux-doubleclick' 2023-10-08 22:14:09 +02:00
mafiesto4 0b786feb65 Merge branch 'linux-doubleclick' of https://github.com/MineBill/FlaxEngine into MineBill-linux-doubleclick 2023-10-08 22:14:02 +02:00
nothingTVatYT 5b866b643b fix GetDesktopSize for Linux 2023-10-08 22:05:53 +02:00
minebill 03642632f5 Use a maximum distance between clicks, when detecting a double click 2023-10-08 22:05:02 +03:00
mafiesto4 552641c51a Fix potential crashes if uses calls terrain tools with invalid params 2023-10-08 17:02:26 +02:00
mafiesto4 4bfc97d982 Merge branch 'GoaLitiuM-viewport_cam_drift_fix' 2023-10-08 16:50:24 +02:00
mafiesto4 f3818c8a1d Merge branch 'viewport_cam_drift_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-viewport_cam_drift_fix 2023-10-08 16:48:23 +02:00
mafiesto4 45ae103612 Merge branch 'RuanLucasGD-Fix-Actor-OnDestroy' 2023-10-08 16:46:25 +02:00
mafiesto4 c3924d636d Merge branch 'Fix-Actor-OnDestroy' of https://github.com/RuanLucasGD/FlaxEngine into RuanLucasGD-Fix-Actor-OnDestroy 2023-10-08 16:41:40 +02:00
mafiesto4 38664e9d43 More improvements to 13853d5fb5 2023-10-08 16:34:41 +02:00
GoaLitiuM 4db1975f02 Fix Editor viewport camera drifting with odd viewport sizes 2023-10-08 17:28:28 +03:00
mafiesto4 13853d5fb5 Fix model asset previews to wait for materials to be loaded 2023-10-08 16:01:34 +02:00
mafiesto4 734f8bcaf4 Fix shader compilation tracking to check for directory existence 2023-10-08 15:52:36 +02:00
mafiesto4 52833377ca Merge branch 'Tryibion-auto-module' 2023-10-08 15:14:40 +02:00
mafiesto4 b56447bae4 Refactor code in #1423 to be cleaner 2023-10-08 15:14:35 +02:00
mafiesto4 3b23e50ee6 Merge branch 'auto-module' of https://github.com/Tryibion/FlaxEngine into Tryibion-auto-module 
# Conflicts:
#	Source/Editor/Windows/ContentWindow.ContextMenu.cs
 2023-10-08 13:43:28 +02:00
mafiesto4 dd466ef162 Merge branch 'GoaLitiuM-ies_fix' 2023-10-08 13:40:17 +02:00
mafiesto4 f80271bdfd Merge branch 'ies_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-ies_fix 2023-10-08 13:36:55 +02:00
mafiesto4 e07c7f2c15 Merge branch 'GoaLitiuM-light_field_order_fix' 2023-10-08 13:36:20 +02:00
mafiesto4 916993f241 Merge branch 'light_field_order_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-light_field_order_fix 2023-10-08 13:36:10 +02:00
mafiesto4 96a56c11ef Merge branch 'RuanLucasGD-fix_edit_text_box' 2023-10-08 13:34:13 +02:00
mafiesto4 12ed17618f Merge branch 'fix_edit_text_box' of https://github.com/RuanLucasGD/FlaxEngine into RuanLucasGD-fix_edit_text_box 2023-10-08 13:34:08 +02:00
mafiesto4 2d1415c40d Merge branch 'Chikinsupu-Visject-BendingPreviewConnectionFix' 2023-10-08 11:16:47 +02:00
mafiesto4 dc59a38b64 Merge branch 'Visject-BendingPreviewConnectionFix' of https://github.com/Chikinsupu/FlaxEngine into Chikinsupu-Visject-BendingPreviewConnectionFix 2023-10-08 11:16:38 +02:00
mafiesto4 f7769439cf Merge branch 'Chikinsupu-Visject-ContextSensitiveParameterSupport' 2023-10-08 11:15:31 +02:00
mafiesto4 a9231d5e08 Merge branch 'Visject-ContextSensitiveParameterSupport' of https://github.com/Chikinsupu/FlaxEngine into Chikinsupu-Visject-ContextSensitiveParameterSupport 2023-10-08 11:15:26 +02:00
mafiesto4 af388ef8b4 Merge branch 'Chikinsupu-Visject-FixItemDuplicationBug' 2023-10-08 11:13:00 +02:00
mafiesto4 b2ee160bfe Merge branch 'Visject-FixItemDuplicationBug' of https://github.com/Chikinsupu/FlaxEngine into Chikinsupu-Visject-FixItemDuplicationBug 2023-10-08 11:12:55 +02:00
mafiesto4 df38752506 Merge branch 'MineBill-alt-key-linux' 2023-10-08 11:10:14 +02:00
mafiesto4 880e394554 Merge branch 'alt-key-linux' of https://github.com/MineBill/FlaxEngine into MineBill-alt-key-linux 2023-10-08 11:10:08 +02:00
mafiesto4 b8f094e007 Cleanup Iterator in ChunkedArray 2023-10-08 11:09:12 +02:00
mafiesto4 b93cbbd194 Merge branch 'GoaLitiuM-dict_iter_fix' 2023-10-08 11:05:18 +02:00
Christopher Rothert 5e85fa2c0c Merge branch 'master' into feat/improved-camera-settings 2023-10-08 01:41:05 +02:00
Christopher Rothert 966e5cdda2 Update some comments 2023-10-08 01:40:50 +02:00
Christopher Rothert 997c442e69 Update movement speed formatting 
* add property for movement speed text format
* add additional checks to camera speed progress calculation
* round movement speed to make it visually more appealing in the context menu
 2023-10-08 01:07:36 +02:00
Ruan Lucas 95f40ecc0c clean code 2023-10-07 16:27:14 -04:00
minebill e903348d71 Fix incorrect mapping of Alt key on linux 2023-10-07 22:28:39 +03:00
Ruan Lucas 56c3080b10 fix edit text box 2023-10-07 11:06:23 -04:00
Nils Hausfeld d41ec15606 - Implemented support for surface parameters 2023-10-07 13:57:05 +02:00