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

12609 commits

Author SHA1 Message Date
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
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
Ryan Huffman
4df1bea4ec Merge pull request #5167 from SamGondelman/hmdControls 
hmdControls.js for movement when wearing an HMD
 2015-06-24 14:40:31 -07:00
Philip Rosedale
b7c64ef246 Merge pull request #5193 from SamGondelman/master 
hydra dead zone to prevent drifting
 2015-06-24 13:52:48 -07:00
Andrew Meadows
1ceed98ca2 Merge pull request #5166 from jherico/64bit 
Enable Windows 64 bit builds
 2015-06-23 17:03:42 -07:00
Zander Otavka
05b668484c Change address bar back/forward button color. 2015-06-23 16:41:15 -07:00
Brad Davis
fb2fb06371 Fixing misplaced UI on scale resolution, PC edition 2015-06-23 15:42:32 -07:00
Ryan Huffman
8a1f446f05 Fix textoverlay3d text position 2015-06-23 14:43:41 -07:00
Niraj Venkat
0c2e208044 Added basic layout to tooltip QML 2015-06-23 13:54:19 -07:00
Sam Gondelman
778e19ac11 fixed camera mode issue 2015-06-23 11:45:08 -07:00
Brad Davis
da031b039c Removing qml wanrings 2015-06-23 10:58:52 -07:00
Sam Gondelman
c1fdbeb3b4 hydra dead zone to prevent drifting 2015-06-23 10:52:44 -07:00
Ryan Huffman
3e576fea92 Remove vertical scaling from Text3DOverlay 2015-06-23 10:27:01 -07:00
Niraj Venkat
d1526c25b2 Starting new tooltip design in QML 2015-06-23 10:08:48 -07:00
Sam Gondelman
824c219fa0 started fixing camera mode issue 2015-06-23 09:26:38 -07:00
Bradley Austin Davis
07dce3856a Fixing some math functions 2015-06-22 20:10:21 -07:00
Bradley Austin Davis
62af30761e Fixing inverted mirror zoom setting 2015-06-22 20:07:51 -07:00
Bradley Austin Davis
f833121032 Fixing the initial missing UI on retina displays, again 2015-06-22 19:55:52 -07:00
Seth Alves
300a879ff4 Merge pull request #5186 from AndrewMeadows/antimony 
fix crash when other avatar disconnects unexpectedly
 2015-06-22 19:34:13 -07:00
Brad Hefta-Gaub
de39049a56 Merge pull request #5187 from jherico/fix_overlay_backgrounds 
Fix the 2D text overlay backgrounds to stop using a previously bound …
 2015-06-22 17:32:06 -07:00
Brad Hefta-Gaub
ee85ad8bf8 Merge pull request #5185 from jherico/mouse_flicker 
Removing flickering mouse cursor in HMD
 2015-06-22 17:23:40 -07:00
Brad Hefta-Gaub
81541e6013 Merge pull request #5180 from jherico/hmd_offset 
Fixing HMD position offset bug in picking & stereo rendering in HMD
 2015-06-22 17:22:26 -07:00
Niraj Venkat
98fa996752 Cleaning out comments 2015-06-22 16:56:49 -07:00
Bradley Austin Davis
ce3d1bd9a4 Fix the 2D text overlay backgrounds to stop using a previously bound texture 2015-06-22 16:19:31 -07:00
Andrew Meadows
ce9dfc098b unhook motionstate before removing avatar 2015-06-22 15:40:26 -07:00
Andrew Meadows
b7c728a794 assert AvatarMotionState unhooked before delete 2015-06-22 15:40:02 -07:00
Brad Davis
d94cc3d785 Merge pull request #5182 from venkatn93/master 
Fixed tooltip position relative to the cursor
 2015-06-22 13:57:47 -07:00
Philip Rosedale
111b0f286d Merge pull request #5160 from ctrlaltdavid/addressbar-tidy 
Tidy address bar code
 2015-06-22 12:08:33 -07:00
Brad Davis
1cfc0b2e42 Fixing mac/linux compilation 2015-06-22 12:06:08 -07:00
Brad Davis
8c9deb9d16 Removing flickering mouse cursor in HMD 2015-06-22 12:04:55 -07:00
Niraj Venkat
e66206ec4f Fixed tooltip position relative to the cursor 2015-06-22 11:29:44 -07:00
Brad Davis
4cd1c52987 Fixing HMD position offset bug in picking & stereo rendering in HMD 2015-06-22 11:20:48 -07:00
Philip Rosedale
293a88b3d4 Merge pull request #5158 from ctrlaltdavid/20545 
DO NOT MERGE - QA for #20545 - Eye saccades are too jittery and too fast
 2015-06-22 10:31:10 -07:00
Brad Davis
3231bbba5a Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
 2015-06-22 09:44:16 -07:00
samcake
be8ae9580d Merge pull request #5177 from bwent/doubleClickEvent 
Expose mouseDoublePressEvents to js
 2015-06-22 11:13:05 +02:00
Bradley Austin Davis
02510790c3 Fixing projection during star rendering 2015-06-21 17:16:30 -07:00
Brad Davis
012b0973b9 removing cruft 2015-06-21 14:26:19 -07:00
Bradley Austin Davis
5bbfb97c37 Fixing blurry UI on retina displays 2015-06-21 13:31:18 -07:00
Brad Davis
e66b2d4141 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-20 22:54:45 -07:00
Brad Hefta-Gaub
13c5c830d7 Merge pull request #5173 from huffman/fix-line-bounds 
Add correct line3doverlay bounds
 2015-06-20 11:39:08 -07:00
Bradley Austin Davis
577962cb67 Merge branch 'master' into overlay 2015-06-20 10:37:55 -07:00
David Rowe
0b13accf94 Merge branch 'master' into addressbar-tidy 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
 2015-06-19 17:42:27 -07:00
Brad Davis
3ab8025b82 Responding to Sam's comments 2015-06-19 16:14:05 -07:00
Sam Gondelman
a0d4b7ec7c without script, doesn't limit you to constant degree turns 2015-06-19 16:11:43 -07:00
Niraj Venkat
482f12be8c Returning ref to stack to view controller 2015-06-19 16:05:45 -07:00
bwent
c315bcec24 Expose mouseDoublePressEvents to js 2015-06-19 15:52:27 -07:00
Brad Davis
cc6b589ae5 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-19 14:48:38 -07:00
Brad Davis
99c217184b Fixing the mic/camera buttons and the mirror UI buttons 2015-06-19 14:46:39 -07:00
Niraj Venkat
03c10d15e6 Adding lambdas and removing dead code 2015-06-19 14:37:21 -07:00
Niraj Venkat
054e12a315 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-19 11:22:50 -07:00
Niraj Venkat
1494aa4faa Adding new icon and getters 2015-06-19 11:18:16 -07:00
Niraj Venkat
b15e7cec21 Back and forward are red if not possible 2015-06-19 11:17:56 -07:00
Sam Gondelman
e78ce8055a hmdControls turns on when you enter VR mode, turns off when you exit, can toggle with CTRL+G 2015-06-19 11:17:36 -07:00
Ryan Huffman
ff66eb584d Add correct line3doverlay bounds 2015-06-19 10:48:07 -07:00
Ryan Huffman
665baff665 Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-rotate 
Conflicts:
	interface/src/ui/overlays/Circle3DOverlay.cpp
	libraries/render-utils/src/RenderDeferredTask.cpp
	libraries/render-utils/src/RenderDeferredTask.h
 2015-06-19 10:07:57 -07:00
Ryan Huffman
690e2e38f2 Move circle3d and text overlays to batches 2015-06-19 09:45:13 -07:00
Clément Brisset
5192796851 Merge pull request #5168 from samcake/daft 
Improving the rendering job architecture
 2015-06-19 18:00:39 +02:00
Sam Gateau
598d0a5375 Just remove these changes on SkeletonModel.cpp 2015-06-19 17:44:56 +02:00
Atlante45
9c7f24eeb6 Add culled option for simple programs 2015-06-19 16:50:38 +02:00
Atlante45
67473ac254 Fix rotation handle crash 2015-06-19 16:40:42 +02:00
Sam Gateau
9adfdb06fe undo local modif to SKeletonModel.cpp 2015-06-19 11:00:27 +02:00
Sam Gateau
31633eca10 IMproving the probe system and cleaning the engine script 2015-06-19 10:41:40 +02:00
Sam Gateau
b09991d75b Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-06-19 09:35:40 +02:00
Brad Davis
9bef5f011b Reverting mirror functionality 2015-06-19 00:03:46 -07:00
Brad Davis
0fa6ac175f Merge branch 'master' into overlay 2015-06-18 21:56:11 -07:00
Brad Davis
d65e5882aa Working on 64 bit builds 2015-06-18 21:44:12 -07:00
Sam Gondelman
aab8161fa4 remove unused function 2015-06-18 18:57:04 -07:00
Niraj Venkat
afc2db6c6a address bar commit 2015-06-18 18:25:48 -07:00
Brad Davis
48b27acc79 Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-18 18:17:59 -07:00
Brad Hefta-Gaub
a7a53d8be7 Merge pull request #5148 from SamGondelman/rotationModes 
center player in view mode
 2015-06-18 18:02:47 -07:00
Brad Hefta-Gaub
750ce250fa Merge pull request #5150 from SamGondelman/mouseLook 
mouse look script
 2015-06-18 17:41:20 -07:00
Niraj Venkat
894a245318 Further changes to address bar 2015-06-18 17:35:50 -07:00
Philip Rosedale
2f080a8e29 Merge pull request #5147 from sethalves/more-actions 
offset action
 2015-06-18 17:35:50 -07:00
Niraj Venkat
55b6efb1e9 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-18 15:48:37 -07:00
Niraj Venkat
5645491170 Further changes to address bar 2015-06-18 15:09:13 -07:00
Niraj Venkat
1be303e3ed Address bar polish 2015-06-18 15:07:27 -07:00
Brad Davis
edfb25bfe2 Removing debug define for VR overlay 2015-06-18 15:05:32 -07:00
Seth Alves
021dc64789 merge from upstream 2015-06-18 15:03:09 -07:00
Sam Gondelman
53bbd519a3 two new customizable actions for use in js 2015-06-18 14:37:09 -07:00
Brad Davis
68595ef5dc Delete sync object after use 2015-06-18 14:27:19 -07:00
Bradley Austin Davis
e75b1a6794 Merge branch 'temp' into overlay 2015-06-18 14:03:25 -07:00
Bradley Austin Davis
96ac5070f6 Adding some more protection to the viewport 2015-06-18 14:00:17 -07:00
Bradley Austin Davis
1bae1d6065 Changing font size for timings 2015-06-18 13:59:48 -07:00
Sam Gondelman
fd0efd91ff added shift action, added timers and fast mode to hmdControls.js 2015-06-18 13:59:37 -07:00
Bradley Austin Davis
100f7acddc Working on tooltip placement 2015-06-18 13:46:27 -07:00
Bradley Austin Davis
7bbaf026f3 use a monospace font on all platforms 2015-06-18 13:33:37 -07:00
Brad Davis
1243c54767 More merge bugs 2015-06-18 12:44:57 -07:00
David Rowe
1047703718 Tidy address bar code 
Re-enable and reposition mouse drag areas
Remove unused graphics assets
Remove unused includes
 2015-06-18 11:18:56 -07:00
Brad Davis
4404917003 Fix HMD projection post-merge 2015-06-18 11:16:25 -07:00
David Rowe
c88ba2c6d1 Increase the saccade interval 2015-06-18 10:41:51 -07:00
David Rowe
0c7c5f6301 Limit the speed of eye saccades 2015-06-18 10:21:36 -07:00
Seth Alves
53b5c8e6e7 more merge fallout 2015-06-18 10:19:12 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
Sam Gondelman
f752534f7c actionEvent signal, captureActions, began work on hmdControls.js 2015-06-18 09:52:36 -07:00
Atlante45
d0f27f1648 Change display names size 2015-06-18 15:23:53 +02:00
Atlante45
c38fa46eb1 Increase anti z-fighting value 2015-06-18 15:23:53 +02:00
Atlante45
045a6a6ad9 Use render args frustum 2015-06-18 15:23:52 +02:00
Atlante45
be261cd038 Increase anti z-fighting value 2015-06-18 15:23:52 +02:00