Commit graph

1260 commits

Author SHA1 Message Date
samcake
5b5cad38e8 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-25 10:03:42 -07:00
Andrew Meadows
ae186d46c6 don't try to build convex hulls with nan data 2018-04-23 14:46:23 -07:00
samcake
b554aec317 Trying more drastic changes and learnign to use std::chrono the right way 2018-04-20 17:53:24 -07:00
samcake
9b1a887469 Starting to move dynamically yeah 2018-04-19 17:43:14 -07:00
samcake
a6bd589f4f Merging upstream 2018-04-19 12:20:10 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
2018-04-18 17:28:48 -07:00
John Conklin II
87f60e1e25
Merge pull request #12894 from sethalves/fix-tractor-action-crazy
fix bug that caused tractor action to go crazy
2018-04-18 14:13:56 -07:00
Andrew Meadows
4d3109b849 cleanup some comments 2018-04-16 13:31:36 -07:00
Andrew Meadows
ace32193b4 more correct stat names 2018-04-16 13:31:36 -07:00
Seth Alves
22fd4a7116 fix bug that caused tractor action to go crazy if only one of the two entities it connected were known to interface 2018-04-14 12:27:58 -07:00
Andrew Meadows
060c391d47 more correct stat names 2018-04-12 14:23:48 -07:00
samcake
e2f9eef5e2 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-12 12:27:27 -07:00
John Conklin II
e47dca77ec
Merge pull request #12773 from AndrewMeadows/expire-simulation-ownership
entity-server will expire stale simulation ownership
2018-04-12 12:04:52 -07:00
Sam Gateau
6a7ae55d9c Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-11 19:08:57 -07:00
Andrew Meadows
a0f3e3a031 add simulation ownership expiry 2018-04-11 09:40:32 -07:00
SamGondelman
8f65813924 fix asserts on domain switch 2018-04-09 17:10:49 -07:00
samcake
694baa81e8 removing logging around physics 2018-04-06 16:12:02 -07:00
Andrew Meadows
2cfb835b56 only add to physics simulation that when necessary 2018-04-06 15:26:33 -07:00
Andrew Meadows
ed1761945c add/remove entities to physics using workload output 2018-04-06 07:22:05 -07:00
Simon Walton
ed3347a89b Repeated logging - reviewer fixes 2018-04-04 14:11:10 -07:00
Simon Walton
692ccfc09b Create HIFI_FCDEBUG(_ID) variants that require a category
Original macros use default settings.
2018-04-04 09:49:15 -07:00
Andrew Meadows
f0fcfc432c fix typo in comment 2018-04-03 22:16:10 -07:00
Andrew Meadows
6d7574cab9 use std::numeric_limtis<uint64_t>::max() instead of -1 2018-04-03 22:13:25 -07:00
Andrew Meadows
70d6aa99e8 more 'const uint64_t&' purges 2018-04-03 21:55:31 -07:00
Andrew Meadows
bd2bfb6807 DRY: simpler removal of element from middle of std::vector 2018-04-03 18:28:07 -07:00
Andrew Meadows
0a2b4a8d1d add comment about returning smart pointer by ref 2018-04-03 18:26:43 -07:00
Simon Walton
7d16ca9c1c Remove uses of addRepeatedMessageRegex() and its implementation
Change to new log-message ID scheme.
2018-04-03 17:54:01 -07:00
Andrew Meadows
59abc1d5b5 DRY sendBid() and sendUpdate() 2018-03-30 17:04:31 -07:00
Andrew Meadows
766077204e fix typo inside assert() 2018-03-30 16:35:16 -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
4e0f307dc0 quint8 --> uint8_t 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
0596497930 more correct comments 2018-03-30 13:18:32 -07:00
Andrew Meadows
6837d042ad move entityCollisionWithEntity to PhysicalEntitySimulation 2018-03-30 13:18:32 -07:00
MiladNazeri
e054f16c46
Merge pull request #12526 from ctrlaltdavid/21709
Entities API JSDoc
2018-03-12 14:40:09 -07:00
NissimHadar
9b9b62d0e4 Transition to hover if falling and height above ground is greater than the threshold. 2018-03-09 15:20:51 -08:00
David Rowe
1fb02d15d7 Entities actions JSDoc 2018-02-27 14:12:20 +13:00
Andrew Meadows
672520f3bf quickfix for velocity spike for Tractor action 2018-02-06 12:06:27 -08:00
Seth Alves
639f7a52d8 remove unneeded/repeated line 2018-02-02 18:24:38 -08:00
Andrew Meadows
83ab994181 avoid initial bad measure of tractor target's velocity 2018-02-02 16:42:51 -08:00
Andrew Meadows
75b5635d2f less word salad 2018-01-18 17:43:22 -08:00
Andrew Meadows
3d3bfcf7a3 check dirty flags when harvesting physics results 2018-01-18 17:43:22 -08:00