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

59796 commits

This branch
This branch
All branches
Author SHA1 Message Date
Howard Stearns
22f0ef33ed Merge pull request #11496 from howard-stearns/certificate-properties 
Certificate properties
 2017-10-03 10:06:48 -07:00
Seth Alves
41dfdf4d82 Merge pull request #11509 from druiz17/fix-hud-module 
Hud module. check if laser is pointing at UI element without moving the reticle first
 2017-10-03 09:44:45 -07:00
Sam Gateau
64f70f1ebb more cleanups 2017-10-02 22:00:41 -07:00
Sam Gateau
895e3d0430 more cleanups 2017-10-02 21:46:52 -07:00
Sam Gateau
316156db46 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-02 21:31:59 -07:00
Sam Gateau
acb99592ee fixing th e bug on exit due to the debug anim draw of the avatars 2017-10-02 21:31:30 -07:00
Andrew Meadows
21cd986645 tally PerformanceTimer records when it is active 2017-10-02 20:57:20 -07:00
druiz17
86f580919c remove what space 2017-10-02 17:43:43 -07:00
samcake
bb99f68d40 Avoiding the need for the GLobal frameTiing Scriptiong interface and just a regular member of APplication instead 2017-10-02 17:04:00 -07:00
Zach Fox
11d0062104 Progress on buy endpoint 2017-10-02 16:57:41 -07:00
druiz17
8a0ecf4e6f propertly determine is laser intersects with HUD UI 2017-10-02 16:46:43 -07:00
Andrew Meadows
c3167444a9 decouple 'general timing' from 'game loop' details 2017-10-02 16:31:20 -07:00
Howard Stearns
9b0ebf0e07 doh! string not boolean 2017-10-02 16:18:28 -07:00
Howard Stearns
0b7af66016 more linux warnings 2017-10-02 15:38:59 -07:00
Seth Alves
cc50bf9b56 Merge pull request #11503 from ElderOrb/case7951 
7951 Reload button in Running Scripts dialog stops script
 2017-10-02 14:20:34 -07:00
druiz17
68780f56b7 Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module 2017-10-02 14:06:26 -07:00
Howard Stearns
136381adb9 fatal compiler warning on mac/linux 2017-10-02 13:56:15 -07:00
SamGondelman
97b09d680c fix and improve laser pointer locking 2017-10-02 13:17:53 -07:00
Andrew Meadows
8d2153d2f3 cleanup debug stats, use more correct names 2017-10-02 13:08:17 -07:00
Andrew Meadows
e9d48a2713 fix warning about double-to-float conversion 2017-10-02 13:08:17 -07:00
Andrew Meadows
7df8816a81 faster rate counting 2017-10-02 13:08:17 -07:00
Zach Fox
1d1b846f39 Better 'view backup instructions' behavior 2017-10-02 12:44:51 -07:00
Zach Fox
1050d2851d Modify injected code to add to dropdown menu 2017-10-02 12:37:49 -07:00
Howard Stearns
7b0321c1e1 guess for mac/linux openssl 2017-10-02 12:30:25 -07:00
Zach Fox
15c0a21e0e Varied commit - styling changes, beginnings of new Wallet endpoint, etc 2017-10-02 12:19:24 -07:00
beholder
cc8f1352da 7951 Reload button in Running Scripts dialog stops script 2017-10-02 22:18:03 +03:00
Andrew Meadows
0fc6bf1e89 Merge pull request #11471 from Atlante45/feat/auto-bake 
Asset Browser tweaks
 2017-10-02 11:29:36 -07:00
Liv
f150d77d31 Updating placeholder.js to use a url that points to example scripts 2017-10-02 11:08:07 -07:00
vladest
bf39eb9a77 Test Tablet keyboard specific 2017-10-02 20:02:55 +02:00
Howard Stearns
5c5f052bc2 explicit free, and remove header that isn't available on mac/linux 2017-10-02 10:28:47 -07:00
Zach Fox
2b03e08c96 Fix errant status when requesting it for the first time 2017-10-02 10:20:24 -07:00
Sam Gateau
68046ae4e3 Merge pull request #11491 from jherico/dev/disable_watchdog 
Disable watchdog with environment variable
 2017-10-02 10:19:32 -07:00
samcake
fc2329193e Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-02 10:15:38 -07:00
Howard Stearns
930832bb19 Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-10-02 09:44:29 -07:00
Howard Stearns
0f6884dd80 fix mac/linux compiler error 2017-10-02 09:44:10 -07:00
Zach Fox
1ec0f5d9a0 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2 2017-10-02 09:26:59 -07:00
vladest
07ba2cce5b Merge branch 'master' into login_dialog_rework 2017-10-02 18:24:12 +02:00
Zach Fox
2783293d24 Merge pull request #11490 from vladest/fix_walletsetup_focus 
Remove mouse area for text fields. use activeFocusOnPress property in…
 2017-10-02 08:38:04 -07:00
Sam Gateau
ec10d38983 more cleaning 2017-10-01 22:28:04 -07:00
Sam Gateau
6c510bc18f fine tuning the changes to respect clean up 2017-10-01 20:05:48 -07:00
Anthony J. Thibault
7dfa80f666 Bug fix for offset of animated parts of oculus touch controller display 
Ensure position/rotations are updated with a consistent scale and
are animated correctly as the controller values change.
 2017-10-01 17:52:59 -07:00
samcake
0cbf19bcf1 Removing comments 2017-10-01 17:47:35 -07:00
samcake
aa10c29609 Cleaning up the changed code 2017-10-01 17:16:10 -07:00
Seth Alves
0d010d0cf4 Merge pull request #11493 from hyperlogic/bug-fix/oculus-controller-rendering 
Bug fix for offset of animated parts of oculus touch controller display
 2017-10-01 16:54:05 -07:00
samcake
da4de38e91 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-01 15:01:18 -07:00
SamGondelman
572986bfad fix modeloverlay visible change 
(cherry picked from commit 0bb27a7165)
 2017-10-01 13:40:00 -07:00
Sam Gateau
59225ae8ac Merge pull request #11497 from SamGondelman/modelOverlays 
Fix ModelOverlay visible change
 2017-10-01 12:56:27 -07:00
Sam Gateau
44cc6deac2 moving render specific code from Application.cpp to Application_render.cpp 2017-10-01 12:55:44 -07:00
vladest
ad32e7bdf5 Merge branch 'master' into login_dialog_rework 2017-10-01 19:27:23 +02:00
vladest
9a00468ea9 semicolons, yes 2017-10-01 19:21:30 +02:00