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

131 commits

Author SHA1 Message Date
Atlante45
4d1529f77b typedefs 2014-12-16 14:02:22 -08:00
Atlante45
e5e2eb4e8a Moved GLCanvas in DM and DM to QSharedPointers 2014-12-15 16:20:52 -08:00
Atlante45
25df784f43 Headers cleanup 2014-12-15 10:56:42 -08:00
ZappoMan
74a6fd5ca7 fix joystick pick 2014-12-09 20:03:00 -08:00
Atlante45
88a576f846 fix action events for gamepad; 2014-12-09 19:35:38 -08:00
Atlante45
7026af7b9a Centrilized Oculus interference in pickRay 2014-12-04 17:26:14 -08:00
Stojce Slavkovski
cc487d76ca Merge branch 'master' of https://github.com/highfidelity/hifi into 20170 
Conflicts:
	examples/libraries/entityPropertyDialogBox.js
 2014-11-15 09:50:09 +01:00
Ryan Huffman
604b1b620b Move dock window to ToolWindow 2014-11-14 10:52:08 -08:00
Ryan Huffman
3658d65028 Remove grid tool from menu 2014-11-13 20:02:19 -08:00
Ryan Huffman
6b2a497810 Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-grid-fixes 2014-11-13 17:48:17 -08:00
Ryan Huffman
03f155bcd8 Add tool window 2014-11-13 17:47:02 -08:00
Ryan Huffman
55612cc596 Add title to WebWindowClass 2014-11-13 17:46:20 -08:00
Stephen Birarda
f9aed39352 don't try to open a joystick if controller is NULL 2014-11-11 18:17:24 -08:00
Ryan Huffman
bedd9c76f2 Merge branch 'master' of github.com:highfidelity/hifi into entity-grid-tool 
Conflicts:
	examples/newEditEntities.js
 2014-11-11 10:48:49 -08:00
Ryan Huffman
3ec28f8e30 Add WindowScriptingInterface::doCreateWebWindow 2014-11-11 10:15:16 -08:00
Ryan Huffman
a1d771a0be Rename WebWindow to WebWindowClass 2014-11-11 10:03:14 -08:00
Ryan Huffman
bd61eba664 Remove unused include 2014-11-11 10:00:28 -08:00
Ryan Huffman
3e109ee770 Add WebWindow widget for scripts 2014-11-06 14:57:04 -08:00
Stojce Slavkovski
06da1bd566 add checkbox support in scripting interface 2014-11-06 20:41:08 +01:00
Brad Hefta-Gaub
583b7b1267 Merge pull request #3732 from thoys/20166 
CR for Job #20166 - Extend AudioDeviceScriptingInterface to have muted property and mute event
 2014-11-04 15:51:05 -08:00
Stephen Birarda
f53455ee55 use a ray from the near clip for action ray 2014-11-04 11:40:47 -08:00
Stephen Birarda
8d6b041758 send a pick ray with HFActionEvent, not x,y 2014-11-04 10:01:25 -08:00
Thijs Wenker
af74fc09b9 Adds AudioDevice mute functionality to ScriptEngine 2014-11-01 02:42:22 +01:00
Stephen Birarda
27f7cdb2d4 handle location set/get in AddressManager, handle set to address map 2014-10-28 10:35:56 -07:00
Stephen Birarda
cb7a6cb93c Merge branch 'master' of https://github.com/highfidelity/hifi into lobby 2014-10-28 08:40:20 -07:00
Stephen Birarda
bb652c0784 rename signal in AbstractControllerScriptingInterface from cancel to back 2014-10-27 16:01:39 -07:00
Stephen Birarda
8e6b6d5294 have controller A button fire action at center of screen 2014-10-27 15:58:42 -07:00
Stephen Birarda
8a9f2d172a rename HFCancelEvent to HFBackEvent, fire from joystick 2014-10-27 15:51:59 -07:00
Stephen Birarda
7b5115c35f add a new meta event, HFCancelEvent 2014-10-27 15:37:31 -07:00
Stephen Birarda
c3fe7c7497 send global HFActionEvent from ControllerScriptingInterface 2014-10-27 15:21:47 -07:00
Stephen Birarda
d38dd2c53a repairs for recursive source files, move HF meta events to SE 2014-10-27 14:18:23 -07:00
David Rowe
0fdcf381fa Code tidy 2014-10-25 09:23:37 -07:00
Atlante45
4a3f72ab0b Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-14 15:13:50 -07:00
NextPrior
a0a5530641 Initial reverb implementation 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Audio.cpp
	interface/src/Audio.h
	libraries/script-engine/src/ScriptEngine.cpp
 2014-10-13 18:13:51 -07:00
Clément Brisset
f6f187e7f0 Merge pull request #3587 from ctrlaltdavid/20101 
CR for Job #20101 - Upload model file function is broken
 2014-10-13 16:16:49 -07:00
David Rowe
c6bf09f509 Fix model uploading for the case that haven't uploaded model before 2014-10-13 08:35:52 -07:00
Ryan Huffman
42479b1ae2 Add joystickWithName for PrioVR 2014-10-10 18:03:08 -07:00
Ryan Huffman
762cc71d31 Update to SDL2 2014-10-10 17:03:10 -07:00
Stephen Birarda
17b9f4a37d allow a call to Joysticks.reset to reset SDL while interface is running 2014-10-08 11:34:45 -07:00
Stephen Birarda
f27105100a have AddressManager know its current domain and current path 2014-10-03 10:29:02 -07:00
Thijs Wenker
fd21d100f6 line indention fixes 2014-09-30 22:37:29 +02:00
Thijs Wenker
7f34079d8f cleared comment 2014-09-30 22:31:41 +02:00
Thijs Wenker
eed6e2e8f6 - Edit -> Model List menu option 
- Combo items can be JS objects now, write a toString() function for each JS object to describe them
 2014-09-30 22:11:21 +02:00
ZappoMan
cbc502553b add rescale support to entity properties UI 2014-09-26 16:25:24 -07:00
Brad Hefta-Gaub
712f88baa3 Merge pull request #3476 from birarda/xbox-controller 
add script support for general SDL controllers
 2014-09-25 09:25:08 -07:00
Stephen Birarda
3ab24d6ea5 add a missing HAVE_SDL block 2014-09-24 11:59:44 -07:00
Stephen Birarda
875c1dba72 change name in header comment to match new class name 2014-09-24 08:40:39 -07:00
Stephen Birarda
00b0806c4d move JoystickManager to JoystickScriptingInterface, add Joystick class for SDL Joystick 2014-09-23 17:09:46 -07:00
Stephen Birarda
900daf48eb initial working connection of an xbox gamepad 2014-09-23 14:48:44 -07:00
Stephen Birarda
e5a54116dc correctly return empty string for domain ID if it is null 2014-09-22 15:00:07 -07:00