Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 09:02:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67886 commits 25 branches 0 tags 1.1 GiB
Commit graph

67886 commits

This branch
This branch
All branches
Author SHA1 Message Date
milad
3450af7a3d clean up 2018-05-21 21:52:20 -07:00
milad
24262e97a6 removed old cruft 2018-05-21 09:10:30 -07:00
milad
9c0bd89951 another round of fixing and merging 2018-05-21 09:09:18 -07:00
milad
99514d0cf9 Merge branch 'Image-Fixes' of https://github.com/MiladNazeri/hifi into gravprep-redo 2018-05-21 08:24:31 -07:00
milad
73dd5c7f36 fixed merge 2018-05-21 08:21:47 -07:00
milad
1e4d4dac44 cleaned up script 2018-05-20 23:39:47 -07:00
milad
e436f65d4c reworking gravprep to fix most links and oddities 2018-05-20 23:32:18 -07:00
milad
8e50c0fd56 Added pre typedef splits 2018-05-20 20:40:23 -07:00
milad
23ee06fc4b fixed class links 2018-05-20 14:35:58 -07:00
milad
8dd027eabe vec3 2018-05-20 14:22:51 -07:00
milad
0ccb233724 gravprep redo for link fixes 2018-05-20 14:18:39 -07:00
milad
46efb2b868 merging onto mac 2018-05-19 22:44:18 -07:00
tapalisa
1a06278b17
Merge pull request #13203 from ctrlaltdavid/21876-a 
Move Shapes app from hifi to hifi-content
 2018-05-18 16:52:30 -07:00
Liv
0927cadf10
Merge pull request #13093 from RebeccaStankus/edit-bug-14671 
moved checkEditPermissionsAndUpdate function to higher scope
 2018-05-18 16:44:53 -07:00
Liv
99960b3024
Merge pull request #13085 from ctrlaltdavid/21863 
Fix intermittent ability to select particle and light entities
 2018-05-18 16:44:11 -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
David Rowe
431c95cba9 Move Shapes app from hifi to hifi-content 2018-05-19 10:37:36 +12: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
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
RebeccaStankus
f4375d3e18 Merge branch 'edit-bug-14671' of github.com:RebeccaStankus/hifi into edit-bug-14671 2018-05-18 09:29:23 -07:00
RebeccaStankus
c6be00740c Merge branch 'master' of https://github.com/highfidelity/hifi into edit-bug-14671 2018-05-18 09:24:52 -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
Brad Davis
fb81cf927a Faster texture transfers 2018-05-18 09:21:02 -07:00
RebeccaStankus
27638b9ced Removing duplicate function 2018-05-18 09:20:03 -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
RebeccaStankus
93743538af
Removed duplicate function 2018-05-18 09:08:39 -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
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
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
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
milad
bbb1aa404f Merge commit 'refs/pull/13165/head' of https://github.com/highfidelity/hifi into gravprep-redo 2018-05-16 23:04:43 -07:00
David Rowe
6c3174ccf1 Make particle / light icon translate x-z when inside bounding box 2018-05-17 17:04:12 +12:00