Cristian Luis Duarte
|
55e64ceb55
|
Merge branch 'mm_1e08633' into android_places_goto
|
2018-04-20 13:32:23 -03:00 |
|
Cristian Luis Duarte
|
77caa4d402
|
Merge branch 'mm_c8bef86' into android_places_goto
|
2018-04-20 12:26:38 -03:00 |
|
Cristian Luis Duarte
|
dc321e4cd7
|
Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_places_goto
|
2018-04-19 18:46:44 -03:00 |
|
Gabriel Calero
|
f2184bf456
|
Handle android back button. Remove unused resources. Fix compilation errors.
|
2018-04-19 17:31:25 -03:00 |
|
Sam Gateau
|
1e086332cc
|
Merge pull request #12911 from jherico/feature/splash
Pre-requisite changes for splash screen rendering
|
2018-04-19 09:19:05 -07:00 |
|
Cristian Luis Duarte
|
5be9959424
|
Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_places_goto
|
2018-04-19 12:11:29 -03:00 |
|
Gabriel Calero
|
c8fe45eb8f
|
Remove debug statements and unused code. Put JNI code in a separated file.
|
2018-04-19 11:41:59 -03:00 |
|
Stephen Birarda
|
c4ad93bafb
|
Merge pull request #12782 from SimonWalton-HiFi/qregexp
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
|
2018-04-18 17:28:48 -07:00 |
|
Cristian Luis Duarte
|
9c44be3557
|
Merge remote-tracking branch 'gcgithub/android_new_login' into android_places_goto
|
2018-04-18 16:55:08 -03:00 |
|
Gabriel Calero
|
120de92c9e
|
Add login activity
|
2018-04-18 15:52:02 -03:00 |
|
John Conklin II
|
710bfb894a
|
Merge pull request #12907 from AndrewMeadows/more-correct-stats-002
more correct stats names
|
2018-04-18 10:50:38 -07:00 |
|
John Conklin II
|
005b6a6b1f
|
Merge pull request #12893 from ctrlaltdavid/21843
Fix overlay toggling
|
2018-04-18 10:49:05 -07:00 |
|
Stephen Birarda
|
95c172f418
|
Merge branch 'stable' of github.com:highfidelity/hifi into merge-back-stable-66
|
2018-04-17 15:34:46 -07:00 |
|
Zach Fox
|
3b8e52ea41
|
Merge pull request #12862 from zfox23/discovery_April2018
Discovery: April 2018 (Huge PR; see description)
|
2018-04-17 15:11:50 -07:00 |
|
Brad Davis
|
d478204722
|
Working on splash rendering
|
2018-04-17 14:17:41 -07:00 |
|
Cristian Luis Duarte
|
744fa808e3
|
Merge remote-tracking branch 'hifi/master' into android_places_goto
|
2018-04-17 13:11:02 -03:00 |
|
Anthony J. Thibault
|
0a162e62b0
|
transmit sendAll packet in nodeActivated signal callback
(cherry picked from commit 9f1a8290148da12849935c916b2e0a59864cb49b)
|
2018-04-16 16:16:56 -07:00 |
|
Andrew Meadows
|
a80cf49eb3
|
split 'ETRupdate' out of 'postPhysics' stat context
|
2018-04-16 13:31:36 -07:00 |
|
Andrew Meadows
|
ace32193b4
|
more correct stat names
|
2018-04-16 13:31:36 -07:00 |
|
Gabriel Calero
|
e3b94b163c
|
Merge remote-tracking branch 'upstream/master' into android_goto_splash
|
2018-04-16 14:55:16 -03:00 |
|
Sam Gateau
|
3ac4a1db2d
|
Merge pull request #12850 from SimonWalton-HiFi/early-trace
Enable Interface tracing from earliest execution point
|
2018-04-16 10:24:55 -07:00 |
|
Zach Fox
|
071bf35683
|
Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018
|
2018-04-16 10:11:44 -07:00 |
|
David Rowe
|
df31d20430
|
Fix overlay toggling
|
2018-04-14 17:06:34 +12:00 |
|
Seth Alves
|
a56f3f4a10
|
code review
|
2018-04-12 19:06:12 -07:00 |
|
Simon Walton
|
76468f7f26
|
Use existing DISABLE_WATCHDOG global to turn off thread entirely
|
2018-04-12 16:58:13 -07:00 |
|
Clement
|
157ca8cd68
|
Update docs with correct qt version
|
2018-04-12 16:21:26 -07:00 |
|
Gabriel Calero
|
bd4a7ce4fa
|
Hide jump button while moving. Fix jump button right alignment in pixel
|
2018-04-12 19:02:03 -03:00 |
|
Simon Walton
|
5c141aa5e9
|
Add --disableWatchdog command-line option
Watchdog still runs but doesn't abort on timeout.
Also fixes for previous tracing improvements.
|
2018-04-12 09:28:28 -07:00 |
|
Zach Fox
|
a9b9a1cb10
|
Commerce: Gifts
|
2018-04-10 15:54:19 -07:00 |
|
Seth Alves
|
f81836c830
|
support specification of named landing-points in serverless-domain json files
|
2018-04-10 14:25:59 -07:00 |
|
Simon Walton
|
ca5720c015
|
Take out superfluous DependencyManager::set<tracing::Tracer>()
|
2018-04-10 13:52:46 -07:00 |
|
Simon Walton
|
cf3648409d
|
Allow duration for tracing, other fixes
|
2018-04-10 13:14:52 -07:00 |
|
Simon Walton
|
513a4875f0
|
Move --traceFile option to start of main()
|
2018-04-10 13:13:47 -07:00 |
|
Gabriel Calero
|
b30cb25a3f
|
Merge remote-tracking branch 'upstream/master' into android_goto_splash
|
2018-04-09 12:20:35 -03:00 |
|
Gabriel Calero
|
e85f5c97dc
|
Remove bottom bar. Apply new design for android
|
2018-04-09 11:41:00 -03:00 |
|
Stephen Birarda
|
1d76dea9f6
|
Merge pull request #12818 from highfidelity/RC66
Merge back RC66 to master
|
2018-04-06 10:43:01 -07:00 |
|
Gabriel Calero
|
0da2c972e3
|
Merge remote-tracking branch 'upstream/master' into android_goto_splash
|
2018-04-05 16:22:56 -03:00 |
|
John Conklin II
|
9e21bab67e
|
Merge pull request #12748 from AndrewMeadows/untangle-003
cleanup around simulation-ownership
|
2018-04-05 10:58:45 -07:00 |
|
Seth Alves
|
4b0d338e57
|
on first run, send user to serverless tutorial rather than checking for a local sandbox
|
2018-04-04 18:00:11 -07:00 |
|
Gabriel Calero
|
99d8f822b2
|
Fix crash selecting domain for second time. Stop rendering while Goto activity is started
|
2018-04-04 19:24:26 -03:00 |
|
Simon Walton
|
692ccfc09b
|
Create HIFI_FCDEBUG(_ID) variants that require a category
Original macros use default settings.
|
2018-04-04 09:49:15 -07:00 |
|
Gabriel Calero
|
ddbf4417ff
|
Merge remote-tracking branch 'upstream/master' into android_goto_splash
|
2018-04-04 12:24:25 -03:00 |
|
Simon Walton
|
7d16ca9c1c
|
Remove uses of addRepeatedMessageRegex() and its implementation
Change to new log-message ID scheme.
|
2018-04-03 17:54:01 -07:00 |
|
Clément Brisset
|
3d4490f3fd
|
Merge pull request #12737 from highfidelity/RC66
RC66 mergeback
|
2018-04-03 15:39:16 -07:00 |
|
Gabriel Calero
|
2ff13270ed
|
Go back to GoTo screen
|
2018-04-02 12:22:21 -03:00 |
|
Andrew Meadows
|
73fa6d3d2f
|
slightly simpler EntityMotionState delete logic
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
6837d042ad
|
move entityCollisionWithEntity to PhysicalEntitySimulation
|
2018-03-30 13:18:32 -07:00 |
|
Gabriel Calero
|
b123b67134
|
Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash
|
2018-03-30 15:38:36 -03:00 |
|
John Conklin II
|
5013760aa1
|
Merge pull request #12742 from jherico/fix/rc66_crashes
Fix/rc66 crashes
|
2018-03-29 18:04:52 -07:00 |
|
Seth Alves
|
dcfebde54a
|
put back the pre serverless-domain behavior for when a json file is dragged-and-dropped into the interface window -- import the json rather than load as a serverless-domain
|
2018-03-29 10:50:43 -07:00 |
|