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
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
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
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
David Back
8db0711b5b
set grabbable user data in addModelEntity, pass grabbable from asset browser
2018-08-08 16:33:47 -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
John Conklin II
fd1a431729
Merge pull request #13689 from ctrlaltdavid/M15244
...
Move scriptable caches' APIs into scripting interfaces
2018-08-01 11:50:13 -07:00
John Conklin II
fcf32dbc6b
Merge pull request #13642 from ctrlaltdavid/M13352
...
Fix HMD.mountedChanged() API signal
2018-08-01 11:28:11 -07:00
Simon Walton
a320308eaf
Fix sequence number encoding issue
...
Don't mix QDataStream and readPrimitive. Also fix logic
issues in completion check; move new packet type; don't
reset known sent entities upon initial completion;
other reviewer recommendations.
2018-07-31 13:54:22 -07:00
Simon Walton
8c512ec19b
Send spherical view from Interface rather than creating in ES
2018-07-30 18:03:45 -07:00
Sam Gondelman
8201997a16
Merge pull request #13660 from SamGondelman/parabolic
...
Parabolic Picking + Pointers
2018-07-30 10:49:02 -07:00
Simon Walton
be1bbc07c2
Don't wait for (nonexistant) ES when in serverless mode
2018-07-30 10:20:55 -07:00
Simon Walton
2ac6ca3291
Remove old physics-enabling code
2018-07-27 17:32:35 -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
Simon Walton
3d390203e2
More fixes for clang & gcc
...
C++14 issues, I think.
2018-07-27 11:34:08 -07: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
Simon Walton
0cec9a72d6
Implement client-side enable physics once indicated EntityData has arrived
...
Also now use Entity Server Protocol sequence numbers.
2018-07-26 18:10:38 -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
David Rowe
baf88ab508
Revise scriptable resource caches' interfaces
2018-07-26 16:12:16 +12:00
Simon Walton
a15e78a0f4
Missed an identifier change
2018-07-25 17:36:53 -07:00
David Rowe
16e06de9cd
Move scriptable caches into scripting interfaces
...
Removed non-working getResource() API functions.
2018-07-25 22:10:14 +12:00
Simon Walton
47e99cdeac
Initial code for AC side of Enabling Physics plan
...
When interface sets query flag send only entities
close to main frustrum origin, until no more available,
then send unreliabe sequence # reliably.
2018-07-24 16:50:37 -07:00
Dante Ruiz
b750a005cf
fix script memory issue
2018-07-24 16:31:12 -07:00
sabrina-shanman
5ec277e458
Move bullet references in collision pick API to PhysicsEngine
2018-07-24 15:47:49 -07:00
John Conklin II
99c26e6363
Merge pull request #13674 from r3tk0n/16984-CompositorHelper
...
Added _aboutToQuit guard on eventFilter()
2018-07-24 11:37:19 -07:00
