Clement
|
f8e98d2c6a
|
Remove 2 year old migration code
|
2018-07-30 17:18:32 -07:00 |
|
Clement
|
333cbc99ad
|
Remove static logging
|
2018-07-30 17:18:32 -07:00 |
|
Clement
|
9e84603ca4
|
Make proper -v and -h options for interface
|
2018-07-30 17:18:32 -07:00 |
|
Seth Alves
|
1b47d3f274
|
Merge pull request #13717 from highfidelity/revert-13577-invisibleWebEntities
Revert "Allow empty web entities to be rendered"
|
2018-07-30 15:24:17 -07:00 |
|
John Conklin II
|
bd2ab38bfe
|
Merge pull request #13701 from ElderOrb/FB16702
FB16702 - Avatar App does not save Animation JSON Override URL
|
2018-07-30 14:51:32 -07:00 |
|
John Conklin II
|
6d7116fad7
|
Merge pull request #13676 from thoys/fix/api/agent
MS15184: Remove deprecated functions in Agent API
|
2018-07-30 14:48:10 -07:00 |
|
John Conklin II
|
200292c18e
|
Merge pull request #13675 from howard-stearns/forget-you
pal refresh fixes
|
2018-07-30 14:38:24 -07:00 |
|
Seth Alves
|
a6aaa71d02
|
Revert "Allow empty web entities to be rendered"
|
2018-07-30 11:54:52 -07:00 |
|
Sam Gondelman
|
8201997a16
|
Merge pull request #13660 from SamGondelman/parabolic
Parabolic Picking + Pointers
|
2018-07-30 10:49:02 -07:00 |
|
Thijs Wenker
|
d486a0721d
|
Merge pull request #13698 from dback2/resetPropertiesNoSelection
Reset entity property fields when no selection
|
2018-07-30 19:37:12 +02:00 |
|
Seth Alves
|
32ec984f82
|
Merge pull request #13577 from dback2/invisibleWebEntities
Allow empty web entities to be rendered
|
2018-07-30 10:12:32 -07:00 |
|
Thijs Wenker
|
92efc1a3b5
|
style and memory leak fixes
|
2018-07-30 18:51:19 +02:00 |
|
SamGondelman
|
3d4639bfdd
|
CR
|
2018-07-27 16:36:22 -07:00 |
|
Howard Stearns
|
e8e04673a4
|
Merge pull request #13683 from zfox23/MS17039_dontDeleteDDV
Implement MS17039: Don't delete entities during DDV when Metaverse API call returns error
|
2018-07-27 15:05:05 -07:00 |
|
SamGondelman
|
1ef54b2fe6
|
back to ray teleport
|
2018-07-27 14:58:56 -07:00 |
|
John Conklin II
|
9c37e30fe6
|
Merge pull request #13678 from ElderOrb/FB17023
FB17023 - Make visible avatar url in the avatar app
|
2018-07-27 14:57:25 -07:00 |
|
John Conklin II
|
fc88165e23
|
Merge pull request #13696 from SamGondelman/particleRot
Particles don't spin with head roll, new spin + rotateWithEntity properties
|
2018-07-27 14:54:48 -07:00 |
|
John Conklin II
|
df917688b6
|
Merge pull request #13707 from AndrewMeadows/fix-ccd
more correct continuous collision detection for thin objects
|
2018-07-27 14:32:41 -07:00 |
|
Thijs Wenker
|
9dce1b64b6
|
Merge pull request #13695 from huffman/fix/create-focus-on-create
Fix edit.js not being able to delete after creating entity
|
2018-07-27 22:43:34 +02:00 |
|
John Conklin II
|
021e09d083
|
Merge pull request #13708 from sethalves/fix-grab-entity-w-child-overlay-crash
fix a crash when grabbing a non-dynamic entity with an overlay child
|
2018-07-27 12:49:14 -07:00 |
|
John Conklin II
|
a1f9d87437
|
Merge pull request #13705 from ctrlaltdavid/M17068
Maintain virtual and real world orientations when teleport
|
2018-07-27 12:44:22 -07:00 |
|
John Conklin II
|
9770331259
|
Merge pull request #13687 from danteruiz/fix-script-memory-issue
Fix ScriptEngine begin held onto after script stopped runnning
|
2018-07-27 12:31:31 -07:00 |
|
John Conklin II
|
d4cbbfe4c1
|
Merge pull request #13692 from amantley/leanBackSittingFix
Fix For Unnatural Hips Behaviour When Sitting In HMD
|
2018-07-27 12:30:31 -07:00 |
|
Seth Alves
|
91d509f5a4
|
fix a crash when grabbing a non-dynamic entity with an overlay child
|
2018-07-27 10:35:26 -07:00 |
|
Sam Gateau
|
a95ddb0492
|
Merge pull request #13616 from AndrewMeadows/remove-cruft-001
remove cruft for rendering collision shapes
|
2018-07-27 19:19:44 +02:00 |
|
Seth Alves
|
41af82a7f6
|
Merge pull request #13702 from r3tk0n/17016-flying-settings
17016 flying settings
|
2018-07-27 10:07:13 -07:00 |
|
Sam Gondelman
|
3284f7b9d6
|
Merge pull request #13654 from huffman/fix/mirror-mode-create
Fix computePickRay when in mirror mode
|
2018-07-27 09:05:58 -07:00 |
|
Andrew Meadows
|
cf04a91a83
|
use smaller CCD spheres for thin objects
|
2018-07-27 09:02:19 -07:00 |
|
David Rowe
|
3bfdd3ff58
|
Maintain virtual and real world orientations when teleport
|
2018-07-27 15:18:40 +12:00 |
|
SamGondelman
|
f5364f752f
|
fix scaling
|
2018-07-26 18:01:24 -07:00 |
|
Alexander Ivash
|
29f7cab7df
|
FB16702 - Avatar App does not save Animation JSON Override URL
note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'
|
2018-07-27 02:08:44 +03:00 |
|
David Back
|
7faec21b1d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into resetPropertiesNoSelection
|
2018-07-26 15:40:32 -07:00 |
|
David Back
|
ff6ed971d8
|
comments, re-org, submesh number
|
2018-07-26 15:40:27 -07:00 |
|
r3tk0n
|
f3d0d9b4a0
|
Clean up garbage comments.
|
2018-07-26 15:37:42 -07:00 |
|
r3tk0n
|
f8c611b1d0
|
Divorce HMD and Desktop flying settings, implement setters and getters, change loadData and saveData in MyAvatar.cpp
|
2018-07-26 15:35:12 -07:00 |
|
SamGondelman
|
74b3143bc3
|
remove scaling from teleport script
|
2018-07-26 12:23:14 -07:00 |
|
SamGondelman
|
6a52b7b8f3
|
CR improvements
|
2018-07-26 12:15:12 -07:00 |
|
amantley
|
12cb212dc7
|
used avatar constants from AvatarConstants.h to initialize tpposehips and tposerightfoot, and added space between multiplication to meet coding standards
|
2018-07-26 12:05:17 -07:00 |
|
howard-stearns
|
699d1647ca
|
typo, and more conservative item limit
|
2018-07-26 12:01:56 -07:00 |
|
Anthony Thibault
|
6c92949aed
|
Merge pull request #13672 from luiscuenca/fixElbowPoleVector
Redesign and enable hand's Pole Vectors for elbow simulation
|
2018-07-26 11:51:33 -07:00 |
|
howard-stearns
|
9b61e8c4ad
|
Merge branch 'master' of github.com:highfidelity/hifi into forget-you
|
2018-07-26 11:50:15 -07:00 |
|
SamGondelman
|
1c1b68ee66
|
emitterShouldTrail fix, review comments, rotateWithEntity
|
2018-07-26 11:41:16 -07:00 |
|
David Back
|
cb8e9f218b
|
reset all property fields when no selection
|
2018-07-26 11:23:28 -07:00 |
|
John Conklin II
|
5efd981ecd
|
Merge pull request #13693 from NissimHadar/bug16943
Corrects loading of texture and default visibility.
|
2018-07-26 09:10:55 -07:00 |
|
NissimHadar
|
ce53b44b02
|
CR comments.
|
2018-07-25 15:58:46 -07:00 |
|
Zach Fox
|
cc921ed9c4
|
Merge pull request #13685 from zfox23/MS16820_rateLimitPolaroids
Fix MS16820: Rate limit Snapshot Polaroids
|
2018-07-25 15:45:51 -07:00 |
|
SamGondelman
|
9b41cb5554
|
improve model picking performance, scale parabola v/a with avatar, improve followNormal behavior, turn off followNormal on teleport, remove 1 m no teleport spot
|
2018-07-25 15:19:25 -07:00 |
|
Ryan Huffman
|
0e0966004c
|
Fix edit.js not being able to delete after creating entity
This fix puts focus back on the main window when creating an entity so that the user can use shortcuts like 'f' and 'delete'
|
2018-07-25 14:52:56 -07:00 |
|
John Conklin II
|
21d043d179
|
Merge pull request #13534 from huffman/fix/ess-avatar-entities
Fix crash when editing avatar entities with no myAvatar
|
2018-07-25 14:21:12 -07:00 |
|
NissimHadar
|
630df7c233
|
Corrects loading of texture and default visibility.
|
2018-07-25 13:28:23 -07:00 |
|