Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 20:57:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67922 commits 76 branches 59 tags 1.2 GiB
Commit graph

67922 commits

This branch
This branch
All branches
Author SHA1 Message Date
druiz17
f2807e38f9 fix goto shortcut 2018-05-19 17:36:46 -07:00
Dante Ruiz
8a2b54c2b7 fixing mistakes 2018-05-18 17:09:41 -07:00
Dante Ruiz
3b59af3ed7 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-18 16:42:31 -07:00
Dante Ruiz
60dd7e49ab making requested changes 2018-05-18 16:41:39 -07:00
Sam Gateau
8ae253019c
Merge pull request #13201 from samcake/brown 
Fix Flickery Procedural Shader
 2018-05-18 16:11:21 -07:00
Sam Gateau
026cae09f7
Merge pull request #13200 from Cristo86/gles_ishazeenabled_error_fix 
Fix isHazeEnabled() checks with 0.0 to fix GLES compiler error
 2018-05-18 15:44:24 -07:00
Sam Gateau
07f1ab8c98
Merge pull request #13194 from SamGondelman/resolution 
Fix Scale Resolution option
 2018-05-18 15:23:01 -07:00
samcake
0e66ca1dfd Fixing the procedural shader flickering key lighting, this is due to the LightingMOdel binding slot not assigned 2018-05-18 13:25:08 -07:00
Cristian Luis Duarte
c7edf72f71 Check isHazeEnabled() vs 0.0 to compile on GLES 2018-05-18 15:59:24 -03:00
Dante Ruiz
6eb5a78611 fixing code that breaks andriod build 2018-05-18 10:33:03 -07:00
Sam Gateau
efca568dbe
Merge pull request #13198 from NissimHadar/autoTesterUsePeriods 
Updated auto-tester.
 2018-05-18 10:15:55 -07:00
Sam Gateau
964d5b5715
Merge pull request #13096 from jherico/transfer2 
Faster texture transfers
 2018-05-18 10:05:57 -07:00
Anthony Thibault
e09cb2dfdb
Merge pull request #13151 from thoys/fix/update-eslint-config 
eslint config update [ skip builds ]
 2018-05-18 10:02:42 -07:00
Brad Davis
3356486f27 Fix populated texture size tracking 2018-05-18 09:23:54 -07:00
Brad Davis
91f1d93d4e Fix flicker while transferring texture data 2018-05-18 09:23:54 -07:00
Brad Davis
ae07036f20 Add ideal resource texture memory stat 2018-05-18 09:23:53 -07:00
Dante Ruiz
ea771c2325 make final changes 2018-05-18 09:21:41 -07:00
Brad Davis
fb81cf927a Faster texture transfers 2018-05-18 09:21:02 -07:00
Liv
40ff3f966f
Merge pull request #13165 from ctrlaltdavid/21872-b 
JSDoc stubs for various APIs
 2018-05-18 09:11:55 -07:00
NissimHadar
a0462451be Updated auto-tester 2018-05-18 09:09:29 -07:00
SamGondelman
c57c15f22c fix resolution option 2018-05-17 16:58:35 -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
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
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
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
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
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