Stephen Birarda
2158acecf4
tell cmake we are fine ignoring generated for CMP0071
2018-03-08 12:39:40 -08:00
John Conklin II
b4000c04bc
Merge pull request #12432 from highfidelity/feat/content-settings
...
Add content archives to domain server web interface
2018-02-27 13:30:53 -08:00
SamGondelman
0fca56eef0
Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
...
This reverts commit 3201d2ba21c0f20900a0
2018-02-27 11:33:05 -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
abe7c29b5e
Merge pull request #12492 from thoys/fix/exportBooleanPropertiesProperly
...
Export boolean entity properties properly
2018-02-27 09:18:46 -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
Ryan Huffman
8a8830bbd4
Fix writeSubclassData in octree data
2018-02-26 17:06:25 -08:00
Stephen Birarda
aa7bd2066a
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
2018-02-26 17:02:00 -08:00
Ryan Huffman
ec210e1750
Move OctreeUtils to OctreeDataUtils
2018-02-26 16:51:42 -08:00
Ryan Huffman
3fa538d42d
Add RawEntityData subclass
2018-02-26 16:32:09 -08:00
Atlante45
2a204533f4
Add comments to startup processes
2018-02-26 16:25:41 -08:00
humbletim
d3bae87066
* remove unneeded Q_DECLARE_METATYPEs
...
* CR feedback
2018-02-26 19:07:55 -05:00
humbletim
767569bc40
* changes per CR feedback
...
* make MeshPart.topology read-only
* JS Graphics API starter documentation
* remove redundant qscriptvalue sequence registrations
2018-02-26 18:00:22 -05:00
Ryan Huffman
65a4b3d316
Revert change to packet reading in Socket.cpp
2018-02-26 14:43:50 -08:00
Ryan Huffman
dbfbee5406
CR
2018-02-26 13:53:20 -08:00
Ryan Huffman
24da043937
Merge pull request #12437 from sethalves/fix-qt-5-10-udt
...
fix Qt 5.10 udt packet reading
2018-02-26 13:50:41 -08:00
Seth Alves
d60d8fe702
Merge pull request #12498 from vladest/fix_crash_startup
...
Search main window by checking object name
2018-02-26 13:06:10 -08:00
Sam Gondelman
d1d6adf447
Merge pull request #12493 from sethalves/fix-shadows-on-osx-1
...
fix osx shadows
2018-02-26 11:46:43 -08:00
Anthony J. Thibault
f5fcaae283
Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions
2018-02-26 10:55:44 -08:00
John Conklin II
3201d2ba21
Merge pull request #12407 from NissimHadar/shadowControlsOffZvork
...
Shadow control for zones, models and shapes
2018-02-26 10:13:40 -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
vladest
77ef0e05a1
Search main window by checking object name
2018-02-26 13:43:50 +01:00
humbletim
3dbe5d79bb
fix windows punctilious warnings
2018-02-26 06:01:16 -05:00
humbletim
54dc0240b0
remove bufferviewscripting refs; fix compiler warnings
2018-02-26 05:26:35 -05:00
humbletim
f824edd04e
* remove Model_temporary_hack
...
* split gpuhelpers and mesh part
* fix objwriter
* more work on bufferview helpers
* cr cleanup
2018-02-26 04:58:22 -05:00
Sam Gondelman
e10af9b83d
Merge pull request #12462 from SamGondelman/entityDelete
...
Fix EntityItems not getting destroyed
2018-02-23 16:17:52 -08:00
Seth Alves
59bd05aa55
make shadow-related shader compile on osx
2018-02-23 09:22:34 -08:00
Thijs Wenker
a27a5a7e1f
export boolean properties properly
2018-02-23 18:16:38 +01:00
humbletim
7c571cd431
cleanup / addition error message detail
2018-02-23 10:31:57 -05:00
humbletim
058e4d1926
CR feedback; whitespace / remove unnecessary diffs
2018-02-23 09:12:33 -05:00
humbletim
f8fe06213d
CR feedback; whitespace / remove unnecessary diffs
2018-02-23 09:11:23 -05:00
humbletim
ebdb5b3c17
CR feedback; remove unrollVertices; update getFace; guard more debug logging
2018-02-23 08:57:48 -05:00
humbletim
6ea4b660b7
CR feedback; remove ok bool pointer and all metadata; cleanup
2018-02-23 07:47:39 -05: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
humbletim
0dd3672162
CR feedback / cleanup
2018-02-22 21:20:56 -05:00
humbletim
d1c4bde677
revert OBJWriter.cpp
2018-02-22 20:53:27 -05:00
Atlante45
277e556b48
Create a standard function to init Hifi Apps
2018-02-22 17:06:09 -08:00
NissimHadar
3150b963c0
Implemented call to abortTask().
2018-02-22 16:29:58 -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
NissimHadar
bb04f3f533
CR corrections.
2018-02-22 13:57:46 -08:00
NissimHadar
c6580f642a
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
2018-02-22 13:45:00 -08:00
Zach Fox
90f05f4db7
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-22 09:23:49 -08:00
Anthony J. Thibault
86351f19a9
Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions
2018-02-22 08:44:21 -08:00
humbletim
dd90c8c515
fix ubuntu compile warnings
2018-02-22 10:16:34 -05:00
humbletim
010c714abc
restore original Entities.getMeshes
2018-02-22 08:51:54 -05:00
humbletim
4d43e54346
use shared buffer_helpers::clone
2018-02-22 08:41:15 -05:00
