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

66375 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
f20eddefc8 Fix 'Private' HMD preview texture enable/disable...again 2018-04-03 13:46:02 -07:00
John Conklin II
5151041e4a
Merge pull request #12770 from sethalves/pr12769-for-rc66 
Fix move after import
 2018-04-03 13:41:56 -07:00
NissimHadar
cb5bd4c080 Merge branch 'master' of github.com:highfidelity/hifi into addMDtoAutoTester 2018-04-03 13:25:30 -07:00
John Conklin II
db56656fcc
Merge pull request #12768 from ElderOrb/FB13789_RC66 
Fix regression with 'Log in/Sign up' dialog is missing "Forgot Username?" and "Forgot Password?" links
 2018-04-03 13:24:50 -07:00
NissimHadar
4f5895cb16 Added MD file to autoTester. 2018-04-03 13:17:37 -07:00
samcake
2dc4630e68 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-04-03 12:55:21 -07:00
Seth Alves
a1ce9481bb
Merge pull request #12739 from druiz17/fix-mapping-mistake 
map flying down back to C key
 2018-04-03 12:39:46 -07:00
Seth Alves
5f13df4102
Merge pull request #12722 from druiz17/fix-entities-outline 
fix ContextOverlayInferface highlighing unspecified entities.
 2018-04-03 12:29:19 -07:00
Seth Alves
249a97b5d0 don't move or rotate children if a parent is being changed by the same action 2018-04-03 12:14:59 -07:00
Seth Alves
08b7326bd1 when moving a group of selections, don't move a child if a parent is being moved 2018-04-03 12:14:40 -07:00
Alexander Ivash
ccea3efe1e FB13789 - Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password?" links 2018-04-03 21:43:40 +03:00
Sam Gateau
987aa40783
Merge pull request #12566 from jherico/bindless 
Bindless Textures
 2018-04-03 10:14:12 -07:00
John Conklin II
53a5261905
Merge pull request #12712 from zfox23/newUpdateCertLocation 
Fix cert location for content sets; handle .content.zip content sets
 2018-04-03 09:10:11 -07:00
samcake
077b2dab30 Code review fixes 2018-04-02 16:09:43 -07:00
samcake
5a1eac563b Code review fixes 2018-04-02 15:50:18 -07:00
John Conklin II
9dcef996c5
Merge pull request #12684 from vladest/assetserver_wrong_dialog 
Fix invalid message if cancel adding asset to AssetServer
 2018-04-02 15:28:46 -07:00
John Conklin II
74ca98dc81
Merge pull request #12727 from amantley/triggerRecenterBehaviour 
Trigger Avatar Recenter Behaviour
 2018-04-02 14:42:21 -07:00
Zach Fox
1f3063193a Tweak right-click to inspect 2018-04-02 14:24:51 -07:00
samcake
d4bc61fb3d Remove notifications and print outs for LOD changes because it was too much noise 2018-04-02 13:53:30 -07:00
John Conklin II
796bd069b2
Merge pull request #12659 from alexiamandeville/script_charcontroller 
Updating char controller
 2018-04-02 13:24:15 -07:00
Brad Davis
14ea168ab3 Merge remote-tracking branch 'upstream/master' into bindless 2018-04-02 13:13:28 -07:00
John Conklin II
7ba05e3a5b
Merge pull request #12653 from vladest/bubblu_button_blink_fix 
Bubble button blink fix
 2018-04-02 11:12:12 -07:00
Dante Ruiz
a9a53c7d64 make resquested changes 2018-04-02 10:51:39 -07:00
Anthony Thibault
dc9c9fd0ee
Merge pull request #12683 from hyperlogic/bug-fix/reduce-elbow-flapping 
Reduce avatar elbow fluttering by disabling pole vectors
 2018-04-02 10:51:28 -07:00
John Conklin II
aceb3d13b4
Merge pull request #12749 from samcake/rc66-mirror 
RC66: Fix crash on Macos when looking at a mirror or when secondary camera is enabled
 2018-04-02 10:16:04 -07:00
Andrew Meadows
59abc1d5b5 DRY sendBid() and sendUpdate() 2018-03-30 17:04:31 -07:00
Sam Gateau
8178ee7f34 Merge branch 'RC66' of https://github.com/highfidelity/hifi into rc66-mirror 2018-03-30 17:00:11 -07:00
Sam Gateau
d5496d68fd FIx the mac crash when in front of a mirror by using the VIewFrustum stack correctly 2018-03-30 16:58:41 -07:00
Andrew Meadows
766077204e fix typo inside assert() 2018-03-30 16:35:16 -07:00
Seth Alves
e8a62d2943
Merge pull request #12740 from druiz17/fix-scope 
Fix name conflict with c++ class and qml file(master)
 2018-03-30 15:41:42 -07:00
Dante Ruiz
4b7e2cb331 made requested changes 2018-03-30 15:15:17 -07:00
Dante Ruiz
16749df83a fix highlighting edge case 2018-03-30 14:14:13 -07:00
Dante Ruiz
c99676b510 atlernate fix for selected entities 2018-03-30 13:44:54 -07:00
Andrew Meadows
a924bd4eb0 set correct _bidPriority on first ownership update 2018-03-30 13:18:32 -07:00
Andrew Meadows
5a5376c3d5 untangle 'bidding' from 'owned' 2018-03-30 13:18:32 -07:00
Andrew Meadows
170ec83870 remove unnecessary assert 2018-03-30 13:18:32 -07:00
Andrew Meadows
eb07f6732f add reminder comment 2018-03-30 13:18:32 -07:00
Andrew Meadows
49dce6fa1a remove some redundancy checks 
no need to assert(_entity) : guaranteed by ctor and dtor logic
moved some checks around to avoid redundant work
 2018-03-30 13:18:32 -07:00
Andrew Meadows
dcf5110caa clarify hardcoded constant 2018-03-30 13:18:32 -07:00
Andrew Meadows
4e0f307dc0 quint8 --> uint8_t 2018-03-30 13:18:32 -07:00
Andrew Meadows
d6ac294f39 use uint8_t instead of quint8 2018-03-30 13:18:32 -07:00
Andrew Meadows
4501033861 add description of simulation ownership rules 2018-03-30 13:18:32 -07:00
Andrew Meadows
2be0f0fa22 better comments 2018-03-30 13:18:32 -07:00
Andrew Meadows
c61a226bb5 delete default EntityMotionState ctor 2018-03-30 13:18:32 -07:00
Andrew Meadows
73fa6d3d2f slightly simpler EntityMotionState delete logic 2018-03-30 13:18:32 -07:00
Andrew Meadows
6746e08206 faster EntitySimulation::takeDeadEntities() 2018-03-30 13:18:32 -07:00
Andrew Meadows
e1d2a5e5f3 more cleanup for deleting entities 2018-03-30 13:18:32 -07:00
Andrew Meadows
5854a36ff7 more correct handling of simulated entity 2018-03-30 13:18:32 -07:00
Andrew Meadows
a05c753e03 only process changed entities when simulated 2018-03-30 13:18:32 -07:00
Andrew Meadows
738e1267ab small optimization in EntitySimulation::changeEntity() 2018-03-30 13:18:32 -07:00