Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-10 04:12:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68364 commits 25 branches 0 tags 1.1 GiB
Commit graph

68364 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
559d436dfa Fixing the merge conflicts 2018-05-24 16:57:10 -07:00
John Conklin II
caee987d96
Merge pull request #13210 from SamGondelman/macSkybox 
Mac: render unsupported BPTC textures as uncompressed
 2018-05-24 14:52:11 -07:00
NissimHadar
d81ae26c7e
Merge pull request #13232 from NissimHadar/newAvatar 
Updates to AutoTester
 2018-05-24 14:49:50 -07:00
John Conklin II
36d2baab60
Merge pull request #13214 from SamGondelman/primCrash 
Fix crash in GL45Backend::do_drawIndexedInstanced
 2018-05-24 13:33:06 -07:00
NissimHadar
3dbebe2347 Merge branch 'master' of github.com:highfidelity/hifi into newAvatar 2018-05-24 13:30:57 -07:00
John Conklin II
04bf8f851f
Merge pull request #13219 from samcake/one 
Bringing Evolution to the Job Engine Task library developed in the workload project to master
 2018-05-24 13:30:16 -07:00
NissimHadar
802cedf1bc Removed messages in non-interactive mode. 2018-05-24 13:29:02 -07:00
Sam Gateau
1614758dbb
Merge pull request #13109 from AndrewMeadows/upgrade-bullet-2.88 
upgrade from Bullet-2.83 to Bullet-2.88
 2018-05-24 12:11:20 -07:00
Sam Gateau
c19b2b2bce
Merge pull request #13006 from samcake/workload 
Workload: Add more timing intervals for the feedback and regulation of the view
 2018-05-24 11:59:57 -07:00
Andrew Meadows
288efb1f93 remove cuft 2018-05-24 11:30:12 -07:00
Andrew Meadows
885c7bc97d bump protocol for extra byte in collisionMask 2018-05-24 11:28:52 -07:00
Andrew Meadows
d42375e4fe finish uint8_t to uint16_t conversion 2018-05-24 11:28:52 -07:00
Andrew Meadows
14f776cfb7 upgrade android bullet dependency to 2.88 2018-05-24 11:28:52 -07:00
Andrew Meadows
7e03b8b33c one more try to eliminate windows compile warnings 2018-05-24 11:28:52 -07:00
Andrew Meadows
da7dc487cc remove windows build warnings in Bullet lib 2018-05-24 11:28:52 -07:00
Andrew Meadows
31dd59d212 double bits in collision groups 2018-05-24 11:28:52 -07:00
Andrew Meadows
1112609ae7 upgrade to Bullet-2.88 2018-05-24 11:28:52 -07:00
John Conklin II
373660acbc
Merge pull request #13034 from AndrewMeadows/upgrade-to-glm-0.9.8.5 
upgrade to glm-0.9.8.5
 2018-05-24 11:04:06 -07:00
samcake
c29b93b986 Merging with latest master and bringin low hanging fruits from Andrews pr 2018-05-23 17:49:10 -07:00
samcake
40370f860a Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-05-23 17:26:08 -07:00
samcake
c66b592b3a MOVe the feedINput functions at the right spot 2018-05-23 17:04:00 -07:00
samcake
7ed39f4052 Adjusting the syntax to have linux compiling maybe 2018-05-23 16:16:57 -07:00
Sam Gateau
b771253467
Merge pull request #13225 from AndrewMeadows/workload 
workload: merge from master
 2018-05-23 16:16:11 -07:00
samcake
e4048c8f23 remove extra comments 2018-05-23 15:12:21 -07:00
samcake
cf58f31f3e Renaming the render::Engine to render::RenderEngine so the instancied Engine class coming from the task namesapce from which it derives, is just named 'Engine' 2018-05-23 15:08:48 -07:00
Andrew Meadows
30b2eb0740 update android glm dependency to 0.9.8.5 2018-05-23 14:52:28 -07:00
Andrew Meadows
d95371ae79 HACK: bypass android's baseUrl inflexibility 2018-05-23 14:52:28 -07:00
Andrew Meadows
1c0f6818a3 apply orenh1's patch to make GLM-0.9.8.5 compile on updated linux 2018-05-23 14:52:28 -07:00
Andrew Meadows
aedb5cc746 upgrade to glm-0.9.8.5 2018-05-23 14:52:28 -07:00
Andrew Meadows
d50da2babc Merge 'master' into 'workload' 2018-05-23 14:51:05 -07:00
John Conklin II
3e665fb616
Merge pull request #13179 from dback2/cloneables 
Server-Managed Cloneables + Cloneable Properties
 2018-05-23 12:40:27 -07:00
samcake
55945b5454 Remove deprecated and commented code 2018-05-23 12:36:20 -07:00
samcake
b06356b0fd Remove deprecated and commented code 2018-05-23 11:58:25 -07:00
NissimHadar
163b72a4ec Merge branch 'master' of github.com:highfidelity/hifi into newAvatar 2018-05-23 08:09:42 -07:00
samcake
4985207b45 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-22 17:40:54 -07:00
NissimHadar
f8b69ef1f1 Changed stored failure images from JPG to PNG 
Now uses snapshot name to find correct test folder - allows creating multiple tests
Reversed order of recursive scripts, so execution will be in alphabetical order.
 2018-05-22 16:34:32 -07:00
Liv Erickson
56493346c1 fix permissions check 2018-05-22 15:41:48 -07:00
John Conklin II
52a05680e7
Merge pull request #12895 from vladest/menu-updates 
Menu Cleanup and Reorganization
 2018-05-22 13:21:08 -07:00
Liv Erickson
0ebd13b3e6 cannot edit origin from client / fix ICE issue 2018-05-22 13:17:23 -07:00
SamGondelman
9dfc61a452 possible fix for gl crash 2018-05-22 12:51:32 -07:00
Liv Erickson
7efcc135e4 reorder flags 2018-05-22 11:03:41 -07:00
Dante Ruiz
c4f39841f5 fix another menu name changes that broke snapshot 2018-05-22 10:46:20 -07:00
Sam Gateau
937955dd45
Merge pull request #13191 from jherico/feature/unit_testing 
More unit testing work
 2018-05-22 10:00:24 -07:00
Liv Erickson
e273a0c1a6 fix define properties 2018-05-22 09:10:50 -07:00
Dante Ruiz
9df79462ad fix snapshot 2018-05-22 09:06:10 -07:00
Liv Erickson
27c2bb9046 add properties group where missing 2018-05-21 17:39:08 -07:00
Liv Erickson
a1e7f648bc add debug properties 2018-05-21 17:14:36 -07:00
Liv Erickson
e76829bb1d change to DEFINE_PROPERTY_REF 2018-05-21 16:51:23 -07:00
Liv Erickson
604b3cac1c check for null entities in grab, add conversion for old userdata cloneable 2018-05-21 16:19:43 -07:00
samcake
2dc28a504c Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-21 15:52:42 -07:00