Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 15:52:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66624 commits 75 branches 59 tags 1.2 GiB
Commit graph

66624 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Andrew Meadows
f20c9d3c5b EntitySimulation::removeEntityInternal isn't pure virtual 2018-03-30 13:18:32 -07:00
Andrew Meadows
0596497930 more correct comments 2018-03-30 13:18:32 -07:00
Andrew Meadows
5649748b17 make EntitySimulation::changeEntityInternal() pure virtual 2018-03-30 13:18:32 -07:00
Andrew Meadows
bd434e3f18 make EntitySimulation::addEntityInternal() pure virtual 2018-03-30 13:18:32 -07:00
Andrew Meadows
6837d042ad move entityCollisionWithEntity to PhysicalEntitySimulation 2018-03-30 13:18:32 -07:00
John Conklin II
8c8400947f
Merge pull request #12745 from SamGondelman/shadow 
RC66: Fix shadows on primitives
 2018-03-30 12:52:08 -07:00
John Conklin II
542d1ad1ff
Merge pull request #12720 from druiz17/fix-parent-tree 
Fix far grabbing a grabbable child when the parent is not grabbable.
 2018-03-30 12:25:22 -07:00
Olivier Prat
0c2c09e77b Fixed layout in HMD 2018-03-30 15:22:48 -04:00
Olivier Prat
5c26b4030b Merge branch 'master' of http://github.com/highfidelity/hifi into fade 2018-03-30 14:38:42 -04:00
Ken Cooke
ff6c9f3127
Merge pull request #12704 from ElderOrb/FB13057 
Improve audio devices selection logic
 2018-03-30 11:18:05 -07:00
Zach Fox
59fb448698 Remove duplicate function 2018-03-30 10:28:40 -07:00
Zach Fox
bd6dbadade No magic numbers 2018-03-30 10:18:03 -07:00
Zach Fox
32e5e9986f Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation 2018-03-30 10:10:43 -07:00
SamGondelman
5a7e9d8e3e fix shadows on primitives 2018-03-30 09:48:04 -07:00
Ken Cooke
a2be291363
Merge pull request #12715 from ctrlaltdavid/21677 
Add Window.raise() as replacement for Window.raiseMainWindow()
 2018-03-30 09:41:54 -07:00
Brad Davis
440c01ae05 Merge remote-tracking branch 'upstream/master' into bindless 2018-03-30 09:29:35 -07:00
John Conklin II
5013760aa1
Merge pull request #12742 from jherico/fix/rc66_crashes 
Fix/rc66 crashes
 2018-03-29 18:04:52 -07:00
Alexander Ivash
814cfa4587 fix TabletAssetServer 2018-03-30 00:09:28 +03:00
John Conklin II
90dec1d3ef
Merge pull request #12733 from birarda/bug/scripts-copy-in-dev-rc66 
RC66: fix cmake changes for script copy for dev builds
 2018-03-29 13:57:45 -07:00
John Conklin II
b1ac2fd191
Merge pull request #12728 from SamGondelman/signedChar 
Android: Fix octal code signed char issue
 2018-03-29 13:56:06 -07:00
David Rowe
7027ccb6d8 Remove unused code 2018-03-30 09:35:25 +13:00
Alexander Ivash
e5da59a62f FB12870 - Tablet UI ->Asset Browser unresponsive when enabling/disabling "use baked version" 2018-03-29 23:01:59 +03:00
Olivier Prat
5f8693aae2 Merge branch 'master' of http://github.com/highfidelity/hifi into fade 2018-03-29 15:52:38 -04:00
John Conklin II
c7f7e2487c
Merge pull request #12738 from sethalves/fix-json-drag-and-drop-rc66 
fix -- make drag-and-drop of json mean import again
 2018-03-29 12:46:09 -07:00
David Rowe
3b90078097 Remove Entities.currentAvatarEnergy and related from the API 2018-03-30 08:36:18 +13:00
John Conklin II
d6b652bdf3
Merge pull request #12735 from druiz17/RC66 
Fix name conflict with c++ class and qml file(RC66)
 2018-03-29 12:06:15 -07:00
samcake
028959f240 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-03-29 12:00:10 -07:00
John Conklin II
379df87d0c
Merge pull request #12697 from misslivirose/feat/disable-add-without-url 
Disable Add Button in Model Modal until user has entered text in the model URL
 2018-03-29 11:39:48 -07:00
Dante Ruiz
f7a081c9ec minimize diff 2018-03-29 11:24:31 -07:00
Dante Ruiz
420672a769 fix-qml-confict 2018-03-29 11:24:08 -07:00
Dante Ruiz
e738274e90 map flying down back to C key 2018-03-29 11:10:39 -07:00
John Conklin II
a76b4b1008
Merge pull request #12734 from samcake/RC66-fetchMetaItem 
RC66: Add an extra sanity check when calling fetchMetaSubItemBounds
 2018-03-29 11:05:08 -07:00
Seth Alves
dcfebde54a put back the pre serverless-domain behavior for when a json file is dragged-and-dropped into the interface window -- import the json rather than load as a serverless-domain 2018-03-29 10:50:43 -07:00
amantley
3f44b88d2d added js documentation for the three trigger recenter functionsthat have been added to MyAvatar class 2018-03-29 10:09:51 -07:00
John Conklin II
c4b46d0a5f
Merge pull request #12719 from Atlante45/fix/ess-method-call 
Fix ESS remote method calls for connect only users
 2018-03-29 10:07:44 -07:00