Seth Alves
2fd6bc4130
rename Mesh api getPos3 to getPos, deprecate but still support getPos3
2018-03-14 10:24:44 -07:00
Sam Gondelman
c59d29f4ee
Merge pull request #12623 from SamGondelman/android
...
Android: Fix corruption on startup
2018-03-12 15:03:07 -07:00
MiladNazeri
e054f16c46
Merge pull request #12526 from ctrlaltdavid/21709
...
Entities API JSDoc
2018-03-12 14:40:09 -07:00
SamGondelman
9953e7051f
Merge remote-tracking branch 'upstream/master' into android
2018-03-12 14:15:31 -07:00
SamGondelman
4bef033d6f
cleanup, don't compress rcc file to fix corruption
2018-03-12 13:05:03 -07:00
Simon Walton
cc166dbece
LogHandler regexps - use vector of values
2018-03-09 15:44:56 -08:00
Simon Walton
d4cf22fbaf
LogHandler class stores regexps - code tweaks
...
Code standard changes from review.
2018-03-09 15:29:10 -08:00
Simon Walton
4b27cd73ff
LogHandler class stores regexps rather than always recreating
...
General efficiency tweaks; move to C++11.
2018-03-09 15:29:09 -08:00
Andrew Meadows
7a39bd5c81
remove tab whitespace
2018-03-09 08:35:18 -08:00
Andrew Meadows
7a19f48b9c
move rayHitsSphere logic to AABox method
2018-03-09 08:35:18 -08:00
Andrew Meadows
79b9fec900
add rayHitsSphere() util method
2018-03-09 08:35:18 -08:00
David Rowe
a62b6b7150
Merge branch 'master' into 21709
2018-03-07 17:34:53 +13:00
David Rowe
eeb7f5ca8d
Doc review
2018-03-07 17:29:39 +13:00
David Rowe
f9086e31de
Deprecate Entities.getMeshes() in favor of using the new Graphics API
2018-03-01 10:08:50 +13:00
David Rowe
a782b6779a
Merge branch 'master' into 21709
...
# Conflicts:
# interface/src/ui/overlays/Overlays.h
# interface/src/ui/overlays/Shape3DOverlay.cpp
# libraries/entities/src/EntityItemProperties.cpp
# libraries/entities/src/EntityScriptingInterface.h
2018-02-28 12:42:05 +13:00
Brad Davis
136ced98c3
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-27 13:44:00 -08:00
Stephen Birarda
9cc348ef27
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
2018-02-27 09:59:37 -08:00
John Conklin II
48f0cded05
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting
...
Leopoly_Phase1_010 Graphics Scripting
2018-02-27 07:53:25 -08:00
John Conklin II
25144f0fec
Merge pull request #12456 from Atlante45/fix/min-spec-crash
...
Fix crash when passing --checkMinSpec flag
2018-02-26 17:35:46 -08:00
Stephen Birarda
7e3d4d7503
Merge pull request #12506 from birarda/feat/content-settings
...
merge upstream/master into upstream/feat/content-settings
2018-02-26 18:08:58 -07:00
Stephen Birarda
aa7bd2066a
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
2018-02-26 17:02:00 -08:00
Atlante45
2a204533f4
Add comments to startup processes
2018-02-26 16:25:41 -08:00
Ryan Huffman
dbfbee5406
CR
2018-02-26 13:53:20 -08:00
Brad Davis
b9387f2a21
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-26 13:18:14 -08:00
Anthony J. Thibault
c8af9c6f04
Missing EPSILON
2018-02-26 10:05:15 -08:00
Anthony J. Thibault
0404b722e4
Code review feedback
2018-02-26 10:00:32 -08:00
David Rowe
c2d8c96463
Entities collisions JSDoc
2018-02-26 14:10:33 +13:00
Brad Davis
0550138609
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-23 12:48:10 -08:00
David Rowe
26404a6ce8
Entities functions JSDoc bulk
2018-02-23 19:27:13 +13:00
Atlante45
c106fee659
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration
2018-02-22 19:45:43 -08:00
Anthony J. Thibault
0469eafbe4
Switch between dualQuats and matrix skinning based on model entity scale factor.
2018-02-22 18:35:16 -08:00
Brad Davis
aeb29db37d
Merge remote-tracking branch 'upstream/stable' into android_stable
2018-02-22 17:35:00 -08:00
Atlante45
277e556b48
Create a standard function to init Hifi Apps
2018-02-22 17:06:09 -08:00
Atlante45
80c0f2a21e
Fix crash when passing --checkMinSpec flag
...
That flag caused a DLL to be loaded before Application was
instanced.
This triggers a Qt bug inside Q_COREAPP_STARTUP_FUNC that causes
the previous registration pointing the startup function in
the main executable to be overridden with the address of the
function in the DLL (Since they both link the same static
library)
This leads to the correct function running in the wrong address
space (the DLLs), hence not initializing some global variables
correctly.
2018-02-22 16:29:38 -08:00
David Rowe
25b1e9f50b
Fix PickRay JSDoc
2018-02-23 12:05:33 +13:00
humbletim
72fca7e57e
Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge
2018-02-22 05:18:05 -05:00
humbletim
be8d79f53f
CR fedback and cleanup
2018-02-22 05:15:01 -05:00
SamGondelman
4c6169ec78
merge and a little cleanup
2018-02-20 15:45:34 -08:00
humbletim
5791ca4c51
interim checkin
2018-02-20 12:22:04 -05:00
David Rowe
67cfe783be
Entity properties JSDoc
2018-02-19 12:17:31 +13:00
Stephen Birarda
f5cad5683d
make sure backup handlers end up on the correct thread
2018-02-15 15:39:25 -08:00
Ryan Huffman
cb9327e030
Add entity file sync and domain content backups
2018-02-15 10:09:20 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals
2018-02-14 17:33:01 -08:00
SamGondelman
324eefc914
remove fresnel, add unlit, fix overlays, cleanup
2018-02-14 17:02:07 -08:00
John Conklin II
63f752e76f
Merge pull request #12366 from sethalves/fix-children-of-animated-entity-joints
...
fix -- get children of animated entity joints to follow along, again
2018-02-14 11:12:45 -08:00
SamGondelman
4500ed17e7
merge from master
2018-02-13 13:58:39 -08:00
Andrew Meadows
20c2a4470e
merge 'findByID' into 'workload-001'
2018-02-13 11:47:02 -08:00
Andrew Meadows
38bc312004
faster and const EntityTree::findByID()
2018-02-13 11:25:34 -08:00
Andrew Meadows
a1c540fc85
instantiate trace_workload logging category
2018-02-13 08:57:20 -08:00
Andrew Meadows
d59c3898dc
add 'workload' logging profile
2018-02-13 08:57:20 -08:00
