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
aa7bd2066a
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
2018-02-26 17:02:00 -08:00
John Conklin II
6316f33282
Merge pull request #12485 from dback2/avatarMotors
...
Add dynamic mode for scripted avatar motor
2018-02-26 11:03:30 -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
NissimHadar
c0f20900a0
Merge pull request #12458 from NissimHadar/snapshotDefaultNameFix
...
Corrected edge case of creating a snapshot with "" as the filename.
2018-02-26 09:39:16 -08:00
Zach Fox
b5c42bfeca
Merge pull request #12480 from zfox23/commerce_extendedCerts_apps
...
Commerce: Extended Certificates - Apps!
2018-02-26 08:24:53 -08: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
Seth Alves
9e156deaab
Merge pull request #12494 from druiz17/one-menu
...
Remove the avatarEntitiesBookmark menu option
2018-02-23 19:02:25 -08:00
Brad Hefta-Gaub
3d54f4d246
Merge pull request #12484 from ZappoMan/relaxDeadlockWatchdog
...
Relax deadlock watchdog
2018-02-23 17:09:30 -08:00
Atlante45
800d15b405
Make sure settings timer is running
2018-02-23 16:23:50 -08:00
Sam Gondelman
e10af9b83d
Merge pull request #12462 from SamGondelman/entityDelete
...
Fix EntityItems not getting destroyed
2018-02-23 16:17:52 -08:00
David Back
283b5724ba
CR changes
2018-02-23 15:02:51 -08:00
David Back
da391564a8
CR changes
2018-02-23 15:01:29 -08:00
David Back
a418129bea
simplify to just changing timescales
2018-02-23 15:00:23 -08:00
Dante Ruiz
d0ec84b6c8
remove menu option for booking marking avatar entities
2018-02-23 10:45:59 -08:00
Zach Fox
5ee28297f3
Don't use eventLoop, since that will block the UI
2018-02-23 10:19:00 -08: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
ZappoMan
9f68accb30
add menu for testing unresponsive interface
2018-02-22 17:34:00 -08:00
David Back
083e461eb0
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMotors
2018-02-22 17:20:49 -08:00
David Back
902672f85e
add dynamic mode for scripted avatar motor
2018-02-22 17:20:36 -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
Zach Fox
33f73fef0d
YAY!
2018-02-22 16:26:35 -08:00
Zach Fox
10fa3fa346
It's working!
2018-02-22 16:09:01 -08:00
Zach Fox
de0eee52d6
cool
2018-02-22 14:45:32 -08:00
ZappoMan
e9cad947d7
add the deadlock watchdog stats to the stats metaverse checkin data
2018-02-22 14:01:56 -08:00
Zach Fox
4d2d7fa51f
lots of fun initial progress!
2018-02-22 13:56:46 -08:00
NissimHadar
c6580f642a
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
2018-02-22 13:45:00 -08:00
Nissim Hadar
a843a53427
Improved JSDoc comments.
2018-02-22 10:17:20 -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
ZappoMan
aa5542c54b
Merge branch 'master' of https://github.com/highfidelity/hifi into relaxDeadlockWatchdog
2018-02-22 08:43:13 -08:00
humbletim
dd90c8c515
fix ubuntu compile warnings
2018-02-22 10:16:34 -05:00
humbletim
4fd3d9bf7b
cleanup; formalize data structures
2018-02-22 08:18:38 -05:00
humbletim
fe9b67344b
remove unnecessary UUID check
2018-02-22 07:58:49 -05:00
humbletim
e4a2a589a5
CR fedback and cleanup
2018-02-22 07:56:09 -05: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
Seth Alves
db195c6184
Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items
...
Remove some deprecated JavaScript API items
2018-02-21 16:31:16 -08:00
SamGondelman
4b1217f1f6
move all entity items to main thread
2018-02-21 15:54:07 -08:00
Nissim Hadar
049beba157
Corrected edge case of creating a snapshot with "" as the filename.
2018-02-21 14:15:41 -08:00
Nissim Hadar
bf4ba07b72
Added parameters to canCastShadow - still sucks.
2018-02-21 12:36:34 -08:00
Zach Fox
74655bde49
Fix skeletonmodelURLchanged signal
2018-02-21 12:12:20 -08:00
ZappoMan
47a98d9d0f
relax the deadlock time to 2 minutes
2018-02-21 10:12:04 -08:00
Nissim Hadar
6f84e4c977
Moved shadows and ambient occlusion to menu checkboxes.
2018-02-20 23:45:07 -08:00
SamGondelman
4c6169ec78
merge and a little cleanup
2018-02-20 15:45:34 -08:00
Zach Fox
2daa30f125
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-20 12:41:12 -08:00
humbletim
5791ca4c51
interim checkin
2018-02-20 12:22:04 -05:00
