Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-06 02:09:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67874 commits 25 branches 28 tags 1.2 GiB
Commit graph

67874 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gabriel Calero
a1a48d9b9e Merge remote-tracking branch 'upstream/master' into android_places_goto 2018-05-10 18:24:26 -03:00
Gabriel Calero
b2bedc4099 Merge branch 'android_places_goto' of https://github.com/Cristo86/hifi into android_places_goto 2018-05-10 18:22:41 -03:00
Cristian Luis Duarte
f30908fb26 Android - Remove delay starting Home + Change default joystick flag 2018-05-10 18:21:33 -03:00
Gabriel Calero
c6f93a17eb Fix freeze when quitting the app trough back button 2018-05-10 18:01:50 -03:00
John Conklin II
64d3219ee1
Merge pull request #12746 from gcalero/fix_radar_zoom_in 
Android: Fix zoom in unresponsive in radar mode
 2018-05-10 13:14:52 -07:00
Sam Gateau
fd9669b42d
Merge pull request #13125 from jherico/feature/testing 
Working on improved unit testing, adding texture transfer testing
 2018-05-10 12:29:43 -07:00
RebeccaStankus
cb4d9586fe
Update edit.js 2018-05-10 11:41:14 -07:00
Triplelexx
a061e84ad7 remove unused commented code 2018-05-10 19:40:02 +01:00
RebeccaStankus
0685201b68
Merge branch 'master' into edit-bug-14671 2018-05-10 11:40:00 -07:00
Brad Davis
cb336bdeab Fix linux build problems 2018-05-10 10:55:50 -07:00
John Conklin II
befb411f6e
Merge pull request #13025 from highfidelity/RC67 
Beta Release 67 - branched at developer release 8181
 2018-05-10 10:11:23 -07:00
Zach Fox
0236bc0c44 Cleanup after merge conflict 2018-05-10 09:51:45 -07:00
Zach Fox
ce575d367a Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-10 09:31:02 -07:00
NissimHadar
6c07f9554c Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1 2018-05-10 09:13:15 -07:00
Sam Gateau
bf85034f36 Tree view comming together for the engine! 2018-05-10 02:08:19 -07:00
Sam Gateau
70bafed463 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-09 18:41:32 -07:00
samcake
f08f77098d Adding a true ListView for the engine 2018-05-09 18:28:47 -07:00
Seth Alves
4410402c7d
Merge pull request #13114 from sethalves/more-logging-suppression 
more suppression of logging
 2018-05-09 17:36:12 -07:00
Cristian Luis Duarte
cd3836883b 10 seconds timeout hides name 2018-05-09 19:27:03 -03:00
samcake
652c754373 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-09 15:16:48 -07:00
Zach Fox
44cfa95830 Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-09 15:01:24 -07:00
John Conklin II
75164201d1
Merge pull request #13117 from SamGondelman/android 
Test highp floats for Android
 2018-05-09 14:36:51 -07:00
Simon Walton
9b6225db40 Bump default packet version 20 -> 21 2018-05-09 14:29:10 -07:00
Gabriel Calero
e0b57a2228 Code review in radar.js 2018-05-09 18:20:19 -03:00
MiladNazeri
bc03fb398f
Merge pull request #13102 from ctrlaltdavid/21856-h 
Fix JSDoc for Users.requestUsernameFromID
 2018-05-09 13:35:06 -07:00
Brad Davis
57691d5d66 Cache downloaded assets 2018-05-09 13:20:48 -07:00
Brad Davis
7fbad47351 Working on texture test 2018-05-09 13:20:48 -07:00
Brad Davis
1d403b4d67 Add texture transfer testing 2018-05-09 13:20:47 -07:00
Brad Davis
12ae44c14f Remove debugging pragma 2018-05-09 13:20:47 -07:00
Brad Davis
e9dc3c650b Breakup building and testing 2018-05-09 13:20:47 -07:00
Brad Davis
f206456cdd Restoring manual tests to solution, removing dead tests 2018-05-09 13:20:47 -07:00
Brad Davis
6e16109fa4 Fix unit test compile failures and crashes 2018-05-09 13:20:47 -07:00
Brad Davis
d5afb3a49b Move non-automated tests into new folder 2018-05-09 13:20:47 -07:00
Cristian Luis Duarte
936a319e62 Android - First version of showing up avatars names upon touch. Brought back (transparent) overlays into render forward task. 2018-05-09 17:15:57 -03:00
John Conklin II
59b9e08f58
Merge pull request #13131 from zfox23/MS14937_CheckoutContentSetFix 
MS14937: Fix Replace button for content sets during Checkout
 2018-05-09 13:04:10 -07:00
Seth Alves
16e832ac08 use setFilterRules rather than specifying each logging category to suppress 2018-05-09 13:01:49 -07:00
Seth Alves
7466d08f1f more suppression of logging 2018-05-09 13:01:49 -07:00
John Conklin II
4d224af7c7
Merge pull request #13137 from sethalves/fix-serverless-sim-ownership-rc67 
when in serverless mode, short-circuit simulation ownership bids
 2018-05-09 12:34:42 -07:00
NissimHadar
9d52306ac5 Merge branch 'master' of github.com:highfidelity/hifi into missingImagesMDfiles 2018-05-09 12:17:17 -07:00
Andrew Meadows
b8d34f4b8f more correct variable name 2018-05-09 12:13:27 -07:00
Andrew Meadows
f454dac709 avoid div by zero when measuring acceleration 2018-05-09 12:04:44 -07:00
NissimHadar
32f2494416 Stores previous user-selected folders. 2018-05-09 11:58:16 -07:00
John Conklin II
b9656e5c72
Merge pull request #13130 from samcake/blue 
Fix size calculation of compressed textures #13120
 2018-05-09 11:45:10 -07:00
samcake
70a570d958 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-09 11:31:59 -07:00
John Conklin II
e9ad50159c
Merge pull request #13136 from zfox23/RC67_MS14951 
RC67: MS14951: Fix Snapshot hotkey sound playback
 2018-05-09 11:11:33 -07:00
Howard Stearns
bf466344ee
Merge pull request #13135 from zfox23/MS14951_fixSnapshotHotkeySound 
MS14951: Fix Snapshot hotkey sound playback
 2018-05-09 11:07:46 -07:00
Seth Alves
db03265a6b when in serverless mode, short-circuit simulation ownership bids 2018-05-09 10:53:46 -07:00
Sam Gateau
17350a79dd
Merge pull request #13046 from NissimHadar/commandLineParametersForAutotester 
Command line parameters for autotester
 2018-05-09 10:51:31 -07:00
Gabriel Calero
843282739e Remove unused includes and white spaces 2018-05-09 14:16:51 -03:00
Thijs Wenker
a42491ded7
Merge pull request #13055 from misslivirose/remove-help-ftue 
Do not open help on first run
 2018-05-09 18:48:05 +02:00