Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 10:18:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
37170 commits 25 branches 0 tags 1.1 GiB
Commit graph

15312 commits

Author SHA1 Message Date
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
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
Brad Hefta-Gaub
3e05d95478 Merge branch 'master' of https://github.com/highfidelity/hifi into menuGroups 2016-01-11 09:09:37 -08:00
David Rowe
9068d55998 Fix display of File > About Interface window 2016-01-11 15:58:00 +13:00
Brad Davis
d74686474a Ensure VR menus never render off the overlay 2016-01-10 11:39:47 -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
Seth Alves
8e199e0457 Merge pull request #6794 from hyperlogic/tony/soft-avatar-attachment-script 
Added avatarAttachmentTest.js script
 2016-01-07 16:41:41 -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
35e17b7604 movable audio bar 2016-01-07 15:43:51 -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
Philip Rosedale
3e8f26d591 Merge pull request #6789 from jherico/url_loop 
Stop looping on URL fixing
 2016-01-07 13:10:54 -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
Brad Davis
144af19ebd Stop looping on URL fixing 2016-01-07 10:52:28 -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
Andrew Meadows
6a642bdcf8 fix misusage of smart-pointers 2016-01-07 10:19:46 -08:00
Andrew Meadows
6eb177091b overhaul of MotionState cleanup 
Moved MotionState deletes out of PhysicsEngine.
EntityMotionStates are deleted by the PhysicsEntitySimulation.
AvatarMotionStates are deleted in the Avatar dtor.
 2016-01-07 10:19:46 -08:00
Andrew Meadows
534bfa5983 remove dangling whitespace 2016-01-07 10:19:46 -08:00
Brad Hefta-Gaub
a78d5274e7 Merge pull request #6780 from jherico/z_order 
Address some z-ordering issues in overlay windows
 2016-01-06 20:08:52 -08:00
Atlante45
e59397a97a Merge branch 'master' of https://github.com/highfidelity/hifi into fix/skybox 2016-01-06 18:56:58 -08:00
Clément Brisset
447f2f6361 Merge pull request #6785 from ZappoMan/fixWarnings 
fix warnings
 2016-01-06 18:56:26 -08:00
Atlante45
3effa9d5e1 Fix skybox rendering 2016-01-06 17:03:29 -08:00
Brad Hefta-Gaub
335ab3c501 fix warnings 2016-01-06 15:24:52 -08:00
Seth Alves
b873d92469 try harder to ensure that a held object is active in bullet 2016-01-06 14:12:58 -08:00
Andrew Meadows
b8b113844f reduced avatar max fly speed from 300 to 30 2016-01-06 11:22:58 -08:00
Brad Davis
44b9bc7115 Force active focus on the address bar line while address bar is visible 2016-01-06 11:10:05 -08:00
Brad Davis
1b82200ecb Address some z-ordering issues in overlay windows 2016-01-06 10:58:56 -08:00
Anthony Thibault
95f821d61a Merge pull request #6732 from sethalves/set-model-entity-joints 
hook up a way for scripts to set model-entity joint state
 2016-01-05 17:31:18 -08:00
Zach Pomerantz
444a014252 Delay renderEngine init for GLBackend init 2016-01-05 17:20:08 -08:00
Andrew Meadows
9ab5ef358a remove dangling whitespace 2016-01-05 16:44:36 -08:00
Seth Alves
b59934573a Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-05 13:50:12 -08:00