Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 18:13:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
59688 commits 71 branches 56 tags 1.2 GiB
Commit graph

59688 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
ab08dc6bd6 Progress? 2017-10-04 12:33:58 -07:00
Zach Fox
23245e2fb9 Modify context overlay filter 2017-10-04 10:39:23 -07:00
Zach Fox
2cdd5c29f3 Uncertified rez rights 2017-10-04 09:58:29 -07:00
Zach Fox
ed40e41b94 Potential progress? Not totally sure 2017-10-03 16:18:29 -07:00
Zach Fox
9c4b02c659 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-03 14:37:07 -07:00
Zach Fox
b7e50c5b73 First steps 2017-10-03 14:36:22 -07:00
Anthony Thibault
2dc080479c Merge pull request #11513 from hyperlogic/bug-fix/set-compund-shape-url-deadlock 
Bug fix for deadlock in ModelEntityItem::setCompundShapeURL()
 2017-10-03 13:31:01 -07:00
Seth Alves
ea4068f1f9 Merge pull request #11478 from vladest/fix_menu_linux 
Added workaround to enable menu bar under Linux
 2017-10-03 13:10:34 -07:00
Anthony J. Thibault
1389c2e31d Bug fix for deadlock in ModelEntityItem::setCompundShapeURL() 
The fix was to prevent ModelEntityItem::hasCompoundShapeURL() from taking
a readlock on the entity, instead a finer grained lock (ThreadSafeValueCache)
is made around the _compoundShapeURL QString.
 2017-10-03 12:15:23 -07:00
Zach Fox
ea3da6c9dd Merge pull request #11495 from zfox23/pop_interfaceChanges2 
Commerce: One step closer!
 2017-10-03 11:56:00 -07:00
Sam Gateau
ab8757eeb2 Merge pull request #11504 from AndrewMeadows/main-loop-stats-audit 
Tweak debug stats for more clarity
 2017-10-03 11:23:16 -07:00
Zach Fox
409360e55d Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-03 11:17:38 -07:00
Zach Fox
e64b0861a1 Change passphrase working 2017-10-03 10:53:10 -07:00
Andrew Meadows
cd4be1473f put more of Application::update() under time measurement 2017-10-03 10:34:12 -07:00
Andrew Meadows
773c48bbc9 use floating point for game loop stats values 2017-10-03 10:32:19 -07:00
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
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
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
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
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
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
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
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
Sam Gateau
59225ae8ac Merge pull request #11497 from SamGondelman/modelOverlays 
Fix ModelOverlay visible change
 2017-10-01 12:56:27 -07:00
vladest
9a00468ea9 semicolons, yes 2017-10-01 19:21:30 +02:00
vladest
feafd441b1 Make sure keyboard will be rised after lowering on another click 2017-10-01 18:54:07 +02:00
vladest
c3bc67b72d Merge branch 'master' into fix_walletsetup_focus 2017-10-01 18:24:38 +02:00
SamGondelman
0bb27a7165 fix modeloverlay visible change 2017-09-29 17:48:59 -07:00
druiz17
20918641f4 saving work 2017-09-29 16:48:25 -07:00