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

74150 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dante Ruiz
20ad05726e entity server timout 2018-11-15 10:52:40 -08:00
SamGondelman
597ff773e1 fix for avatar flashing 2018-11-15 10:52:22 -08:00
NissimHadar
e6190eb429 Merge branch 'master' of https://github.com/highfidelity/hifi into MAC 2018-11-15 10:45:05 -08:00
amantley
f9829c270d merged new fbx.h 2018-11-15 10:19:04 -08:00
Brad Hefta-Gaub
20766da624
Merge pull request #14382 from dback2/newPropertySliders 
Entity properties - new draggable numbers
 2018-11-15 10:01:07 -08:00
amantley
c8cd65c3bd added getter for the orginal cluster bind matrix values in AnimSkeleton 2018-11-15 09:58:10 -08:00
Jeff Clinton
c72dd3d690
Merge pull request #14395 from ctrlaltdavid/M19859 
Fix Goto app clicks not working
 2018-11-15 09:56:56 -08:00
Simon Walton
cd00abd216 Add upload progress bar 2018-11-15 09:47:43 -08:00
Olivier Prat
0401858129 Cleaned up do_draw in GLESBackend 2018-11-15 18:34:41 +01:00
Jamil Akram
60b58977cd
Merge pull request #14267 from humbletim/fb17479-fix-handshake-keyrelease 
FB17479 - Fix scripted key release events for handshakes.
 2018-11-15 09:21:32 -08:00
Olivier Prat
ed42c94772 Merge branch 'master' of http://github.com/highfidelity/hifi into ao 2018-11-15 17:55:29 +01:00
NissimHadar
fb0a84e800 CR updates. 2018-11-15 07:54:56 -08:00
NissimHadar
1e17b878e7 CR updates. 2018-11-15 07:32:26 -08:00
humbletim
d0e4c62978 fix merge conflict 2018-11-14 23:50:02 -05:00
humbletim
21030fbe5b Merge remote-tracking branch 'upstream/master' into fb18302-deprecated-package-model 2018-11-14 23:40:04 -05:00
NissimHadar
a74e123229 Merge branch 'master' of https://github.com/highfidelity/hifi into MAC 2018-11-14 20:20:41 -08:00
amantley
80ebde1036 started cleanup of pr 2018-11-14 17:27:45 -08:00
John Conklin II
ef3acae896
Merge pull request #14407 from jherico/fix/19876 
Case 19876: Fix procedurals using the iGlobalTime input
 2018-11-14 17:18:57 -08:00
amantley
8256c652fc added the hook to put the copy of the mutated bind poses into tthe skeleton 2018-11-14 17:02:25 -08:00
David Back
dfed797682 set more min/max/steps 2018-11-14 15:44:30 -08:00
Atlante45
31033ad685 Update TTS audio API use 2018-11-14 15:42:39 -08:00
Brad Davis
b7c567af08 Fix procedurals using the iGlobalTime input 2018-11-14 15:28:22 -08:00
Dante Ruiz
f17723c216 disable interstitial for master 2018-11-14 14:50:38 -08:00
Clement
7f910a38e3 Update keyboard injector to new interface 2018-11-14 14:46:08 -08:00
Clement
d2a1bb4806 CR 2018-11-14 14:46:08 -08:00
Clement
7192aed131 Rework audio data memory ownership model 2018-11-14 14:45:18 -08:00
David Back
76d2519205
Merge pull request #14400 from dback2/missingTypeFilters 
Add PolyLine/PolyVox to entity list/properties types
 2018-11-14 14:39:26 -08:00
John Conklin II
b08283d9e9
Merge pull request #14401 from sethalves/rc76-revert-pr-14238 
revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.
 2018-11-14 14:38:34 -08:00
David Back
d8f5e0f708 add min/max/step for some properties, remove duplicate createProperty, improve switch between states 2018-11-14 14:32:17 -08:00
David Rowe
9c5d318341 Fix highlighting 2018-11-15 10:15:30 +13:00
Brad Hefta-Gaub
6ffee02b4f
Merge pull request #14337 from thoys/feat/create/forwardWindowShortcuts 
[CreateApp] make shortcuts work from windows
 2018-11-14 12:56:27 -08:00
David Back
cff4c08e9f Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders 2018-11-14 12:46:41 -08:00
Seth Alves
1593c1185a revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it. 2018-11-14 12:29:09 -08:00
David Back
70493e3f29 add polyline/polyvox to entity list/properties types 2018-11-14 12:23:16 -08:00
John Conklin II
92a23ec0a9
Merge pull request #14294 from SimonWalton-HiFi/max-json-size 
Allow for large Models.json file
 2018-11-14 11:20:35 -08:00
Thijs Wenker
cd12dd8f6d fix OSX shortcut inconsistencies 2018-11-14 19:28:57 +01:00
Simon Walton
f5e14565b8 Clean-up javascript formatting 2018-11-14 10:17:48 -08:00
Simon Walton
e96cad230a Merge branch 'master' into upload-to-ds-chunked 2018-11-14 09:23:09 -08:00
sabrina-shanman
2d30902813 Fix OBJBaker not setting combineParts 2018-11-14 09:11:56 -08:00
Olivier Prat
85a3938cbe Switch to app for ambient occlusion debug script 2018-11-14 11:55:11 +01:00
Olivier Prat
45e0f65972 Merge branch 'ao' of http://github.com/Zvork/hifi into ao 2018-11-14 09:48:24 +01:00
David Rowe
010f7121a3 Fix Goto app clicks not working 
Includes better card highlighting fix.
 2018-11-14 15:27:18 +13:00
Simon Walton
452c212c4f Add Paths entry parsing to json parser 2018-11-13 17:58:12 -08:00
David Back
1aa048f4d6 style and decimal fixes 2018-11-13 17:56:31 -08:00
Brad Hefta-Gaub
f1dd778310
Merge pull request #14389 from SimonWalton-HiFi/oven-resourcerequestobserver 
Add newly-introduced dependency class to Oven
 2018-11-13 17:35:29 -08:00
Simon Walton
82e21e89e4 Merge remote-tracking branch 'upstream/master' into max-json-size 2018-11-13 17:26:20 -08:00
David Back
a349bac01c Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders 2018-11-13 16:32:15 -08:00
Thijs Wenker
2c715bf592 make window shortcuts work on OSX 2018-11-14 01:05:39 +01:00
Thijs Wenker
0248323bee fix test path 2018-11-14 01:05:38 +01:00
Thijs Wenker
cc207537a3 Fix for unintended snapshots while parenting/un-parenting 2018-11-14 01:05:38 +01:00