Commit graph

26038 commits

Author SHA1 Message Date
David Rowe
811c250763 Refactor common new dialog functionality into new Dialog.qml 2015-06-07 13:56:52 -07:00
David Rowe
4d8bc27ece Rename Dialog.qml to DialogOld.qml 2015-06-07 13:56:52 -07:00
Bradley Austin Davis
b56fbd4744 Working on SDK 0.6 2015-06-07 13:56:06 -07:00
Brad Davis
f614268667 Moving windows to SDK 0.6
Working on SDK 0.6 for windows

Working on SDK 0.6 for windows
2015-06-07 01:40:44 -07:00
Stephen Birarda
a63811a491 Merge pull request #5066 from venkatn93/master
Title bar shows domain IDs upon teleport
2015-06-05 18:55:02 -04:00
Niraj Venkat
141ff70a60 Some changes to constants 2015-06-05 15:36:42 -07:00
Andrew Meadows
886ec63072 Merge pull request #5067 from sethalves/actions
undo unneeded/breaky change in grab.js
2015-06-05 14:02:35 -07:00
Seth Alves
037a70b03a undo unneeded/breaky change in grab.js 2015-06-05 13:47:07 -07:00
Niraj Venkat
827d8bd854 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-05 13:33:41 -07:00
Niraj Venkat
a3f19e9d4c Fixing title bar update on teleport 2015-06-05 13:33:14 -07:00
Andrew Meadows
30389ad51f Merge pull request #5039 from sethalves/actions
Actions
2015-06-05 13:26:44 -07:00
Seth Alves
b425cc6491 merge from upstream 2015-06-05 11:56:33 -07:00
Seth Alves
b0480af040 Merge pull request #5053 from AndrewMeadows/isothermal
fix crash during bogus reconnect on login
2015-06-05 11:38:23 -07:00
Seth Alves
aff582287d use const references for arguments in action-related calls 2015-06-05 11:26:54 -07:00
Philip Rosedale
1f11625db4 Merge pull request #5060 from ericrius1/paint
moved ball marker closer to hand so painting feels more visceral
2015-06-05 11:26:22 -07:00
Andrew Meadows
53fa6cf0b2 Merge pull request #5040 from jherico/web-entities-fix
Fixing web entity glow and 'back' behavior
2015-06-05 10:46:58 -07:00
Niraj Venkat
a2165e3a8a Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-05 10:42:20 -07:00
Seth Alves
28c034698f Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-05 10:41:20 -07:00
Seth Alves
c5143cdfa0 Merge pull request #5027 from AndrewMeadows/isentropic
cleanup around sending all "terse update" data whenever some of it changes
2015-06-05 10:41:06 -07:00
Niraj Venkat
c8236f867b Address manager changes to support domain ID 2015-06-05 10:40:17 -07:00
Seth Alves
4e10c28b41 merge from upstream 2015-06-05 10:31:13 -07:00
Seth Alves
edb3622c85 Merge pull request #5037 from AndrewMeadows/inertia
collision groups for physical objects
2015-06-05 10:26:28 -07:00
Eric Levin
9f974c3b5c moves ball marker closer to avatar for mouse as well 2015-06-05 10:19:39 -07:00
Seth Alves
08902d0ec9 Merge pull request #5061 from jherico/skybox-jiggle
Fix the skybox jiggle in the HMD
2015-06-05 10:14:07 -07:00
Seth Alves
51f5730e68 formatting 2015-06-05 10:05:11 -07:00
Seth Alves
eb912892dc code review 2015-06-05 09:56:34 -07:00
Brad Davis
16f55c7557 Fix the skybox jiggle in the HMD 2015-06-05 09:52:56 -07:00
Eric Levin
30ba7ffc29 moved ball marker closer to hand so painting feels more visceral 2015-06-05 09:36:12 -07:00
Seth Alves
2086a25f93 oops 2015-06-05 08:59:19 -07:00
Seth Alves
086b9d404a fix return-type in lambda 2015-06-05 08:59:08 -07:00
Andrew Meadows
9cb7cb314d update minimum version support 2015-06-05 08:43:48 -07:00
Andrew Meadows
08b64666fe Merge pull request #5033 from howard-stearns/smooth-initial-crash-volume
Smooth initial crash volume
2015-06-05 08:40:09 -07:00
Seth Alves
3dbf28b7b4 use lambdas to remove some repeated code 2015-06-05 07:33:39 -07:00
Seth Alves
b2db5f7fee update grab.js to use pull-to-point action, various other fixes 2015-06-05 07:10:44 -07:00
Philip Rosedale
164df99f93 Merge pull request #5056 from ericrius1/paint
marker ball now stays without mouse whether or not user is drawing
2015-06-04 21:42:47 -07:00
Eric Levin
fd8126510d marker ball now stays without mouse whether or not user is drawing 2015-06-04 21:41:19 -07:00
Philip Rosedale
84c03b29ef Merge pull request #5055 from ericrius1/paint
added redo and undo functionality to mouse component of paint script,…
2015-06-04 21:15:11 -07:00
Eric Levin
9264ef980c added redo and undo functionality to mouse component of paint script, and fixed overlay not being deleted on script ending bug 2015-06-04 21:13:16 -07:00
Philip Rosedale
8c32f8f396 Merge pull request #5054 from ericrius1/paint
added paint.js and line rider script. Users can paint lines with hydr…
2015-06-04 20:52:23 -07:00
Philip Rosedale
ead1b63f05 Merge pull request #5050 from ericrius1/pointerFix
updated pointer.js script to work with new line entity
2015-06-04 20:44:03 -07:00
Seth Alves
9a67f35b59 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-04 19:02:46 -07:00
Eric Levin
f276ca30cd refactoring for common functions. Fix for randFloat 2015-06-04 17:55:55 -07:00
Seth Alves
ba42b0dcc4 updateAction and deleteAction 2015-06-04 17:51:59 -07:00
Eric Levin
241330442c added paint.js and line rider script. Users can paint lines with hydra or mouse, and then go on a ride over the line they just created. 2015-06-04 17:35:26 -07:00
Philip Rosedale
6d29524610 Merge pull request #5052 from ericrius1/lineSanitization
added sanitization for invalid line points data. Fixed bug where occa…
2015-06-04 17:22:48 -07:00
Andrew Meadows
911baee8b8 fix for crash during bogus reconnect on login 2015-06-04 16:57:29 -07:00
Andrew Meadows
cd6bf9d461 cleanup comments 2015-06-04 16:56:14 -07:00
Eric Levin
1fd0650955 removing overlay on script ending 2015-06-04 16:54:52 -07:00
Eric Levin
5e15c14539 added sanitization for invalid line points data. Fixed bug where occasionally wrong view frustum would be sent to script" 2015-06-04 16:45:32 -07:00
Eric Levin
a2ae51371b updated pointer.js script to work with new line entity 2015-06-04 15:44:39 -07:00