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

38655 commits

This branch
This branch
All branches
Author SHA1 Message Date
Howard Stearns
b08f364447 yes! 2016-02-07 18:29:10 -08:00
Howard Stearns
e52b910e53 connectionTest 2016-02-07 16:39:29 -08:00
Howard Stearns
b6472217c4 Clear accepted/bestPromise .winner when disconnected. 2016-02-07 16:08:40 -08:00
Howard Stearns
8b27b90566 Verify validId before reporting a winning reponse to a proposal. 2016-02-07 14:57:29 -08:00
Howard Stearns
1a0017900c noisy connectionTest 2016-02-07 14:10:55 -08:00
Howard Stearns
8f714980df debuggable 2016-02-07 13:49:46 -08:00
Howard Stearns
7b39700136 one ring to rule 2016-02-07 13:33:21 -08:00
Howard Stearns
dc50efe7ec final? 2016-02-07 10:42:43 -08:00
Howard Stearns
287d91d4b2 better 2016-02-03 20:57:35 -08:00
Howard Stearns
055de61ec6 update 2016-02-03 11:10:04 -08:00
Howard Stearns
59f1cdfc18 Reinit bestPromise with each proposal. 2016-02-02 16:18:33 -08:00
Howard Stearns
03244fbeb5 fix promise-sending. 2016-02-02 15:37:22 -08:00
Howard Stearns
fbcacbe14a simpler betterNumber test. 2016-02-02 14:31:32 -08:00
Howard Stearns
3d01b3ec2b watchdog 2016-02-02 14:15:03 -08:00
Howard Stearns
61393818fe Merge branch 'master' of https://github.com/highfidelity/hifi into virtualBaton 2016-02-02 13:41:54 -08:00
Howard Stearns
38443af437 typo 2016-02-02 13:36:40 -08:00
Howard Stearns
cdff3323fb typo 2016-02-02 13:25:42 -08:00
Howard Stearns
d0af2220dc Virtual baton. 2016-02-02 13:20:41 -08:00
Ryan Huffman
759b1a347c Merge pull request #7015 from birarda/audio-mute-crash 
rename canAdjustLocks to isAllowedEditor, add debug for crash
 2016-02-02 13:12:06 -08:00
James B. Pollack
43bf7cf679 Merge pull request #7014 from huffman/disable-edit-grid 
Disable gridTool in edit.js
 2016-02-02 11:44:46 -08:00
Stephen Birarda
79dc2d5d55 add some debug for mute environment crash 2016-02-02 11:40:15 -08:00
Ryan Huffman
57d92bcfa6 Stop creation of GridTool altogether in edit.js 2016-02-02 10:13:24 -08:00
Ryan Huffman
dad36b73fc Disable gridTool in edit.js 2016-02-02 09:57:52 -08:00
Andrew Meadows
ee96341380 Merge pull request #7001 from imgntn/masterOffsets 
Update reset scripts to use new offset style
 2016-02-02 08:25:32 -08:00
Andrew Meadows
e394f64540 Merge pull request #6991 from seefo/master 
Added camera sensitivity dialog preferences
 2016-02-02 08:22:45 -08:00
James B. Pollack
d25dbfff9f Merge pull request #6993 from hyperlogic/tony/mirrored-doppelganger 
doppelganger.js: mirror joint rotations & translations about x-axis
 2016-02-01 19:09:42 -08:00
James B. Pollack
8a70e53131 Merge pull request #7004 from jherico/qml 
Small QML fixes
 2016-02-01 19:08:38 -08:00
Bradley Austin Davis
4860c7d4f1 Give title to tool window 2016-02-01 18:28:23 -08:00
Bradley Austin Davis
aecf582593 Don't crash on GL error in present thread 2016-02-01 18:26:32 -08:00
James B. Pollack
43844dd0be Merge pull request #7008 from ericrius1/editPropsDecimals 
Fixed bug where lack of 0 as prefix for numbers would throw an error
 2016-02-01 17:35:44 -08:00
Seth Alves
8d8e3520d5 Merge pull request #7007 from samcake/hdr 
Fixing the darkening rendering bug
 2016-02-01 16:46:32 -08:00
Stephen Birarda
095f0b9349 rename canAdjustLocks to isAllowedEditor for multi-purpose 2016-02-01 16:46:11 -08:00
ericrius1
1387f5f322 Fixed bug where lack of 0 as prefix for numbers would throw an error 2016-02-01 16:44:55 -08:00
samcake
e645f8a1f1 FIxing the rendering bug, current zone enity lighting and skybox were not applied anymore 2016-02-01 16:25:55 -08:00
Brad Davis
1d4dc636af Merge pull request #7002 from hyperlogic/tony/qml-overlay-delete-fix 
QmlOverlay: Fix for issue use after delete
 2016-02-01 16:03:58 -08:00
Brad Davis
3fcea102ed Remove unused variable 2016-02-01 16:03:47 -08:00
Philip Rosedale
fb9df717b6 Merge pull request #7005 from sethalves/grab-user-controller-rotation 
use controller hand rotation rather than IK hand rotation in grab script
 2016-02-01 15:47:55 -08:00
Anthony J. Thibault
bea5ced3eb QmlOverlay: remove unnecessary capture by value sigil from lambda 2016-02-01 15:46:49 -08:00
Anthony J. Thibault
db5e750fd7 Removed debug code 2016-02-01 15:45:57 -08:00
Seth Alves
3209ac4f68 use controller hand rotation rather than IK hand rotation in grab script 2016-02-01 15:42:32 -08:00
Bradley Austin Davis
c71a20b2f0 Move a QML window to the center of the desktop if it's completely off 2016-02-01 15:34:13 -08:00
Bradley Austin Davis
4393a754e2 File dialog polish 2016-02-01 15:34:10 -08:00
Bradley Austin Davis
9da0181b72 Don't try to be clever with coloring table rows 2016-02-01 15:34:07 -08:00
Bradley Austin Davis
093ccb483d FontAwseome button polish 2016-02-01 15:34:04 -08:00
Bradley Austin Davis
4b9e5746cd Removing some runtime warnings about null values 2016-02-01 15:34:01 -08:00
Bradley Austin Davis
7938270802 Fix modal frame decoration 2016-02-01 15:33:58 -08:00
Eric Levin
5b905402d5 Merge pull request #6992 from imgntn/cellscience 
Add and Update CellScience Environment
 2016-02-01 15:26:50 -08:00
James B. Pollack
bad6a15f09 light update 2016-02-01 14:48:17 -08:00
Anthony J. Thibault
64b56207f2 QmlOverlay: Fix for issue use after delete 
Sometimes, it was possible to set the qmlElement bounds AFTER the qmlElement itself was deleted on another thread.
To fix this we use a shared_ptr to hold the qmlElement, then use a weak_ptr in the setProperties lambda, to verify that the qmlElement still exists.

The script that was previously causing this code to fail is: "users.js".
Because, it creates a textSizeOverlay then immediately deletes it.
 2016-02-01 14:20:29 -08:00
samcake
1b52d700a0 Merge pull request #6871 from Atlante45/feat/draw-call-info 
Unify normal and named draw paths
 2016-02-01 14:19:15 -08:00