Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-18 00:40:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
64905 commits 25 branches 0 tags 1.1 GiB
Commit graph

64905 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
f14673bc50 Fixup Checkout for apps 2018-02-22 16:38:38 -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
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
John Conklin II
730dce31e3
Merge pull request #12444 from zfox23/commerce_extendedCerts_1 
Commerce: Extended Certificate Support, V1
 2018-02-22 15:19:57 -08:00
Stephen Birarda
fc9af39745
Merge pull request #12451 from SimonWalton-HiFi/moc-fixes 
Add #include of Forward.h to AudioMixer.h
 2018-02-22 16:09:24 -07:00
Atlante45
7bad82818b Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-02-22 14:45:41 -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
NissimHadar
bb04f3f533 CR corrections. 2018-02-22 13:57:46 -08:00
Zach Fox
4d2d7fa51f lots of fun initial progress! 2018-02-22 13:56:46 -08:00
SamGondelman
a9b08e97f4 merge 2018-02-22 13:52:43 -08:00
NissimHadar
c6580f642a Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-22 13:45:00 -08:00
Alexander Ivash
c15cf33ca1 12518 - Help icon in toolbar does not highlight when help window is open 2018-02-23 00:36:00 +03:00
John Conklin II
43afd257b6
Merge pull request #12361 from highfidelity/RC64 
Beta Release 64 - includes up to Developer Release 7818
 2018-02-22 13:22:47 -08:00
Simon Walton
a0a12258bf Merge branch 'master' into moc-fixes 2018-02-22 11:06:53 -08:00
John Conklin II
e1ed0977e8
Merge pull request #12469 from jherico/RC64_stable 
Merge from stable back into RC64
 2018-02-22 10:58:38 -08:00
Zach Fox
3d4e6de6ab Quick bugfix 2018-02-22 10:49:11 -08:00
ZappoMan
af4f51ecfb Merge branch 'master' of https://github.com/highfidelity/hifi into relaxDeadlockWatchdog 2018-02-22 10:23:36 -08:00
Brad Davis
2f34fb2e42 Merge remote-tracking branch 'upstream/stable' into HEAD 2018-02-22 10:20:10 -08:00
Nissim Hadar
a843a53427 Improved JSDoc comments. 2018-02-22 10:17:20 -08:00
Liv
478ec48b63
Merge pull request #12463 from misslivirose/fix/edit-bugs 
Fix two bugs with Create Menu
 2018-02-22 09:43:50 -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
Seth Alves
c534e3a6e4
Merge pull request #12356 from ctrlaltdavid/21742 
Handle tablet entities and overlays not being available
 2018-02-22 08:48:13 -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
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
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
humbletim
b0f444e179 remove dead code 2018-02-22 08:36:37 -05:00
humbletim
ec4f9fdc11 fix displayName 2018-02-22 08:31:05 -05:00
humbletim
d52dce8e09 restore code for debugging 2018-02-22 08:24:56 -05:00
humbletim
e3c269d582 remove debug string 2018-02-22 08:22:13 -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
caab532d80 remove dupe line 2018-02-22 06:00:03 -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
John Conklin II
37645022f6
Merge pull request #12344 from ctrlaltdavid/21739 
Recording app fixes
 2018-02-21 17:03:54 -08: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
Liv Erickson
aba1cae36d get rid of magic number 2018-02-21 16:19:50 -08:00
tapalisa
1f958c247f
Merge pull request #12391 from 1P-Cusack/FogBugz/Case_4315_colorpreview_final 
[Case 4315] Fixes ColorPicker Color Preview functionality
 2018-02-21 16:09:47 -08:00
SamGondelman
4b1217f1f6 move all entity items to main thread 2018-02-21 15:54:07 -08:00
Liv Erickson
990e848de6 fix typo that was breaking popup dialog 2018-02-21 15:54:00 -08:00
Liv Erickson
68f0c0391a Initial fix - need a little style fixing 2018-02-21 15:44:23 -08:00
David Back
10f99602bb Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMotors 2018-02-21 14:32:24 -08:00
Nissim Hadar
049beba157 Corrected edge case of creating a snapshot with "" as the filename. 2018-02-21 14:15:41 -08:00
David Rowe
fa1f2267cf Support RC63 2018-02-22 10:06:00 +13:00