Brad Davis
d924e042bc
Merge pull request #6834 from ZappoMan/hmdFixes
...
fix issues with HMD lookout 2D, and cleanup
2016-01-14 12:42:23 -05:00
Brad Hefta-Gaub
6b76cf484d
fix issues with HMD lookout 2D, and cleanup
2016-01-14 08:48:55 -08:00
Andrew Meadows
82e261480f
Merge pull request #6827 from howard-stearns/physics-timing
...
Physics timing
2016-01-14 08:39:29 -08:00
Brad Hefta-Gaub
8f8afabbfe
Merge pull request #6811 from Atlante45/master
...
Fix skybox not always rendering correctly
2016-01-13 21:00:48 -08:00
howard-stearns
830dcb582a
Merge branch 'master' of https://github.com/highfidelity/hifi into physics-timing
2016-01-13 13:32:38 -08:00
howard-stearns
8a77e2ee95
Split physics perf timing into three parts: updateStates, stepSimulation,
...
and harvestChanges.
2016-01-13 13:31:37 -08:00
Atlante45
205c14eb43
Remove unused headers
2016-01-13 11:47:43 -08:00
Atlante45
11dc3cd261
Move primitive rendering out of DeferredLightingEffect
2016-01-13 11:47:43 -08:00
Atlante45
12f9091dc1
Fix doInBatch lambdas
2016-01-13 11:47:43 -08:00
Atlante45
0008b1a055
Code cleanup
2016-01-12 20:49:25 -08:00
Andrew Meadows
e1ba4ff0a8
add CollisionMask entity property
2016-01-12 15:08:52 -08:00
Brad Hefta-Gaub
cd167e43fb
Merge pull request #6812 from jherico/running_scripts
...
Running scripts in QML
2016-01-12 13:40:47 -08:00
Howard Stearns
d1a72e8d63
Merge pull request #6807 from hyperlogic/tony/grab-script-hand-animation
...
Move hand animation control into grab script
2016-01-12 13:02:59 -08:00
Brad Davis
dcc6739bce
Final functionality for running scripts
2016-01-12 12:40:46 -08:00
Brad Davis
21534cbde0
Layout for running scripts
2016-01-12 12:40:42 -08:00
Brad Hefta-Gaub
4c98c3a7a5
Merge pull request #6815 from ctrlaltdavid/20773
...
Resume Interface in 1st person if exit in 1st person
2016-01-12 12:05:12 -08:00
Brad Hefta-Gaub
8619be28ef
Merge pull request #6816 from ctrlaltdavid/20772
...
Don't use cache when use load script "from Disk" button
2016-01-12 11:46:41 -08:00
Brad Hefta-Gaub
5b9607ca29
fix merge
2016-01-12 10:36:59 -08:00
Brad Hefta-Gaub
6ac9b737d2
Merge branch 'master' of https://github.com/highfidelity/hifi into fixCrashRedux
...
Conflicts:
interface/src/Application.cpp
2016-01-12 10:35:24 -08:00
Brad Hefta-Gaub
5ec5ff9ad0
temporary fix to crash on startup
2016-01-12 09:11:20 -08:00
David Rowe
71ed8d2a64
Change camera to first person if start up with it in camera entity mode
...
Same as happens if start up with camera in independent mode.
2016-01-12 17:39:39 +13:00
David Rowe
92d63c48dd
Resume Interface in 1st person if exited in 1st person
2016-01-12 17:38:16 +13:00
David Rowe
74515f9089
Don't use cache when user loads script from disk
2016-01-12 16:09:40 +13:00
Zach Pomerantz
801dde7950
Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape
2016-01-11 16:38:04 -08:00
Brad Davis
d1d178787c
PR comments
2016-01-11 12:55:23 -08:00
Brad Davis
d28f80aa07
Moving running scripts functionality to scripting library
2016-01-11 12:44:03 -08:00
Brad Hefta-Gaub
dfba05ae5f
CR feedback
2016-01-11 11:07:07 -08:00
Anthony J. Thibault
8f78a0624c
Merge branch 'master' into tony/grab-script-hand-animation
2016-01-11 10:16:51 -08:00
Zach Pomerantz
c8d3342aca
Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape
2016-01-08 17:04:02 -08:00
Brad Hefta-Gaub
e2a3903def
add support for advanced/developer plugins and change diplay modes to match spec
2016-01-08 16:58:25 -08:00
Brad Hefta-Gaub
e70be2d8fe
more menu rework
2016-01-08 11:58:13 -08:00
Brad Hefta-Gaub
0f52b82c21
allow scripted addMenu() to specify grouping
2016-01-08 11:21:37 -08:00
Anthony J. Thibault
cac19b8579
grab animation work
...
Hand animations now have 5 states:
* idle
* open
* grasp
* point
* farGrasp
The handControllerGrab.js script now chooses one of these five animations, based on the state of the HandController object.
Also, removed hand trigger AnimVar setting from C++ Rig class.
2016-01-07 19:36:57 -08:00
Anthony J. Thibault
7bef1ebdac
Merge remote-tracking branch 'upstream/master' into tony/soft-avatar-attachment-script
2016-01-07 16:14:52 -08:00
Anthony J. Thibault
031f59b7b5
Support for adding soft attachments from script.
...
Also, bug fixes for setting MyAvatar.attachmentData property.
2016-01-07 16:12:36 -08:00
Brad Davis
3a7ec33d38
Merge pull request #6790 from ZappoMan/menuGroups
...
Menu restructuring
2016-01-07 17:48:20 -05:00
Brad Hefta-Gaub
45b85735d3
disable the not yet implemented menu items
2016-01-07 14:37:42 -08:00
Brad Hefta-Gaub
e9ec561a55
add separator in View menu
2016-01-07 14:28:44 -08:00
Brad Hefta-Gaub
cdc982c6e5
mini mirror off by default
2016-01-07 14:22:20 -08:00
Brad Hefta-Gaub
a8383238e4
make mini mirror a standard option
2016-01-07 13:46:55 -08:00
Philip Rosedale
c5ab29071e
Merge pull request #6791 from jherico/qml_hang
...
Stop QML hanging the app on shutdown
2016-01-07 13:29:47 -08:00
Brad Hefta-Gaub
04a5f5ce1b
remove dead code for friends, since its handled by users.js
2016-01-07 13:26:03 -08:00
Brad Hefta-Gaub
d51f514281
reworking of view/camera mode to match spec
2016-01-07 12:42:18 -08:00
Brad Davis
660304a0a3
Stop QML hanging the app on shutdown
2016-01-07 12:25:25 -08:00
Brad Hefta-Gaub
1508a637ab
Menu restructuring
2016-01-07 12:09:02 -08:00
Seth Alves
bc538a0f7d
Merge pull request #6756 from AndrewMeadows/physics-cleanup-003
...
more correct management of MotionState pointers
2016-01-07 11:04:28 -08:00
Andrew Meadows
8ae1e750ab
Merge pull request #6783 from sethalves/fix-h0ld-action
...
try harder to ensure that a held object is active in bullet
2016-01-07 10:53:55 -08:00
Andrew Meadows
36e19b43c9
add some comments; specify const and overrides
2016-01-07 10:19:46 -08:00
Andrew Meadows
c1206ca73d
fix bad merge
2016-01-07 10:19:46 -08:00
Andrew Meadows
e0ec941476
fix typo
2016-01-07 10:19:46 -08:00
