Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 00:34:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
27148 commits 71 branches 56 tags 1.2 GiB
Commit graph

27148 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
cea9d969e3 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-26 10:43:39 -07:00
Brad Davis
8dcd91fdab Merge pull request #5192 from venkatn93/master 
Hyperlink tooltip and address bar remodel
 2015-06-26 10:28:52 -07:00
Andrew Meadows
2974b44dcd Merge pull request #5212 from sethalves/physics-lock-entity-tree 
lock entity-tree during physics operations which access entity-tree
 2015-06-26 09:45:06 -07:00
Stephen Birarda
81770cfeb2 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-26 08:49:20 -07:00
Seth Alves
015498a6e0 move function up so this builds in non-debug mode 2015-06-26 07:20:22 -07:00
Seth Alves
2682c4720d fix alt-branch of ifdef 2015-06-26 07:04:10 -07:00
Howard Stearns
ce1e67b55a Merge pull request #5179 from DaveDubUK/walk-1.25 
walk.js version 1.25
 2015-06-26 07:02:09 -07:00
Seth Alves
a0d77c061c lock the entity tree during physics operations that access then entity tree. if the simulation and entity-tree are both going to be locked, be sure to lock the entity tree first (and unlock it last), because this is what the network-reading thread does 2015-06-26 07:00:28 -07:00
Brad Hefta-Gaub
63812f28ad Merge pull request #5206 from SamGondelman/cameraMode 
fix bug that was preventing camera mode switches
 2015-06-25 18:55:13 -07:00
Stephen Birarda
a77cf4fb7f fix audio-mixer shutdown on UNIX/OS X 2015-06-25 16:34:38 -07:00
Niraj Venkat
23f4f7d824 Place name is underlined 2015-06-25 15:56:40 -07:00
Niraj Venkat
8ea01b45ae Word wrap implementation 2015-06-25 15:46:43 -07:00
Niraj Venkat
6b14a64c8c Formatting changes and teleport on click 2015-06-25 15:15:44 -07:00
Niraj Venkat
fec8318cfa Merge pull request #5208 from AlexanderOtavka/edit-js-properties 
Make hyperlink its own section in edit.js.
 2015-06-25 14:33:23 -07:00
Niraj Venkat
de26dc9c49 Further changes to tooltip 2015-06-25 14:15:06 -07:00
Niraj Venkat
210a1205a7 More layout changes 2015-06-25 14:07:03 -07:00
Sam Gondelman
56944afd39 avatar doesn't move in independent mode, alphabetized menu options 2015-06-25 12:36:36 -07:00
Zander Otavka
803f644edf Make hyperlink its own section in edit.js. 2015-06-25 11:40:09 -07:00
Niraj Venkat
1a6acdc5b7 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-25 09:39:13 -07:00
Philip Rosedale
60c10b7191 Merge pull request #5207 from ctrlaltdavid/saccades 
DO NOT MERGE - Back out saccade speed limit
 2015-06-25 09:17:40 -07:00
David Rowe
d38a5a1771 Back out saccade speed limit 2015-06-25 07:38:06 -07:00
DaveDubUK
ce31e586b0 fixed sounds. fixed constants 2015-06-25 12:40:51 +07:00
DaveDubUK
ececf68f06 Merge branch 'master' of https://github.com/highfidelity/hifi into walk-1.25 2015-06-25 12:15:07 +07:00
Brad Hefta-Gaub
6c4a4866d3 Merge pull request #5202 from Atlante45/overlay 
Overlay have correct bounds
 2015-06-24 19:00:55 -07:00
Brad Hefta-Gaub
77bbb23a1e Merge pull request #5175 from hyperlogic/ajt/first-person-avatar 
Render a different model when in first person view.
 2015-06-24 18:54:47 -07:00
Anthony J. Thibault
c480c85f85 Fixes for switching between fullAvatar and head & body avatars while in first person. 
Need to always add _skeletonModel to the main scene when switching to head/body avatar.
Need to always remove _firstPersonSkeletonModel from main scene when switching to head/body avatar.
 2015-06-24 17:35:23 -07:00
Niraj Venkat
be053cfdc7 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-24 17:33:57 -07:00
Clément Brisset
e05b4e3115 Merge pull request #5203 from howard-stearns/set-injector-options-from-script 
Set injector options from script
 2015-06-24 16:54:11 -07:00
Niraj Venkat
d89ff2f720 Merge pull request #5188 from AlexanderOtavka/master 
Improve address bar and edit.js entity properties list.
 2015-06-24 16:48:24 -07:00
Atlante45
bc1abbe9b2 Update scripts 2015-06-24 16:45:38 -07:00
Atlante45
55c490043f Restore InterfaceConfig.h includes 2015-06-24 16:13:42 -07:00
Atlante45
e3d22ef94b Fix overlays getBounds + code cleanup 2015-06-24 16:13:42 -07:00
Brad Hefta-Gaub
0269e1eff1 Merge pull request #5204 from huffman/toolbar-titlebar 
Add titlebar to toolbar and fix issue with draggable widgets not working (edit.js specifically)
 2015-06-24 16:12:39 -07:00
Anthony J. Thibault
71639a7466 Fix for switching avatars while mirror is not enabled. 
When the avatar is changed via set*URL, we need to set the associated model visibility appropriately.
This way when it gets added to the scene later in preRender, initWhenReady, it will render with the correct visibility settings.
 2015-06-24 16:10:47 -07:00
Anthony J. Thibault
3853395298 Bug fixes for switching between head/body and full body avatars 
The head model visibility is now updated in preRender()
Moved the near clip plane in a bit more
Invalidate head bone vector on LOD switching.
Removed _currentSkeletonModel pointer, instead use _prevShouldDrawHead to detect when we should flip the visibility bit.
 2015-06-24 16:10:47 -07:00
Anthony J. Thibault
b88d7c2e05 Added FIXME comment to preRender 2015-06-24 16:10:47 -07:00
Anthony J. Thibault
8f03ead74e Bug fix for two piece avatars. 
The head was not rendering
 2015-06-24 16:10:47 -07:00
Anthony J. Thibault
99a03bac21 Render a different model when in first person view. 
Currently this model is identical to the third person model, except
that the head bones have been 'cauterized' by applying a zero scale transform.
This allows us to set the near clip back to a reasonable value.
 2015-06-24 16:10:47 -07:00
Brad Hefta-Gaub
734a11e12a Merge pull request #5199 from jherico/scale_rez_fix 
Fixing misplaced UI on scale resolution
 2015-06-24 16:10:33 -07:00
Atlante45
85b2771c4a Extend Extents 2015-06-24 15:44:48 -07:00
Atlante45
233d92c315 Some code cleanup 2015-06-24 15:44:47 -07:00
Atlante45
31a98c5b40 Replace pos/rot by a transform in Base3DOverlay 
Also keep getBounds a pure virtual methods
 2015-06-24 15:44:47 -07:00
Atlante45
c22f1aa7e1 Overlay2D return correct getBounds 2015-06-24 15:44:46 -07:00
Atlante45
e8da8e374c Simplify Overlays payloadGetBounds 2015-06-24 15:44:46 -07:00
Atlante45
6bb21b7a48 Use dynamic_pointer_cast instead of static_cast 2015-06-24 15:44:45 -07:00
Brad Hefta-Gaub
1cb7d0c1a5 Merge pull request #5194 from jherico/qml_warnings 
Removing qml warnings
 2015-06-24 15:42:36 -07:00
Clément Brisset
6db4184748 Merge pull request #5171 from huffman/fix-edit-rotate 
Fix edit.js rotation display
 2015-06-24 15:35:15 -07:00
Ryan Huffman
1ccd72d01e Revert "Disable edit.js rotation text overlay temporarily" 
This reverts commit b9ecff02f9.
 2015-06-24 15:32:32 -07:00
Sam Gondelman
19ec080e2b Merge with master 2015-06-24 15:04:03 -07:00
Philip Rosedale
0bef506be2 Merge pull request #5190 from jherico/mirror_zoom 
Mirror zoom
 2015-06-24 14:43:14 -07:00