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

47074 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony J. Thibault
f76dbeeffd Edit.js now works with new ignoreIK default 2016-10-11 17:12:02 -07:00
Anthony J. Thibault
7c7a9055d1 Allow grabbed objects to override the ignoreIK = true default. 
They can do this by adding the following to their userData.

    grabbableKey: {
        ignoreIK: false
    }

When this is present and false, the object will follow the hand joint, otherwise it will follow the hand controller.
 2016-10-07 14:50:00 -07:00
Anthony J. Thibault
0c2ebc27cb Fix for exception in handControllerGrab.js 
Specifically this:
    [UncaughtException] TypeError: Result of expression 'this.handToController' [undefined] is not a function. in file:///C:/msys64/home/anthony/code/hifi/build/interface/Release/scripts/defaultScripts.js:1388
 2016-10-07 14:48:55 -07:00
Howard Stearns
a170436c8c Merge pull request #8754 from howard-stearns/init-script-update-time 
init the accumulator for script elapsed time
 2016-10-07 10:10:16 -07:00
Howard Stearns
3a294e77d4 Merge pull request #8745 from huffman/feat/new-help-window 
Update the help window
 2016-10-07 10:01:47 -07:00
Ryan Downe Karpf
ed2571704f Merge pull request #8735 from huffman/feat/teleport-improvements 
Update teleport.js to ignore invisible or collisionless objects and disallow teleporting to  certain surfaces
 2016-10-07 09:56:30 -07:00
howard-stearns
6cae62f584 init the accumulator for script elapsed time 2016-10-07 09:38:30 -07:00
David Kelly
ab6ccac631 Merge pull request #8741 from howard-stearns/kill-agents 
kill agents in avatar mixer when they stop being avatars
 2016-10-07 09:16:49 -07:00
Seth Alves
f1f8f6323a Merge pull request #8674 from ctrlaltdavid/21055 
HMD keyboard
 2016-10-07 06:21:36 -07:00
Brad Hefta-Gaub
b1cd553074 Merge pull request #8752 from huffman/fix/script-resolve 
Fix script paths not resolving correctly
 2016-10-06 18:55:57 -07:00
David Rowe
a1458a26fd Merge branch 'master' into 21055 
Conflicts:
	libraries/gl/src/gl/OffscreenQmlSurface.cpp
	libraries/gl/src/gl/OffscreenQmlSurface.h
 2016-10-07 14:44:23 +13:00
Brad Hefta-Gaub
b0c2bda898 Merge pull request #8743 from jherico/qml_threading 
Remove QML threaded rendering
 2016-10-06 17:46:12 -07:00
Ryan Huffman
bbd7174d06 Fix script paths not resolving correctly 2016-10-06 17:37:47 -07:00
David Rowe
bdff71151d Updates from code review 2016-10-07 13:35:44 +13:00
Chris Collins
8310a9fe8a Merge pull request #8730 from huffman/feat/script-req-retry 
Add retrying of script requests
 2016-10-06 16:09:04 -07:00
Seth Alves
a5de9cc106 Merge pull request #8742 from sethalves/ac-client 
AC test client
 2016-10-06 15:35:54 -07:00
David Rowe
e2e762f9e7 Merge branch 'master' into 21055 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
 2016-10-07 11:27:35 +13:00
Ryan Downe Karpf
877d62069e Merge pull request #8750 from ctrlaltdavid/21066 
QA READY: Improve address bar address entry
 2016-10-06 14:45:25 -07:00
David Rowe
b6221a5f83 Fix clearing address bar after navigating using picture card 2016-10-07 09:45:34 +13:00
Ryan Huffman
a74b8f3f24 Update help window images 2016-10-06 13:37:56 -07:00
Ryan Huffman
508950841b Adjust the img size in help.html 2016-10-06 13:22:59 -07:00
Ryan Huffman
e59069fe35 Update help window images 2016-10-06 13:00:07 -07:00
Chris Collins
aecf71a0d0 Merge pull request #8729 from huffman/feat/atp-set-mapping 
Add setMapping to ATP scripting interface and fix threading bug
 2016-10-06 11:46:19 -07:00
Chris Collins
73e29c03ab Merge pull request #8728 from huffman/feat/unequip-using-grab 
Trigger unequip at a more lenient angle and with the secondary trigger
 2016-10-06 10:30:54 -07:00
Chris Collins
14f8fb7c90 Merge pull request #8664 from huffman/fix/script-resolve-path 
Fix ScriptEngine not properly resolving paths
 2016-10-06 10:13:44 -07:00
Chris Collins
583332d502 Merge pull request #8734 from huffman/feat/allow-editing-unknown-entities 
Update entity scripting interface to allow modifications to unknown e…
 2016-10-06 09:51:35 -07:00
Chris Collins
328ac71f8b Merge pull request #8739 from kencooke/audio-fixes3 
Fix 16khz support and hot-unplugging audio devices
 2016-10-06 09:46:51 -07:00
Chris Collins
80ecf88935 Merge pull request #8731 from huffman/feat/interface-run-server 
Add flag to interface to have it start the sandbox server
 2016-10-06 09:18:41 -07:00
Ryan Huffman
246a816b80 Update help window tabs to activate on mouse down instead of up 2016-10-05 22:54:39 -07:00
David Rowe
1ee9317234 Fix clearing address and cursor upon address bar closing 2016-10-06 17:00:25 +13:00
David Rowe
a347936b68 Fix location not being updated after using back and forwards buttons 2016-10-06 16:47:49 +13:00
David Rowe
2807f76e68 Fix semantics of function parameter 2016-10-06 15:49:16 +13:00
Seth Alves
7b5106afd8 Merge branch 'possible-fix-for-domain-server-crash' of github.com:sethalves/hifi into ac-client 2016-10-05 19:36:59 -07:00
Ryan Huffman
4171fdd2e1 Remove extraneous log line from AssetRequest 2016-10-05 19:27:24 -07:00
Ryan Huffman
4901f386ca Remove unused property in ScriptCache 2016-10-05 19:25:41 -07:00
Ryan Huffman
17a1f9b5ae Make timer child of QObject instead of attaching to destroyed 2016-10-05 19:25:17 -07:00
Ryan Huffman
bba5a7563f Remove extraneous logging 2016-10-05 19:25:03 -07:00
David Rowe
742e603fd6 Show cursor if user clicks in address bar 2016-10-06 15:21:08 +13:00
David Rowe
7d23cd7c7c Don't show cursor until after have started entering an address 2016-10-06 15:19:58 +13:00
David Rowe
b70eac353b Enable address entry by typing without clicking in address bar 2016-10-06 15:18:07 +13:00
Ryan Huffman
42b0d8230c Move extract/encode enitty functions in ScriptEngine 2016-10-05 19:14:42 -07:00
Seth Alves
f338e38bcf oops 2016-10-05 16:25:00 -07:00
Clément Brisset
808419d988 Merge pull request #8740 from AndrewMeadows/fix-physics-unit-tests 
fix CMAKE warning about un-unit-testable CPP file in physics unit tests
 2016-10-05 16:22:26 -07:00
Seth Alves
0510411ac1 fix timer use 2016-10-05 16:19:39 -07:00
Chris Collins
bc6797fc3a Merge pull request #8733 from zzmp/fix/audio-channel-swap 
fix intermittent channel swapping
 2016-10-05 15:54:25 -07:00
Ryan Huffman
0e3e2b8a9a Update date in help.html 2016-10-05 15:50:49 -07:00
Ryan Huffman
df09254437 Fix EntityItemID not being converted to string in ScriptEngine 2016-10-05 15:45:54 -07:00
Seth Alves
785d67b87a remove redundant addHelpOption 2016-10-05 15:25:45 -07:00
Andrew Meadows
e46c15401a take care for division by zero when normalizing 2016-10-05 15:00:22 -07:00
Seth Alves
86a3190385 on failure, print names of servers that didn't connect 2016-10-05 14:45:32 -07:00