howard-stearns
|
1891062dd2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into reregister-and-scale-after-model-change
|
2016-03-15 12:22:36 -07:00 |
|
howard-stearns
|
ddc658af5f
|
After a modelURL change to an existing model, allow the model to be
snapped and scaled to the existing entity registration and dimensions.
|
2016-03-15 12:20:51 -07:00 |
|
Chris Collins
|
e47c8896db
|
Merge pull request #7364 from hyperlogic/tony/fix-for-p-and-h
Application: fix third-person and fullscreen-mirror toggle
|
2016-03-15 11:50:22 -07:00 |
|
Atlante45
|
4265ddbd0e
|
Can't drop fbx if you can't rez
|
2016-03-15 11:42:48 -07:00 |
|
Atlante45
|
4a90ec303c
|
Fix drag&drop
|
2016-03-15 11:22:42 -07:00 |
|
Zach Pomerantz
|
1a8cca3dcc
|
Clarify use of procedural's dirty atomic flag
|
2016-03-15 10:51:55 -07:00 |
|
Anthony Thibault
|
addde84bee
|
Merge pull request #7363 from markej/master
Fill in the Downloads: line of the stats window
|
2016-03-15 10:42:09 -07:00 |
|
samcake
|
af24b5f1a3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-03-15 10:23:06 -07:00 |
|
Clément Brisset
|
17e5b441cf
|
Merge pull request #111 from huffman/atp-manager-name
Add atp filename to entities added to world
|
2016-03-15 10:19:53 -07:00 |
|
Clément Brisset
|
47f18e5166
|
Merge pull request #110 from huffman/atp-upload
Atp upload updates
|
2016-03-15 10:19:44 -07:00 |
|
Ryan Huffman
|
1b81b4f01b
|
Merge branch 'atp' of github.com:birarda/hifi into atp-upload
|
2016-03-15 10:19:20 -07:00 |
|
Anthony J. Thibault
|
7539eec134
|
Application: fix third-person and fullscreen-mirror toggle
|
2016-03-15 10:11:56 -07:00 |
|
Ryan Huffman
|
7947bd7724
|
Fix message typo enter => entering
|
2016-03-15 10:11:53 -07:00 |
|
Ryan Huffman
|
cbed674cba
|
Merge pull request #112 from Atlante45/feat/atp
In place editing
|
2016-03-15 09:54:03 -07:00 |
|
Clément Brisset
|
bbfbbf6565
|
Merge pull request #109 from birarda/asset-migrator
tweaks to the ATP asset migrator for compound URLs and mappings
|
2016-03-15 09:25:11 -07:00 |
|
Atlante45
|
07d2213628
|
Remove debug
|
2016-03-15 09:14:22 -07:00 |
|
Atlante45
|
9b8b1d41e3
|
Edit in place
|
2016-03-15 09:14:22 -07:00 |
|
Atlante45
|
98851679c5
|
Remove unused AssetMappingItem
|
2016-03-15 09:14:22 -07:00 |
|
Stephen Birarda
|
72c64532f5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
|
2016-03-15 09:12:49 -07:00 |
|
Howard Stearns
|
010aaa55c0
|
const ref
|
2016-03-14 22:13:26 -07:00 |
|
Howard Stearns
|
28f5ee16b8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility
|
2016-03-14 22:05:41 -07:00 |
|
Ryan Huffman
|
e54d5aa162
|
Merge pull request #7354 from birarda/udt-slow-start
fix for UDT slow start phase with handshake changes
|
2016-03-14 21:07:49 -07:00 |
|
Stephen Birarda
|
8cb602173a
|
remove the unused member variable
|
2016-03-14 20:54:41 -07:00 |
|
Brad Hefta-Gaub
|
cf6a975a2b
|
Merge pull request #7336 from ctrlaltdavid/text3d-tuning
Improve text3d rendering
|
2016-03-14 18:59:06 -07:00 |
|
Brad Hefta-Gaub
|
11e88f965d
|
Merge pull request #7347 from hyperlogic/tony/prevent-roll-in-goto-location
MyAvatar: prevent roll and pitch in avatar via snapshot url.
|
2016-03-14 18:58:49 -07:00 |
|
Brad Hefta-Gaub
|
11c318305f
|
Merge pull request #7340 from sethalves/edit-js-grabbable
edit.js has checkboxes for grabbable pseudo-properties
|
2016-03-14 18:58:37 -07:00 |
|
Brad Hefta-Gaub
|
447918d148
|
Merge pull request #7348 from hyperlogic/tony/cppcheck-fixes
Avatar & Animation cppcheck static analysis fixes
|
2016-03-14 18:58:25 -07:00 |
|
Brad Hefta-Gaub
|
4018242045
|
Merge pull request #7360 from zzmp/feat/emplace-render-jobs
Emplace render engine jobs
|
2016-03-14 18:57:30 -07:00 |
|
Mark Johnson
|
bc2aea8774
|
Show the (generally truncated) urls being downloaded
|
2016-03-14 18:18:33 -07:00 |
|
Stephen Birarda
|
605474a32c
|
actually use the JSONTypePair alias
|
2016-03-14 18:11:34 -07:00 |
|
Zach Pomerantz
|
0ea70f234f
|
Add bg gpu timer display
|
2016-03-14 17:53:48 -07:00 |
|
Zach Pomerantz
|
5ab21588f2
|
Add gpu timer to background
|
2016-03-14 17:53:39 -07:00 |
|
Zach Pomerantz
|
ff07e47626
|
Make procedural dirty marker atomic
|
2016-03-14 17:52:13 -07:00 |
|
Zach Pomerantz
|
ff0862b594
|
Emplace render engine jobs
|
2016-03-14 17:51:43 -07:00 |
|
Howard Stearns
|
d7e3699bc8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility
|
2016-03-14 17:45:52 -07:00 |
|
James B. Pollack
|
4017bea60f
|
Merge pull request #7356 from AndrewMeadows/anemone
anemones are not urchins
|
2016-03-14 17:45:19 -07:00 |
|
Andrew Meadows
|
98eef26e69
|
Merge pull request #7357 from hyperlogic/tony/fix-for-set-swing-limits
SwingTwistConstriant: fix for bad index.
|
2016-03-14 17:36:42 -07:00 |
|
samcake
|
51be2a7107
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-03-14 17:33:56 -07:00 |
|
Anthony J. Thibault
|
16a57bda81
|
SwingTwistConstriant: fix for bad index.
|
2016-03-14 17:30:53 -07:00 |
|
Andrew Meadows
|
cb62af770f
|
namechange urchin --> anemone
|
2016-03-14 17:10:33 -07:00 |
|
Andrew Meadows
|
d18f988cba
|
namechange URCHIN --> ANEMONE
|
2016-03-14 17:07:35 -07:00 |
|
Clément Brisset
|
e38c08ebd9
|
Merge pull request #7335 from imgntn/photosphere
Add Photo Sphere Example
|
2016-03-14 16:56:17 -07:00 |
|
Anthony Thibault
|
5623fc1b89
|
Merge pull request #7328 from AndrewMeadows/dynamic-constraints
reduce clamping of animation underpose by IK system
|
2016-03-14 16:47:00 -07:00 |
|
Ryan Huffman
|
7823882aa1
|
Add atp filename to entities added to world
|
2016-03-14 16:13:33 -07:00 |
|
Stephen Birarda
|
7858b6b0cd
|
fix for slow start initial value with new randomization
|
2016-03-14 15:06:05 -07:00 |
|
Ryan Huffman
|
850fb51f72
|
Fix keylight direction naming and usage
|
2016-03-14 14:45:00 -07:00 |
|
Philip Rosedale
|
c6de24f953
|
Merge pull request #7332 from imgntn/newfishes
Add animated urchin to fishtank
|
2016-03-14 14:29:41 -07:00 |
|
Philip Rosedale
|
5e532a703a
|
Merge pull request #7352 from ZappoMan/fixLogSpam
reduce log spam
|
2016-03-14 14:26:23 -07:00 |
|
ZappoMan
|
1a17de6dbb
|
reduce log spam
|
2016-03-14 14:02:25 -07:00 |
|
Howard Stearns
|
0f0b4519fd
|
Merge pull request #7350 from sethalves/try-again-on-queryAACube
try again on queryAACube
|
2016-03-14 13:30:46 -07:00 |
|