Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-09 23:52:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
78484 commits 17 branches 0 tags 1.1 GiB
Commit graph

78484 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
997dc963d3 Merge branch 'master' into M22147 2019-05-15 07:59:10 +12:00
David Rowe
d5bb7f25e1 Doc review 2019-05-15 07:56:55 +12:00
Zach Fox
f43c376a6a Tweak top bar 2019-05-14 12:41:56 -07:00
Zach Fox
8724cf4edf UIT TextField 2019-05-14 12:27:33 -07:00
amerhifi
346d8d5039 Merge branch 'feature/platform' of https://github.com/amerhifi/hifi into feature/platform 2019-05-14 12:09:03 -07:00
amerhifi
18fe18ee12 elseif typo 2019-05-14 12:07:59 -07:00
Zach Fox
2080aa6676 Some fun motion for experimentation 2019-05-14 11:56:07 -07:00
Zach Fox
cf46f3c9d4 CheckBox UIT and CheckBox added to Avatar app 2019-05-14 11:50:07 -07:00
Shannon Romano
ec11d70801
Merge pull request #15232 from highfidelity/robin-k-wilson-patch-1 
Update BUILD_WIN.md
 2019-05-14 10:55:10 -07:00
Shannon Romano
c677f71650
Merge pull request #15514 from zfox23/privateUserData 
New Entity Property: Private User Data
 2019-05-14 10:24:39 -07:00
Roxanne Skelly
68fb43ec7f Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug 2019-05-14 10:11:02 -07:00
Andrew Meadows
5a257eb137 avoid crash for RenderableModelEntityItem with invalid model 2019-05-14 09:48:06 -07:00
amerhifi
fe6b2fceed addressing comment in pr. removing extra space added in previous checkin 2019-05-14 09:39:44 -07:00
Zach Fox
c57ddf969a Merge branch 'master' of github.com:highfidelity/hifi into simplifiedUI 2019-05-14 09:32:07 -07:00
amerhifi
a5f4664001 Merge branch 'master' into feature/platform 2019-05-14 09:27:15 -07:00
Shannon Romano
8597a51657
Merge pull request #15556 from jherico/fix/watchdog_spam 
BUGZ-131: Additional silencing of watchdog spam
 2019-05-14 08:10:02 -07:00
amerhifi
2a6dc53395 Merge branch 'master' into feature/platform 2019-05-14 06:18:37 -07:00
Howard Stearns
33f1bd965e
Merge pull request #15549 from SimonWalton-HiFi/call-reset-in-NodeList 
Call correct NodeList::reset() from Application
 2019-05-13 19:49:41 -07:00
Brad Davis
7d8e14f510 Additional silencing of watchdog spam 2019-05-13 18:19:29 -07:00
Andrew Meadows
0eea6d1988
Merge pull request #15554 from sethalves/cleanup-deleted-av-ents 
case 123: delete children of deleted avatar-entity
 2019-05-13 18:18:36 -07:00
amerhifi
dc139dc04d added missing eof 2019-05-13 17:47:12 -07:00
amerhifi
830f3dc976 moved all hard coded json keys to platform::jsonkeys namespace and file 2019-05-13 17:45:57 -07:00
Brad Hefta-Gaub
e32979748b
Merge pull request #15552 from howard-stearns/longer-timeout-to-removeSilentNodes 
Longer timeout to remove silent nodes
 2019-05-13 17:40:48 -07:00
Seth Alves
8b2d12e2f7 when an avatar entity is deleted, also delete its descendants 2019-05-13 17:33:10 -07:00
Seth Alves
d630f90f4d
Merge pull request #15548 from SamGondelman/tests 
BUGZ-173: Fix deadlock on startup
 2019-05-13 17:32:32 -07:00
Zach Fox
89006cd9c5 Hide controls in top left; don't remove certain menus; fixup slider UIT 2019-05-13 17:26:19 -07:00
Roxanne Skelly
aa16430cf4 add a comment and kick build servers 2019-05-13 17:25:06 -07:00
amerhifi
95e3eede5f moved instance to own file. moved functions based on comments in pr 2019-05-13 17:07:25 -07:00
Howard Stearns
aeff5d93d8 try a longer timeout before we removeSilentNodes 2019-05-13 16:57:38 -07:00
amerhifi
804d171102 fixed a bunch of pr comments 2019-05-13 16:38:11 -07:00
Roxanne Skelly
4ad3163ca5 Disable event queue debugging for non-windows platforms. 2019-05-13 16:37:45 -07:00
jennaingersoll
4c6c0acc56
Merge pull request #15454 from ctrlaltdavid/M22246 
Case 22246: Picks, PickType, RayPick JSDoc update
 2019-05-13 16:16:17 -07:00
Shannon Romano
53b80ba404
Merge pull request #15550 from huffman/fix/gettransform-spam 
BUGZ-89: Suppress getTransform spam
 2019-05-13 16:13:46 -07:00
Zach Fox
2ce9e9ee10 The right way to restrict private user data: 2019-05-13 16:07:29 -07:00
Roxanne Skelly
0319e8cc4d Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug 2019-05-13 16:01:39 -07:00
Zach Fox
7bb2d6871b Simlpified Slider (not totally working; position is off) 2019-05-13 15:58:04 -07:00
Roxanne Skelly
72fe3a66f5 Debugging code to monitor the queue depth for a few critical threads 2019-05-13 15:56:55 -07:00
Simon Walton
305a215d21 Pass a QObject context for the functor 2019-05-13 15:50:04 -07:00
Shannon Romano
72d000a76d
Merge pull request #15521 from ctrlaltdavid/M22489 
Case 22489: Scene JSDoc
 2019-05-13 15:49:44 -07:00
amerhifi
9652d412ac Merge branch 'master' into feature/platform 2019-05-13 15:39:55 -07:00
David Rowe
70ec84177a Doc review 2019-05-14 10:32:28 +12:00
jennaingersoll
712167c623
Merge pull request #15476 from ctrlaltdavid/M22407 
Case 22407: Quat JSDoc update
 2019-05-13 15:17:58 -07:00
Ryan Huffman
2e2d0add93 BUGZ-89: Suppress getTransform spam 2019-05-13 14:50:46 -07:00
Simon Walton
ede8859cc7 Call correct NodeList::reset() from Application 2019-05-13 14:38:34 -07:00
Howard Stearns
ee1231362c Merge branch 'tests' of git://github.com/SamGondelman/hifi into SamGondelman-tests 2019-05-13 14:26:15 -07:00
SamGondelman
652ac17dac fix deadlock on startup 2019-05-13 14:17:55 -07:00
Zach Fox
e87381f431 Merge branch 'master' of github.com:highfidelity/hifi into privateUserData 2019-05-13 14:13:34 -07:00
Zach Fox
55138ed088 CR feedback 2019-05-13 14:12:51 -07:00
Brad Hefta-Gaub
51f2d1748e
Merge pull request #15544 from sabrina-shanman/bug_avatar_res-state 
(BUGZ-40) Check for possible avatar fade race condition
 2019-05-13 13:41:09 -07:00
Shannon Romano
32d3014d0d
Merge pull request #15301 from SaracenOne/disable_away_on_focus_loss_push_2 
case 22190: Disable triggering away state when interface focus lost
 2019-05-13 13:22:28 -07:00