Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-17 13:19:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
50738 commits 25 branches 0 tags 1.1 GiB
Commit graph

50738 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
18e9b476c5 Merge pull request #9439 from hyperlogic/tablet-ui 
Improved stylus and laser input deadspot
 2017-01-19 12:43:02 -08:00
David Kelly
d9fbf832e2 Some initial analytics for PAL usage 2017-01-19 11:35:17 -08:00
Seth Alves
a861f5091e Merge pull request #9440 from sethalves/tablet-ui 
clean up grab.js.  provide a way to delete old tablets that got saved…
 2017-01-19 11:35:07 -08:00
Seth Alves
41ddfbfd27 clean up grab.js. provide a way to delete old tablets that got saved into Settings on exit 2017-01-19 11:34:38 -08:00
Zach Fox
44eaa64a1d It was writeString() all along! 2017-01-19 11:25:17 -08:00
Clément Brisset
89d1242925 Merge pull request #10 from huffman/feat/entity-server-script-property 
Entity script status + reload
 2017-01-19 11:19:40 -08:00
Ryan Huffman
2117b1fed3 Merge pull request #13 from birarda/entity-script-server 
fix bug with JSON in query, avoid frustum check in EntityTreeElement
 2017-01-19 10:45:26 -08:00
Stephen Birarda
746327dc11 whitespace cleanup in OST 2017-01-19 10:43:36 -08:00
Ken Cooke
784b23d05c Partial support for floating-point audio output 2017-01-19 10:33:04 -08:00
howard-stearns
c9c9b30c50 Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter 2017-01-19 10:30:18 -08:00
Zach Fox
534fcd9399 Potential fix 2017-01-19 10:20:36 -08:00
Seth Alves
99de46cb27 Merge pull request #9438 from sethalves/tablet-ui 
make tablet be an avatar-entity
 2017-01-19 10:12:34 -08:00
Seth Alves
0e9ff7f7fc make tablet be an avatar-entity 2017-01-19 10:12:06 -08:00
Seth Alves
c3505b854e Merge pull request #9437 from sethalves/tablet-ui 
Tablet ui
 2017-01-19 09:42:33 -08:00
Seth Alves
eb25e1c12d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-19 09:41:49 -08:00
Seth Alves
1a6ae01d9c Merge pull request #9435 from druiz17/tabletNav 
Tablet issues Fixed
 2017-01-19 09:22:18 -08:00
Chris Collins
601223aa98 Merge pull request #9402 from ctrlaltdavid/clara-tidying 
Remove a line of old code in Clara.io download
 2017-01-19 09:15:58 -08:00
Brad Davis
70de00c6bf Merge pull request #9421 from jherico/more_trace_details 
Additional trace details for GPU timing, frame data updates
 2017-01-19 09:12:34 -08:00
Dante Ruiz
342a6c67fb menu checkable button fix 2017-01-19 08:12:49 -08:00
Dante Ruiz
30b57b62da toggle help 2017-01-19 08:12:49 -08:00
samcake
149e727cf3 Merge pull request #9429 from gcalero/android_forward_shaders 
Create render forward version of pixel shaders
 2017-01-19 00:48:25 -08:00
Anthony J. Thibault
2fd691d844 Improved stylus and laser input deadspot 2017-01-18 18:23:00 -08:00
Clément Brisset
b2e7efa4a8 Merge pull request #9410 from samcake/meta 
Introducing type Meta to the render items of the scene
 2017-01-18 17:50:53 -08:00
Stephen Birarda
33cde412b1 make getJSONParameters thread-safe 2017-01-18 17:49:54 -08:00
Stephen Birarda
916a7325bc remove debug in EntityScriptServer 2017-01-18 17:49:54 -08:00
Stephen Birarda
a86be14b8c remove debug in OctreeSendThread 2017-01-18 17:49:54 -08:00
Stephen Birarda
5fbdc94c66 pass usesFrustum down to EntityTreeElement 2017-01-18 17:49:54 -08:00
Stephen Birarda
ed41412d95 fix for unpack of OctreeQuery 2017-01-18 17:49:54 -08:00
Stephen Birarda
fc03d25155 Merge pull request #14 from Atlante45/ess-pr 
Unload all scripts on entity server loss
 2017-01-18 17:48:43 -08:00
Atlante45
6b0b19d36d Unload all scripts on entity server loss 2017-01-18 17:47:19 -08:00
samcake
05304c72e0 Merge branch 'master' of https://github.com/highfidelity/hifi into meta 2017-01-18 17:00:20 -08:00
Seth Alves
7389475281 Merge pull request #9434 from sethalves/tablet-ui 
Tablet ui
 2017-01-18 17:00:09 -08:00
samcake
027bd30cbc Removing macOS warning 2017-01-18 16:59:50 -08:00
Seth Alves
7c938728e5 don't do constant haptics if stylus touches tablet frame. home button triggers only once per click 2017-01-18 16:56:39 -08:00
Stephen Birarda
fe2a5d6059 Merge pull request #12 from Atlante45/ess-pr 
Fix server script preload funcitons
 2017-01-18 16:44:07 -08:00
Atlante45
cbc69fbf9e Fix script preload functions 2017-01-18 16:42:25 -08:00
Brad Davis
1ef4ac9a6c Additional trace details for GPU timing, frame data updates 2017-01-18 16:19:32 -08:00
Atlante45
e94cccf08d Fix server script preload funcitons 2017-01-18 16:12:41 -08:00
Seth Alves
c4d85c91d0 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-01-18 15:51:54 -08:00
Seth Alves
49d8a644c3 Merge pull request #9432 from hyperlogic/tablet-ui 
Tablet improvements / bug fixes
 2017-01-18 15:49:14 -08:00
Seth Alves
3517daaad2 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-18 15:49:12 -08:00
Anthony J. Thibault
56c897cc2f Process the tablet stylus even when reticle is over 2d HUD overlay. 2017-01-18 15:36:09 -08:00
Anthony J. Thibault
bcd94203e6 Raised min fps of tablet overlay for smoother scrolling 2017-01-18 15:32:39 -08:00
Anthony J. Thibault
fc5c2c8def Fix for glitchy scrolling 2017-01-18 15:32:38 -08:00
Anthony J. Thibault
448e3fda0c fix for JSON parse exception 2017-01-18 15:32:37 -08:00
Anthony J. Thibault
28dac9d802 Lasers now interact with the tablet in edit mode. 2017-01-18 15:32:36 -08:00
Stephen Birarda
8dabf25c42 Merge pull request #11 from Atlante45/ess-pr 
Automatically query octree
 2017-01-18 15:21:25 -08:00
Atlante45
e15bf6bfb4 Automatically query octree 2017-01-18 15:15:29 -08:00
Clément Brisset
842692e99b Merge pull request #9 from birarda/entity-script-server 
ability to query without frustum only for entities with server scripts
 2017-01-18 15:14:02 -08:00
samcake
e3da6aa9f1 Removing the comment 2017-01-18 15:03:31 -08:00