Seth Alves
b96fac2f00
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-05 11:43:25 -07:00
Seth Alves
53a49272dc
fix importing of avatar-entities
2017-10-05 11:43:19 -07:00
Sam Gateau
25dae2f24e
Merge pull request #11499 from samcake/blue
...
Moving Camera update and render frame to Game Loop (Main thread)
2017-10-04 18:42:02 -07:00
Clément Brisset
74fd69ac2d
Merge pull request #11523 from Atlante45/new-master
...
RC56 into Master
2017-10-04 15:17:52 -07:00
samcake
d773b40a63
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-04 13:25:14 -07:00
Andrew Meadows
e3ea013d5f
Merge pull request #11518 from SamGondelman/avatarRay
...
Fix calling AvatarManager.findRayIntersection() from script
2017-10-04 12:04:30 -07:00
SamGondelman
477dfdff1e
wip hud layering and fix crashes
2017-10-04 11:45:21 -07:00
Zach Fox
1ed10ecf59
Fix passphrase crash
2017-10-04 11:05:17 -07:00
samcake
d7333d3fa3
Merging with master
2017-10-04 10:55:38 -07:00
Brad Hefta-Gaub
a1979a2600
Merge branch 'master' into RC-56
2017-10-03 18:16:21 -07:00
SamGondelman
fa838e4715
merge from master
2017-10-03 15:53:33 -07:00
SamGondelman
0614fd9b4f
fix AvatarManger::findRayIntersection from script thread
2017-10-03 15:31:49 -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
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
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
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
Andrew Meadows
21cd986645
tally PerformanceTimer records when it is active
2017-10-02 20:57:20 -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
Andrew Meadows
c3167444a9
decouple 'general timing' from 'game loop' details
2017-10-02 16:31:20 -07:00
druiz17
68780f56b7
Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module
2017-10-02 14:06:26 -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
Zach Fox
15c0a21e0e
Varied commit - styling changes, beginnings of new Wallet endpoint, etc
2017-10-02 12:19:24 -07:00
Andrew Meadows
0fc6bf1e89
Merge pull request #11471 from Atlante45/feat/auto-bake
...
Asset Browser tweaks
2017-10-02 11:29:36 -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
Zach Fox
1ec0f5d9a0
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2
2017-10-02 09:26:59 -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
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
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
44cc6deac2
moving render specific code from Application.cpp to Application_render.cpp
2017-10-01 12:55:44 -07:00
SamGondelman
0bb27a7165
fix modeloverlay visible change
2017-09-29 17:48:59 -07:00
samcake
577378f539
Adding stuff that seems to break?
2017-09-29 17:45:10 -07:00
druiz17
20918641f4
saving work
2017-09-29 16:48:25 -07:00
samcake
225d2bbbb4
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-29 13:47:37 -07:00
Zach Fox
63396a2fc3
WalletScriptingInterface; wallet status refactor
2017-09-29 13:42:04 -07:00
Andrew Meadows
1c30f7424e
remove cruft and add comments
2017-09-29 11:34:35 -07:00
SamGondelman
3ae41b9b75
cleanup client and stats string
2017-09-29 11:34:35 -07:00
Andrew Meadows
fb3e74398f
don't invalidate viewFrustum sent to server
2017-09-29 11:34:35 -07:00
SamGondelman
247764b679
add total entity packets in stat (kbps)
2017-09-29 11:34:34 -07:00
SamGondelman
cbf82a6f2c
fix timeout for physics check
2017-09-29 11:34:34 -07:00
Andrew Meadows
171151b92a
use new form of MovingEntitiesOperator ctor
2017-09-29 11:34:32 -07:00
Brad Davis
a7d507e9fd
Disable watchdog with environment variable
2017-09-29 10:44:04 -07:00
Seth Alves
e7705175a3
Merge pull request #11481 from ZappoMan/animatedOverlays
...
support animation of model overlays
2017-09-29 10:26:24 -07:00
ZappoMan
9c81bc5479
CR fixes
2017-09-29 09:52:30 -07:00
SamGondelman
b59ec07171
move hud rendering to render thread, still need to separate out hud overlays
2017-09-29 09:49:08 -07:00
samcake
3265fe62ad
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-29 09:09:27 -07:00
samcake
e637842f8a
Separating some of the code sepecific to render in its own cpp
2017-09-28 17:45:50 -07:00
Zach Fox
4814f277c1
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2
2017-09-28 16:07:32 -07:00
ZappoMan
be7729b276
support animation of model overlays
2017-09-28 15:14:59 -07:00
samcake
c112a3baf1
Seting up of camera and avatar correctly in game loop, not in render loop
2017-09-28 15:09:49 -07:00
Ryan Huffman
ff019d6195
Fix extension detection when tracking asset uploads
2017-09-28 13:56:49 -07:00
Andrew Meadows
60fe9ec5e9
Merge pull request #11480 from AndrewMeadows/fix-debug-build-20170928
...
fix interface crash in Debug build
2017-09-28 12:41:12 -07:00
vladest
c3225c2c76
Make fix precisely for Linux
2017-09-28 21:38:03 +02:00
Zach Fox
b5dc6b791b
Fix commerce setting handle
2017-09-28 10:42:45 -07:00
Zach Fox
b6ce294bb2
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2
2017-09-28 09:38:48 -07:00
Zach Fox
65a63ea8c3
Remove dead OS X code
2017-09-28 09:38:22 -07:00
samcake
b1daae0150
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-28 09:16:02 -07:00
Ryan Huffman
97bf093cab
Fix ambiguous conversion in AssetMappingScriptingInterface
2017-09-28 08:16:54 -07:00
vladest
0a9bebeefc
Added workaround to enable menu bar under Linux
2017-09-28 15:34:56 +02:00
samcake
40ca98214b
Moving all of the camera and avatar eval to game loop
2017-09-27 17:58:43 -07:00
samcake
29da0c663f
Merge branch 'master' of https://github.com/highfidelity/hifi into flash
2017-09-27 16:21:55 -07:00
Sam Gateau
287f4f1d71
Merge pull request #11466 from SamGondelman/mirrorCrash
...
Fix mirror and fade threading crashes
2017-09-27 16:17:04 -07:00
Atlante45
eb06c33187
Naming coding standard fix
2017-09-27 15:32:53 -07:00
samcake
3bd6e35e30
Fixing the broken on hud overlay's render transform
2017-09-27 15:19:21 -07:00
Zach Fox
7ad3a5a1e3
Commerce: Tons of Interface changes ( #11463 )
...
* canRez(Tmp)Certified()
* CertifiedItem beginnings
* Skeleton of verifyOwnerChallenge()
* Controlled failure; updateLocation() skeletion
* Controlled failure on checkout page with ctrl+f
* Skeleton Purchases first-use tutorial
* Initial progress on new setup
* Security pic tip
* Skeleton Certificate page
* Updates to Certificate
* General progress; setup is nearly complete
* Better buttons; last step almost done
* Initial progress on wallet home
* Completed recent transactions
* Security page
* Scrollbar
* Fix auth error text
* PassphraseSelection
* Change security pic
* Minor layout changes; beginnings of emulated header
* Various layout changes; wallet nav bar
* Help screen
* Quick onaccepted change
* First pass at new purchases
* Small style updates
* Some error progress
* Lightbox in purchases
* Collapse other help answers when clicking on another
* REZZED notif
* Commerce Lightbox
* Lots of new interactions in Purchases
* Hook up 'view certificate'
* Fix errors, fix close button on cert
* Purchases timer; much faster filter
* Add debugCheckout
* Purchase updates
* GlyphButton; separator; Checkout Success; Ledger fix; debug modes
* Lock glyph below security pic should be white
* Various fixes, round 1
* Circular mask
* Passphrase change button fix; TextField error edge highlighting
* Recent Activity fixes
* Various changes
* Standard Security Pic location
* Color changes
* Filter bar changes
* Styling for multiple owned items
* Minor language change
* Header dropdown (harder than expected)
* Small fixes
* View backup instructions
* marketplaces.js onCommerceScreen
* Beginnign of new injection
* Marketplace injection changes
* Purchase button style changes
* More button styling
* MY PURCHASES button
* marketplace onUsernameChanged
* New help QA
* Help text changes etc
* Downscale security image, reducing filesize
* Lots of bugfixes
* Cleanup before PR
* Only open cert during inspection if commerce switch is on
* Help text changes
* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey
* Quick glyph change
* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
2017-09-27 14:43:51 -07:00
Andrew Meadows
26ea7034d8
prevent zero scale for Line3DOverlay
2017-09-27 14:30:50 -07:00
Andrew Meadows
b602c18475
prevent zero dimensions for Volume3DOverlay
2017-09-27 14:30:50 -07:00
SamGondelman
553829f7ab
make sure FadeEffect dependency is created early
2017-09-27 11:58:35 -07:00
Sam Gateau
88097bb39f
Merge pull request #11447 from AndrewMeadows/lod-auto-adjust
...
LODManager uses batchTime and engineRunTime for automatic LOD adjustment
2017-09-27 10:51:46 -07:00
Ryan Huffman
88810d28c1
Add activity logging for uploading_asset
2017-09-27 09:33:11 -07:00
Ryan Huffman
014a7bc9b0
Fix bytes downloaded stat tracking
2017-09-27 09:33:10 -07:00
Sam Gateau
9317ad38aa
Merge pull request #11462 from highfidelity/game-render-interface
...
Moving transform evaluation out from render loop to gameplay loop / fixing tablet tearing
2017-09-26 17:40:23 -07:00
Atlante45
acb0bf8d20
Asset Browser tweaks
2017-09-26 17:26:46 -07:00
samcake
f16c552978
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-26 17:18:05 -07:00
SamGondelman
49512c95d7
possibly fix threading crashes, mirror and fade
2017-09-26 16:21:36 -07:00
Andrew Meadows
dafadf82bb
Merge pull request #11458 from jherico/fix/tablet_latency
...
Fix long tablet lag on first load
2017-09-26 16:18:31 -07:00
samcake
328dd9c108
Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into blue
2017-09-26 16:12:27 -07:00
samcake
badb45c921
fixing the web surface now getting scaled when the table t is grabbed is fixed
2017-09-26 15:20:45 -07:00
samcake
510b446409
mergine with master, resolving conflict
2017-09-26 13:13:46 -07:00
beholder
24a12a2f8f
7722 Add onHover Outline to Tablet "X" Button
2017-09-26 22:31:56 +03:00
Seth Alves
7397a123c5
Merge pull request #11345 from SamGondelman/textAA
...
Text3D Overlays and Entities fixes and no-AA
2017-09-26 12:26:08 -07:00
Seth Alves
913d3c4d12
Merge pull request #11422 from hyperlogic/feature/ant-man2
...
Secondary IPD fixes
2017-09-26 11:53:45 -07:00
Dante Ruiz
74f9e07f1a
Merge pull request #11361 from vladest/move_tablet2toolbar_to_developer_menu
...
Move Tablet becomes toolbar menu from General to Developer menu
2017-09-26 11:26:42 -07:00
Dante Ruiz
e397d49564
Merge pull request #11159 from vladest/modal_dialogs_async
...
Modal dialogs async
2017-09-26 11:07:42 -07:00
samcake
b5c942f7f6
Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface
2017-09-26 10:47:59 -07:00
samcake
669af73a96
Bringing as much as possible out from render to game
2017-09-26 10:47:24 -07:00
Andrew Meadows
ec80846281
Merge pull request #11443 from SamGondelman/sharks
...
Laser Pointer fixes and updates
2017-09-26 10:22:55 -07:00
Sam Gateau
953614fe65
More stuff out of render to the gameloop
2017-09-25 23:43:32 -07:00
samcake
157b4f2e13
Moving some of the updates on the camera and the avatar out from render to game loop
2017-09-25 18:28:33 -07:00
Brad Davis
40c42d35a5
Fix long tablet lag on first load
2017-09-25 17:50:04 -07:00
