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
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
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
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
Zach Fox
e6ea76eefe
Tiny language fix - Thanks Cain!
2017-09-29 15:44:44 -07:00
Zach Fox
4668294389
Fix login flow regression
2017-09-29 15:25:24 -07:00
Zach Fox
bbbce96407
Fix gray securityimage
2017-09-29 14:30:02 -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
vladest
7f6773b1f4
Added semicolons
2017-09-29 21:12:21 +02: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
SamGondelman
f7af581c71
track traversal time, rename entity server stat
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
samcake
3265fe62ad
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-29 09:09:27 -07:00
vladest
01a0b26b90
Remove mouse area for text fields. use activeFocusOnPress property instead
2017-09-29 17:14:35 +02:00
vladest
d3cd034d61
Cleanup
2017-09-29 16:33:52 +02:00
vladest
174287c5f5
Merge branch 'master' into login_dialog_rework
2017-09-29 15:57:27 +02:00
Atlante45
af69222fdb
Fix icon name change
2017-09-28 18:34:42 -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
a1ae13489e
Slight changes to tutorial
2017-09-28 16:41:29 -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
Zach Fox
2cff5c1fa6
First time Purchases tutorial
2017-09-28 15:12:55 -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
Zach Fox
66be558a04
My Items Interface
2017-09-28 14:04:57 -07:00
vladest
4023c40149
Cleanup
2017-09-28 22:55:01 +02:00
Zach Fox
3a537cdcc3
Make usernameDropdown collapse when clicking anywhere outside it
2017-09-28 13:21:55 -07:00
Zach Fox
3742ccbdd3
Fix keyboard focus during setup while tip is up
2017-09-28 13:12:42 -07:00
Zach Fox
751dca0761
styling updates for purchases
2017-09-28 13:06:37 -07:00
Zach Fox
68c08969ae
Update Purchases
2017-09-28 12:49:38 -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
vladest
769c57208c
Signup ready
2017-09-28 21:35:41 +02:00
Zach Fox
b5dc6b791b
Fix commerce setting handle
2017-09-28 10:42:45 -07:00
Zach Fox
8d74487393
Use edition number; fix CONFIRMED timer
2017-09-28 10:25:05 -07:00
samcake
2f9779c02c
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-28 10:08:20 -07:00
Seth Alves
912305fd4b
Merge pull request #11476 from ElderOrb/case7925
...
7925 Create Mode: keyboard focused entry field is not visible
2017-09-28 10:03:28 -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
vladest
0a9bebeefc
Added workaround to enable menu bar under Linux
2017-09-28 15:34:56 +02:00
vladest
8d23bf38ac
Merge branch 'master' into login_dialog_rework
2017-09-28 14:55:12 +02:00
vladest
4f907aba1e
sign in reworked
2017-09-28 14:49:48 +02:00
beholder
338a230de9
reduced delay to improve user experience
2017-09-28 13:01:14 +03:00
beholder
1021aa1a0e
re-center focused eleemnt even if keyboard was already visible
2017-09-28 12:59:36 +03:00
samcake
40ca98214b
Moving all of the camera and avatar eval to game loop
2017-09-27 17:58:43 -07:00
Zach Fox
60823903cf
You own X others
2017-09-27 17:05:07 -07:00
Zach Fox
7b7e0bc78b
Updated Recent Activity
2017-09-27 16:35:35 -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
beholder
00c3dcee2f
7925 Create Mode: keyboard focused entry field is not visible
...
note: changed the way of calculation scroll value after showing virtual keyboard.
Now it doesn't require KEYBOARD_HEGHT and will always try to position focused element at vertical center of the client area
2017-09-28 00:28:54 +03:00
SamGondelman
553829f7ab
make sure FadeEffect dependency is created early
2017-09-27 11:58:35 -07:00
beholder
3677718e48
7926 Create Mode: the keyboard tray is not styled correctly
2017-09-27 21:33:18 +03: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
Atlante45
73483eef94
Update information sentence
2017-09-26 19:19:34 -07:00
Atlante45
bf984e8d1a
Fix tablet asset browser
2017-09-26 19:05:36 -07:00
Atlante45
03bd887f9a
Re-sync files
2017-09-26 18:42:50 -07:00
Atlante45
dda715e171
Update TabletAssetServer
2017-09-26 18:25:20 -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
anshuman64
ca4d5ef807
Merge pull request #11454 from ElderOrb/case7877
...
7877 Unexpected Behavior when pressing Enter on Input Field
2017-09-26 16:26:42 -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
Bradley Austin Davis
e42068f681
Merge branch 'master' into android_new
2017-09-26 14:31:29 -07:00
Andrew Meadows
909e5e86b1
Merge pull request #11442 from vladest/fix_dde_visibility
...
Fix dde visibility
2017-09-26 14:19:47 -07:00
samcake
510b446409
mergine with master, resolving conflict
2017-09-26 13:13:46 -07: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
Andrew Meadows
cc8e618bc0
remove cruft
2017-09-25 15:52:14 -07:00
samcake
11c55755d5
Removing unused call
2017-09-25 15:10:40 -07:00
