Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 02:57:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
74812 commits 76 branches 59 tags 1.2 GiB
Commit graph

74812 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
a3dde612d1 Can get total memory on Mac 2018-12-31 11:56:27 -08:00
NissimHadar
9c00bdcddb getCPUBrand works on Mac 2018-12-31 11:00:29 -08:00
NissimHadar
bb54353644 Compilation error. 2018-12-30 22:36:15 -08:00
NissimHadar
abe8352230 Merge branch '20466-addPlatformInfo' of https://github.com/NissimHadar/hifi into 20466-addPlatformInfo 2018-12-30 22:19:44 -08:00
NissimHadar
4b4ef4412a Merge branch 'master' of github.com:highfidelity/hifi into 20466-addPlatormInfo 2018-12-30 20:24:16 -08:00
NissimHadar
76ce63da64 Can read graphics card type. 2018-12-30 20:24:00 -08:00
NissimHadar
6debd996c5 Added method to get total system memory in MB. 2018-12-29 21:59:18 -08:00
NissimHadar
3a9214747a Can read number of logical processors 2018-12-29 20:49:54 -08:00
NissimHadar
63ea300921 Can get CPU brand. 2018-12-29 17:24:44 -08:00
Adam Smith
833ad936c0
Merge pull request #14630 from jherico/fix/20284_master 
Fix for Oculus reset view issue
 2018-12-28 16:24:40 -08:00
Adam Smith
52980559b8
Merge pull request #14491 from SamGondelman/v3 
Case 20080: v3 + v4 procedurals and misc shader fixes
 2018-12-28 15:17:50 -08:00
Ryan Huffman
e7f7f295b0
Merge pull request #14583 from dback2/unityAvatarExporter2 
Avatar Exporter - joint rotation offsets and file workflow changes
 2018-12-28 15:14:55 -08:00
NissimHadar
246c4dab94 Created the PlatformInfo scripting object. 2018-12-28 14:41:55 -08:00
NissimHadar
c28167f797 Initial creation of class - has COPY of getOperatingSystemType(). 2018-12-28 14:24:19 -08:00
NissimHadar
04e872769d Merge branch 'master' of https://github.com/highfidelity/hifi into 20339_nitpick_v1.3 2018-12-28 11:41:27 -08:00
John Conklin II
4f3dd390b5
Merge pull request #14625 from SamGondelman/deprecateDashed 
Case 20392: Deprecated 3D Overlay dashed/isDashed
 2018-12-28 10:16:27 -08:00
NissimHadar
493a05f905 Remove bad comment. 2018-12-28 08:45:45 -08:00
Adam Smith
0d27cb65ca
Merge pull request #14576 from sabrina-shanman/hfm_prep_graphics 
(case 20297) Move graphics preparation from Serializers to runtime preparation step
 2018-12-27 15:46:21 -08:00
Brad Hefta-Gaub
440f517b88
Merge pull request #14602 from samcake/punk 
Case 20303 : Cleaning up the render view tasks and jobs for better 2ndary camera
 2018-12-27 15:43:17 -08:00
unknown
b0ae323d52 better extension check 2018-12-27 13:07:33 -08:00
unknown
87026a85f1 CR changes 2018-12-27 12:56:44 -08:00
NissimHadar
70a2412a71 Windows version now deletes entities before starting tests. 2018-12-26 12:23:26 -08:00
unknown
65cc683f80 fix case-sensitivity on fbx 2018-12-26 12:16:51 -08:00
NissimHadar
577b3cbc90 Implemented online help. 2018-12-26 09:06:25 -08:00
SamGondelman
a25c9395b3 glsl initializer lists are 4.2 2018-12-25 00:46:42 -05:00
David Back
a3206c84f2 remove unneeded logs 2018-12-21 18:00:59 -08:00
David Back
1b98944caa missing newlines 2018-12-21 18:00:59 -08:00
David Back
c16f58bdc7 UX feedback changes 2018-12-21 18:00:58 -08:00
David Back
71cd0976d6 newline 2018-12-21 18:00:57 -08:00
David Back
b139e52fb6 update package 2018-12-21 18:00:56 -08:00
David Back
d63609bedd more file workflow changes including export project popup window, add readme 2018-12-21 18:00:55 -08:00
David Back
58e1df970f remove need for Asset/Resources folder, fix rotations on root 2018-12-21 18:00:55 -08:00
David Back
28b4527632 Avatar Exporter - joint rotation offsets and file workflow changes 2018-12-21 18:00:55 -08:00
Adam Smith
a9f59fae71
Merge pull request #14631 from highfidelity/revert-14547-NOverlays5 
Revert "Case 20200: Update EntityScriptingInterface to not find local entities"
 2018-12-21 10:32:59 -08:00
Adam Smith
3c89d51994
Merge pull request #14626 from luiscuenca/gltfEmbeddedBinCrashFix 
Case 20391: Fix crash when importing a glTF model that contains embedded buffers
 2018-12-20 16:55:37 -08:00
Sam Gondelman
097d2d9503
Revert "Case 20200: Update EntityScriptingInterface to not find local entities" 2018-12-20 16:53:33 -08:00
SamGondelman
835615fbbd separate out v3 and v4 2018-12-20 16:33:13 -08:00
Brad Davis
c985eb3e80 Fix for Oculus reset view issue 2018-12-20 16:07:55 -08:00
SamGondelman
9fc7813e24 Merge remote-tracking branch 'upstream/master' into v3 2018-12-20 16:05:06 -08:00
sam gateau
26c9d7a94e Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-20 13:22:19 -08:00
Shannon Romano
21ec4e0c53
Merge pull request #14524 from SamGondelman/NOverlays3 
Case 20132, Case 16928: First class Image Entities
 2018-12-20 21:20:49 +00:00
sam gateau
49df69e609 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-20 13:17:02 -08:00
sam gateau
7e1f75e0f3 Fixing the debug of shadow frustum for real 2018-12-20 13:16:41 -08:00
luiscuenca
52bfaafd91 Fix crash on glTF import when the file contains embedded buffers 2018-12-20 13:25:19 -07:00
SamGondelman
837c261fd5 deprecated dashed/isDashed 2018-12-20 11:28:42 -08:00
Shannon Romano
b6d1607acd
Merge pull request #14547 from SamGondelman/NOverlays5 
Case 20200: Update EntityScriptingInterface to not find local entities
 2018-12-20 19:10:22 +00:00
sam gateau
21577ba311 fixing warnings and the debug of shadows 2018-12-20 09:27:15 -08:00
Jeff Clinton
3d4311b7d4
Merge pull request #14613 from zfox23/MS20253_eventBridge 
MS20253: Only emit screenChanged once screen has changed
 2018-12-20 08:58:53 -08:00
Sam Gateau
8fba8062c3 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-19 20:01:48 -08:00
Sam Gateau
80a55e2ae9 Compiling 2018-12-19 20:01:14 -08:00