Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-27 11:06:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68125 commits 23 branches 0 tags 1.2 GiB
Commit graph

68125 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Back
30855f94eb set last edited to 0 to ensure server update 2018-05-17 16:02:58 -07:00
Sam Gondelman
74840d2130
Merge pull request #12935 from gcalero/android_new_login 
Android new login
 2018-05-17 15:53:25 -07:00
Brad Davis
1aba6e8fe1 Fix unit test compile issues 2018-05-17 15:34:57 -07:00
Brad Davis
e81d2809c1 Fix unit testing setup 2018-05-17 15:05:40 -07:00
David Back
26b6b851f5 Merge branch 'cloneables' of github.com:dback2/hifi into cloneables 2018-05-17 14:50:39 -07:00
David Back
b8ce07744d initialize prop defaults, no bool returns 2018-05-17 14:50:14 -07:00
Dante Ruiz
0f122e3dbc Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates 2018-05-17 13:33:34 -07:00
Dante Ruiz
e760912fd2 fix warning 2018-05-17 13:33:19 -07:00
John Conklin II
fb7b1d3550
Merge pull request #13190 from Atlante45/new-master 
RC67.2 stable mergeback to master
 2018-05-17 13:10:00 -07:00
David Rowe
33ba559bb4 Show all OverlayWebWindows properties and functions together 2018-05-18 08:02:02 +12:00
David Rowe
2669a39e0f Deprecate Agent API items that shouldn't be exposed in the API 2018-05-18 07:32:25 +12:00
Clement
da08d747dc Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-05-17 12:10:08 -07:00
vladest
eb25601856 Return back LOD tools 2018-05-17 20:41:50 +02:00
Dante Ruiz
fb100dafe2
Merge pull request #8 from druiz17/menu-updates 
Menu updates
 2018-05-17 11:37:12 -07:00
Dante Ruiz
ccea493498 Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates 2018-05-17 11:36:03 -07:00
Dante Ruiz
201b8a5140 fixing the graphics preference 2018-05-17 11:35:34 -07:00
David Back
08ca2cd374
Merge pull request #1 from misslivirose/clone-server 
Entities.cloneEntity JSDoc
 2018-05-17 11:26:39 -07:00
Liv Erickson
ec8aa71dc4 Add JSDoc header to new clone function in Entity API 2018-05-17 11:25:20 -07:00
Liv Erickson
45e6d38d32 Merge branch 'cloneables' of https://github.com/dback2/hifi into clone-server 2018-05-17 11:19:18 -07:00
David Back
42d8492427 no clock skew 2018-05-17 11:17:04 -07:00
Liv Erickson
92e0f0403c Merge branch 'cloneables' of https://github.com/dback2/hifi into clone-server 2018-05-17 10:29:33 -07:00
David Back
3730cbe36c reconstruct cloneIDs lists on start, read/write locks on clone ID functions, fix removing last cloneable 2018-05-17 10:28:48 -07:00
John Conklin II
bb7d8463fc
Merge pull request #13177 from highfidelity/RC67.2 
Beta Release 67.2 - branched at Developer Release 8265
 2018-05-17 10:27:40 -07:00
Gabriel Calero
e10b716507 Revert audio fix 2018-05-17 14:26:36 -03:00
Gabriel Calero
5a73da6fdf Bugfix: stop audio when app starts 2018-05-17 14:05:49 -03:00
David Back
900b373c96 Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-17 09:04:28 -07:00
Liv Erickson
10f48bef2f Merge branch 'master' of github.com:highfidelity/hifi into clone-server 2018-05-17 08:59:52 -07:00
Gabriel Calero
96da032b16 Add missing js to haptic feedback change 2018-05-17 11:49:44 -03:00
Gabriel Calero
8741c5e6a4 Make haptic pulse duration configurable in VirtualPadDevice 2018-05-17 11:37:13 -03:00
vladest
95cd9476c3 Fixed modality in Desktop 2018-05-17 16:11:28 +02:00
David Rowe
d20cd6ad44 Add missing JSDoc of parameter in takeSecondaryCamera360Snapshot() 2018-05-17 20:25:25 +12:00
David Rowe
6db4dd8673 Merge branch 'master' into 21872-b 
# Conflicts:
#	interface/src/ui/Snapshot.h
 2018-05-17 20:11:14 +12:00
David Rowe
145d73aa76 OverlayWebWindow JSDoc fixes 2018-05-17 19:18:00 +12:00
David Rowe
6c3174ccf1 Make particle / light icon translate x-z when inside bounding box 2018-05-17 17:04:12 +12:00
David Rowe
801a4b9aba Make laser click in sky deselect entity 2018-05-17 15:09:23 +12:00
John Conklin II
1cba2edb03
Merge pull request #13185 from samcake/rc67.2-taaOn 
Rc67.2 Provide a toggle switch for TAA in the menu developer/render to opt-out
 2018-05-16 16:46:52 -07:00
Gabriel Calero
65a9b98b97 Use android.os.Vibrator to perform haptic feedback in Android 2018-05-16 20:07:10 -03:00
Dante Ruiz
c4c4490bc4
Merge pull request #7 from druiz17/menu-updates 
remove option for mouse sensivtity
 2018-05-16 15:48:26 -07:00
Dante Ruiz
2a6204ca8d remove option for mouse sensivtity 2018-05-16 15:47:55 -07:00
John Conklin II
4ce4afe0b1
Merge pull request #13180 from Cristo86/android_no_joystick_fix 
Fix Joystick/Control not showing up in Samsung after typing address (Android)
 2018-05-16 15:41:24 -07:00
samcake
ade1d6c056 use the correct call to toggle the debugFXAA on the AaConfig 2018-05-16 15:37:13 -07:00
Liv Erickson
ef6bf54f54 Merge branch 'cloneables' of https://github.com/dback2/hifi into clone-server 2018-05-16 15:29:03 -07:00
Zach Fox
ec29948b15
Merge pull request #13181 from zfox23/MS15103_snapFolderCrash 
Fix MS15103: Interface crashes on snap if snap dir is deleted
 2018-05-16 15:16:58 -07:00
Dante Ruiz
8bd37a61d6
Merge pull request #6 from druiz17/menu-updates 
Menu updates
 2018-05-16 15:08:55 -07:00
Dante Ruiz
f8e9afb115 fixing damn build issues 2018-05-16 15:08:09 -07:00
Dante Ruiz
3be4b01d2c move overlays menu back 2018-05-16 14:36:55 -07:00
Gabriel Calero
5370cb7725 Change login option UI 2018-05-16 18:15:31 -03:00
Cristian Luis Duarte
49f4ce9053 Android - Filter domains by tag 'mobile' in Search 2018-05-16 18:15:11 -03:00
Zach Fox
486f33b4bd Merge branch 'master' of github.com:highfidelity/hifi into MS15103_snapFolderCrash 2018-05-16 14:14:35 -07:00
Dante Ruiz
5432e8e7a4
Merge pull request #5 from druiz17/menu-updates 
Menu updates
 2018-05-16 13:50:39 -07:00