David Back
|
96d2ba660c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping
|
2018-08-29 12:05:51 -07:00 |
|
David Back
|
b6edb2c9d6
|
platform states, edit controller mapping, separate mac/win delete
|
2018-08-27 14:53:13 -07:00 |
|
SamGondelman
|
98d145dc24
|
fix crash on shutdown in domain with material
|
2018-08-24 15:19:48 -07:00 |
|
John Conklin II
|
477fba4b15
|
Merge pull request #13847 from AndrewMeadows/workload-avatars-002
workload tracks other avatars and adds/removes from physics simulation accordingly
|
2018-08-24 12:43:51 -07:00 |
|
Andrew Meadows
|
10d0833c19
|
use DynamicsWorld::numCollisionObjects instead of our own count
|
2018-08-23 15:57:54 -07:00 |
|
Zach Fox
|
dddb2141f0
|
Implement Wallet Security feature - Auto Logout checkbox
|
2018-08-23 15:45:29 -07:00 |
|
Andrew Meadows
|
777b90bdc0
|
add 'physics body count' to debug stats
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
87223946ad
|
add/remove avatars according to workload region
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
15665b25e8
|
give OtherAvatars a proxy in workload
|
2018-08-23 12:59:28 -07:00 |
|
John Conklin II
|
50684f00c8
|
Merge pull request #13856 from sethalves/dont-squash-delete-events
don't squash delete events during shutdown so that QtWebEngine process gets destoryed
|
2018-08-22 12:44:35 -07:00 |
|
Seth Alves
|
579b2435c2
|
don't squash delete events during shutdown so that QWebEngine process gets destroyed
|
2018-08-22 11:04:26 -07:00 |
|
Stephen Birarda
|
3e2d4dc696
|
fixes and improvments addressing CR comments
|
2018-08-21 10:53:52 -07:00 |
|
Stephen Birarda
|
e33f349d53
|
fix flagging for avatar entity update/delete
|
2018-08-21 10:32:05 -07:00 |
|
Stephen Birarda
|
be7eb57205
|
handle whitelist avatar URL override via traits
|
2018-08-21 10:31:14 -07:00 |
|
Wayne Chen
|
acc7d493ec
|
Merge pull request #13812 from SimonWalton-HiFi/safe-landing
Safe landing client-side improvements
|
2018-08-20 20:36:17 -07:00 |
|
John Conklin II
|
b28aa3951f
|
Merge pull request #13802 from jherico/feature/scribe_programs
Migrating to scribe program descriptors
|
2018-08-20 14:48:54 -07:00 |
|
Simon Walton
|
a891b74fac
|
Reset SafeLanding in all cases
Also remove unused data member, elevate load priority only
for entities with collisions, handle case of no nearby entities.
|
2018-08-20 12:31:21 -07:00 |
|
John Conklin II
|
1edf1b4337
|
Merge pull request #13555 from SamGondelman/destroy
Trying to fix dependency shutdown
|
2018-08-16 13:14:58 -07:00 |
|
John Conklin II
|
02f53c4ee5
|
Merge pull request #13808 from dback2/createEntitiesGrabbable
Use Create Entities as Grabbable option when adding asset to world
|
2018-08-16 09:22:23 -07:00 |
|
Ryan Huffman
|
5d44877f56
|
Fix functionality sometimes getting stuck if window loses focus
|
2018-08-15 13:32:58 -07:00 |
|
John Conklin II
|
032e67fd8e
|
Merge pull request #13748 from ElderOrb/FB16831
FB16831 qml-related warnings in log
|
2018-08-14 16:40:07 -07:00 |
|
sabrina-shanman
|
e5cb078133
|
Merge branch 'master' of github.com:highfidelity/hifi into safe-teleport-target
|
2018-08-13 14:51:37 -07:00 |
|
unknown
|
8a22d0adc7
|
set grabbable user data in addAssetToWorldCheckModelSize
|
2018-08-11 11:04:44 -07:00 |
|
Simon Walton
|
3c665b7de8
|
Don't delete sequence numbers outside of range as range may change
|
2018-08-10 14:40:08 -07:00 |
|
unknown
|
8c185aa04e
|
fix menu option
|
2018-08-10 12:13:09 -07:00 |
|
unknown
|
45b9871fdb
|
when adding asset to world set grabbable
|
2018-08-10 12:10:49 -07:00 |
|
unknown
|
5641c59f5f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable
|
2018-08-10 09:49:37 -07:00 |
|
Brad Davis
|
f03370c826
|
Migrating to scribe program descriptors
|
2018-08-09 17:58:34 -07:00 |
|
Simon Walton
|
875407b3fe
|
New approach to physics readiness - now (mostly) working
|
2018-08-09 16:24:04 -07:00 |
|
John Conklin II
|
59977fe1d3
|
Merge pull request #13764 from r3tk0n/17249-safe-landing
Relocate Avatar Spawn Point from the Hips to the Feet
|
2018-08-09 12:45:30 -07:00 |
|
Simon Walton
|
4395e1fa26
|
Safe Landing checkpoint
|
2018-08-09 11:11:58 -07:00 |
|
David Back
|
8db0711b5b
|
set grabbable user data in addModelEntity, pass grabbable from asset browser
|
2018-08-08 16:33:47 -07:00 |
|
Simon Walton
|
88bd4e3d9a
|
WIP - safe landing infrastructure
|
2018-08-08 12:32:45 -07:00 |
|
David Back
|
a905a76c70
|
reload script cache with reload content
|
2018-08-07 11:53:11 -07:00 |
|
MuteTab
|
de5c7f6dcd
|
Change lambda for address manager position getter.
|
2018-08-06 16:02:00 -07:00 |
|
Sam Gondelman
|
7dd80d0180
|
Merge pull request #13240 from jherico/feature/glsl_layouts
Update shader pipeline, improve mac startup time
|
2018-08-06 15:30:46 -07:00 |
|
SamGondelman
|
e3756a6dae
|
Merge branch 'destroy' of github.com:SamGondelman/hifi into destroy
|
2018-08-06 11:21:51 -07:00 |
|
SamGondelman
|
9806bce403
|
weak pointers to nodeList
|
2018-08-06 11:21:32 -07:00 |
|
Sam Gondelman
|
2edefe3209
|
Merge branch 'master' into destroy
|
2018-08-06 09:51:14 -07:00 |
|
sabrina-shanman
|
870940b3a0
|
Merge branch 'master' into safe-teleport-target
|
2018-08-03 18:14:43 -07:00 |
|
sabrina-shanman
|
a460cfac29
|
Do not store physics engine pointer in PickScriptingInterface
|
2018-08-03 17:55:54 -07:00 |
|
Sam Gateau
|
c1951da2bb
|
Merge pull request #13737 from jherico/fix/fb16633_a
Don't allow Web surfaces created by non-client scripts to access files
|
2018-08-03 15:25:41 -07:00 |
|
Brad Davis
|
ae8f841912
|
Shader refactoring for explicit bindings
|
2018-08-03 14:58:11 -07:00 |
|
Brad Davis
|
d6bcdcde3f
|
Fix DISABLE_QML behavior
|
2018-08-03 14:58:11 -07:00 |
|
Alexander Ivash
|
5a2506e94f
|
FB16831 qml-related warnings in log
fix is based on exposing C++ objects to QML before root object is created (as root object might already require C++ objects)
|
2018-08-03 17:10:41 +03:00 |
|
Brad Davis
|
3c7f1a0c4b
|
Merge remote-tracking branch 'upstream/master' into destroy
|
2018-08-02 15:34:19 -07:00 |
|
Simon Walton
|
88fafc7a1f
|
Merge pull request #13704 from SimonWalton-HiFi/delay-physics
Enable physics after ES indicates all nearby entities received
|
2018-08-01 18:15:00 -07:00 |
|
SamGondelman
|
1ba28de5b6
|
try to fix nodelist not getting destroyed
|
2018-08-01 17:52:27 -07:00 |
|
SamGondelman
|
8a9c27ed92
|
Merge remote-tracking branch 'upstream/master' into destroy
|
2018-08-01 16:07:48 -07:00 |
|
Brad Davis
|
4b317a84d8
|
Don't allow Web surfaces created by non-client scripts to access files
|
2018-08-01 15:12:45 -07:00 |
|