Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 10:07:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76880 commits 25 branches 0 tags 1.1 GiB
Commit graph

76880 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Back
f6baa2432a design feedback 2019-02-14 17:27:05 -08:00
Sam Gateau
0d6bf79139
Merge pull request #14924 from amerhifi/feature/quest 
Case 21032: Quest lifecycle start/stop fix. Partial fix to pause/resume
 2019-02-14 17:19:19 -08:00
amer cerkic
272b941b17 removed an obselete variable 2019-02-14 17:14:28 -08:00
Sam Gateau
34db48d3a3 Merging and resolving conflict 2019-02-14 17:03:44 -08:00
Anthony Thibault
a3407b96b0 Merge branch 'master' into bug-fix/revert-anim-pose-optimization 2019-02-14 16:56:17 -08:00
Sam Gateau
6168001ad4
Merge pull request #14909 from AndrewMeadows/update-collision-group-after-grab-80 
Case 21159: fixes for more grab bugs
 2019-02-14 16:52:03 -08:00
amer cerkic
165ec3feca removing unused reference no longer reachable 2019-02-14 16:41:28 -08:00
amer cerkic
72200618d9 cleanup of my debugging items 2019-02-14 16:38:15 -08:00
amer cerkic
7037e14d09 merging from upstream 2019-02-14 16:31:04 -08:00
David Back
46ff3a8405 add select/clear all buttons to entity type dropdown 2019-02-14 16:16:33 -08:00
Anthony Thibault
39b4eaac34 Revert "AnimPose operator* optimizations" 
This reverts commit 569bef50fd.
 2019-02-14 16:13:00 -08:00
Anthony Thibault
f0e163b4df Revert "AnimPose::inverse() optimization" 
This reverts commit 5c7e81584c.
 2019-02-14 16:10:26 -08:00
David Back
7cffcf2215 error handling, warnings for duplicate textures 2019-02-14 16:09:48 -08:00
Ryan Huffman
e800a6e030 Update hard-coded vec3 zero with Vec3.ZERO 2019-02-14 15:56:17 -08:00
Sam Gateau
fc1d3df613 Merge branch 'brown' of github.com:samcake/hifi into brown 2019-02-14 15:44:26 -08:00
Sam Gateau
522a9ed7c1 Keeping only the minimum for quest 2019-02-14 15:43:36 -08:00
Simon Walton
75901a1e37
Merge pull request #14853 from SimonWalton-HiFi/installer-removes 
Case 20496: Windows (NSIS) installer shouldn't remove unselected component upon reinstall
 2019-02-14 15:41:25 -08:00
Sam Gateau
98a5ec84a9 Adjusting the HUD operator render job to shave an extra framebuffer 2019-02-14 15:35:02 -08:00
Andrew Meadows
b94655260d don't traverse for fullUpdate on changed view 2019-02-14 14:54:10 -08:00
amer cerkic
8d522d9ce7 fixed issues with pause/resume and start/stop. still issues with input after resume 2019-02-14 14:48:56 -08:00
Shannon Romano
453c081d9b
Merge pull request #14901 from huffman/fix/dropdown-close-on-click 
Case 19999: Update edit.js to auto close dropdowns when clicking outside
 2019-02-14 14:48:03 -08:00
NissimHadar
cf2e118c14 Added missing double-quote. 2019-02-14 14:33:49 -08:00
raveenajain
01def37efd spacing 2019-02-14 14:22:43 -08:00
NissimHadar
a1e289cc1c Compilation error on Qt 5.12 2019-02-14 14:17:29 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal 
Case 20723, Case 20334: Internally, replace all overlays with local entities
 2019-02-14 13:49:47 -08:00
NissimHadar
90aff53408 Merge branch 'master' of github.com:highfidelity/hifi into 21193-updateNitpickReadme 2019-02-14 13:47:16 -08:00
NissimHadar
ba68421d0c Completed manual. 2019-02-14 13:46:51 -08:00
NissimHadar
705a0bcaa0 Updated manual to include Android. 2019-02-14 13:41:54 -08:00
SamGondelman
bed2732d34 start moving materials to rendering only 2019-02-14 12:59:16 -08:00
Brad Davis
292602afd7 Resolving more master differences 2019-02-14 12:55:28 -08:00
Brad Davis
0f4d1f073b Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-14 12:49:56 -08:00
Sam Gateau
969c62d0df
Merge pull request #14907 from danteruiz/fix-qml-crash-on-mac 
Case 21157: Fix Desktop.qml crash on local mac build
 2019-02-14 12:15:50 -08:00
Sam Gateau
384d4fb959
Merge pull request #14809 from highfidelity/commandLineAndroid 
case 19113: Recreated changes due to CLA issue in previous pr. Adding args to int…
 2019-02-14 12:10:08 -08:00
raveenajain
e825be566d Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_tangents 2019-02-14 11:45:53 -08:00
David Back
4e4ec9940f copy external texture dependencies 2019-02-14 11:38:39 -08:00
John Conklin II
5e177c31ee
Merge pull request #14912 from NissimHadar/21185-protectNitpickFromBadFilename 
Case 21185: protect nitpick from bad filename
 2019-02-14 11:25:36 -08:00
David Rowe
6a00834147 Merge branch 'master' into M21128 
# Conflicts:
#	interface/src/AboutUtil.h
 2019-02-15 08:06:41 +13:00
David Rowe
d717e803dd WalletScriptingInterface API JSDoc 2019-02-15 08:00:53 +13:00
David Rowe
cc083afec6 HifiAbout API JSDoc 2019-02-15 08:00:36 +13:00
David Rowe
2a338124ae AccountServices API JSDoc 2019-02-15 08:00:19 +13:00
NissimHadar
6752092899 Removed unnecessary member variable. 2019-02-14 10:38:19 -08:00
Roxanne Skelly
ab1a691dc9 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-02-14 10:22:07 -08:00
SamGondelman
dd0d7f0118 merge with master 2019-02-14 09:57:13 -08:00
Thijs Wenker
3026fd625a Avatar Doctor 2019-02-14 18:52:50 +01:00
NissimHadar
701c18c9eb Correction to recursive scripts. 2019-02-14 08:58:09 -08:00
Roxanne Skelly
20d7e00ea8 Standalone Tags - Checkpoint 2019-02-14 08:48:37 -08:00
Angus Antley
1924018d2c added code to convert theta to a projected pole vector 2019-02-14 07:15:58 -08:00
Sam Gateau
8fdf0fb80c Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2019-02-13 22:33:48 -08:00
NissimHadar
58c0078188 Reversed order of recursive calls. 2019-02-13 21:07:25 -08:00
NissimHadar
301b4215e5 Fixed gcc warning. 2019-02-13 19:13:08 -08:00