ZappoMan
2bcad6ab2b
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/src/Agent.cpp
examples/editModels.js
2014-08-28 21:19:56 -07:00
Atlante45
1acce5c725
fix sitting points on domain switch
2014-08-25 18:02:30 -07:00
ZappoMan
58759d344f
cleanup in prep for PR
2014-08-25 10:56:43 -07:00
Atlante45
4922592cfa
Debug tweaks
2014-08-20 15:21:33 -07:00
AndrewMeadows
86aa9a1dcf
Merge pull request #3289 from ctrlaltdavid/19840
...
Code Review for Job #19840
2014-08-18 15:05:26 -07:00
David Rowe
fbaeeef014
Merge branch 'master' into 19840
...
Resolved conflicts in editModels.js
2014-08-11 20:59:37 -07:00
Bennett Goble
b634f8d8c0
Merge branch 'master' into 19616
2014-08-03 14:08:09 -04:00
Bennett Goble
bd409f2de4
importVoxels() JS override: specify file and location
2014-08-03 14:01:37 -04:00
Ryan Huffman
aa1c9d88dd
Cleaup several qDebug calls and commented lines
2014-07-31 10:48:26 -07:00
Ryan Huffman
3e2bb0f168
Add more complete error handling for import/export models
2014-07-31 10:40:45 -07:00
Ryan Huffman
68f1ad79d6
Update clipboard call to exportModels to not scale to tree size
2014-07-31 01:14:07 -07:00
Ryan Huffman
521bf6023e
Implement pasteModels in Clipboard
2014-07-30 18:38:09 -07:00
David Rowe
ccf37c6c17
Fix text displayed on Window.form() directory button
2014-07-28 21:53:00 -07:00
David Rowe
49e0d07ac8
Add directory picker button option to JavaScript Window.form()
2014-07-25 20:32:44 -07:00
Ryan Huffman
d777e4be53
Merge branch 'master' of git://github.com/highfidelity/hifi into 19783
...
Conflicts:
interface/src/scripting/WindowScriptingInterface.cpp
interface/src/scripting/WindowScriptingInterface.h
2014-07-25 15:53:36 -07:00
David Rowe
eecdc2dc7b
Increase initial width of the edit fields in JavaScript Window.form()
2014-07-24 19:00:41 -07:00
David Rowe
040254a119
Add optional Cancel button to JavaScript Window.form()
2014-07-24 17:04:02 -07:00
Thijs Wenker
b6cb19c2f6
FEATURE: Allows detecting simulated cursors in JS, this allows JS-developers to track all cursors separately. By using the deviceID. (deviceID 0 = default mouse-cursor , 1500 and 1501 hydra cursors)
2014-07-23 16:55:59 +02:00
Atlante45
c07ba9fec5
Added browser as a tool
2014-07-17 17:50:56 -07:00
Atlante45
7ab8b5a843
Added S3 browser
2014-07-17 17:12:54 -07:00
Brad Hefta-Gaub
d8d6d08958
Merge pull request #3145 from samcake/19734
...
19734 - Leapmotion support
2014-07-17 08:45:55 -07:00
Atlante45
60f242118e
Code cleanup
2014-07-16 11:52:12 -07:00
Atlante45
f960b4fff3
new windows JS interface
2014-07-16 11:32:18 -07:00
samcake
c66560c1c0
Fix C++11 usage
...
- replace all the auto keyword by the proper type
kept the auto line in todo for reference :)
- silent a few warnings
2014-07-10 16:45:12 -07:00
samcake
c6e308bc87
fixes after first review
...
- lots of cleaning of the syntax to respect the coding standard
- Fixed the device tracker singleton for clean destruction
- introduced the Factory for the Leapmotion itstead of a naked
constructor
2014-07-09 15:52:57 -07:00
Ryan Huffman
874b542c0c
Add import/export/paste model functionality to editModels.js
2014-07-09 04:13:53 -07:00
samcake
d56ab21192
Clean file formating
...
- Clean the classes declaration and body for
DeviceTracker
MotionTracker
ControllerScriptingInterface / InputController
Leapmotion
- final bug remaining in the LeapOfFaith..js
THe orientation assigned to the skeleton joints doesn't work even though
all looks good.
2014-07-07 09:24:23 -07:00
samcake
a8b875d32e
Merge remote-tracking branch 'origin/LeapMotion' into 19734
2014-07-01 03:20:26 -07:00
samcake
3ce455aba4
Support for LeapMotion and worklist 19734
...
- Introduce the DeviceTracker class to abstract all the possible
devices
- Introduce the MotionTracker ( a DeviceTracker ) that contains a
transform tree of joints
- Add Leapmotion class as a MotionTracker and the support for the
Leapmotion sdk in external
- Add InputController as the abstraction of a MotionTracker/Joint for
Javascript
2014-07-01 03:15:26 -07:00
Stojce Slavkovski
591ab448a1
remove unused variable
2014-06-17 23:54:55 +02:00
Stojce Slavkovski
9824072300
remove unused parameter in AccountScriptingInterface::updateBalance
2014-06-17 23:51:02 +02:00
Stojce Slavkovski
939f8c49de
return balance in satoshis
2014-06-08 15:55:16 +02:00
Stojce Slavkovski
b3279e03ca
references fix
2014-06-07 23:27:51 +02:00
Stojce Slavkovski
8de2bdfb99
expose account details via AccountScriptingInterface
2014-06-07 23:17:49 +02:00
ZappoMan
22a8f88195
add support for Menu.menuExists() and menu.menuItemExists()
2014-05-31 13:24:07 -07:00
Andrzej Kapolka
a7234fd8d3
Stuff the joystick and position bits into the palms.
2014-05-16 12:10:21 -07:00
Andrzej Kapolka
c42368594d
Scratch that; going to shoehorn joystick data into palms.
2014-05-16 11:24:45 -07:00
Andrzej Kapolka
a544489f30
First cut at adding external joysticks to the mix.
2014-05-15 17:44:35 -07:00
Atlante45
4f93858849
Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_handling_in_editModels
2014-05-14 10:41:29 -07:00
Andrew Meadows
366e9c7d34
PalmDataA::getPalmDirection --> getNormal()
2014-05-14 09:05:54 -07:00
Atlante45
37700c6ad3
Fixed prompt size
2014-05-12 17:10:19 -07:00
Andrew Meadows
49dedb72c9
remove FingerData class and related cleanup
2014-05-12 11:09:12 -07:00
Ryan Huffman
5a5e628536
Add Window.browse to scripting environment
2014-05-01 10:51:58 -07:00
Ryan Huffman
a7dd19183e
Add default values for alert, confirm, and prompt
2014-04-30 19:02:28 -07:00
Ryan Huffman
8e63352d54
Fix Window.confirm() not working
2014-04-30 19:00:06 -07:00
Ryan Huffman
9a44b2b2fb
Remove unneeded include in WindowScriptingInterface
2014-04-30 09:40:50 -07:00
Ryan Huffman
b9f296ddb3
Add WindowScriptingInterface and LocationScriptingInterface
2014-04-30 09:38:30 -07:00
Atlante45
d6e7caa4db
Removed Debug
2014-04-18 16:02:01 -07:00
Stephen Birarda
ae4b8348a2
fix header include guards via regex
2014-04-09 12:03:17 -07:00
Stephen Birarda
684c6b5372
run regex header replacement on all cpp files
2014-04-09 09:35:42 -07:00
