27346 commits

Author	SHA1	Message	Date
Andrew Meadows	0a2b4a8d1d	add comment about returning smart pointer by ref	2018-04-03 18:26:43 -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	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	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
John Conklin II	97d9c1b735	Merge pull request #12726 from jherico/fix/rc66_crashes ... Attempt to resolve potential overlay crashes at shutdown	2018-03-29 09:37:23 -07:00
samcake	2ee0af03c8	Add an extra sanity check when calling fetchMetaSubItems when the subItems is not allocated yet	2018-03-28 16:17:55 -07:00
Cristian Luis Duarte	fe9481b28d	Cleanup code, comment out log, simplify radar is valid touch code (no more flag)	2018-03-28 19:50:44 -03:00
Cristian Luis Duarte	f0bcaa47c8	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-28 16:47:21 -03:00
Brad Davis	9be162de95	Synchronously shut down QML rendering threads	2018-03-28 09:13:46 -07:00
Seth Alves	46fb2033f2	Merge pull request #12574 from druiz17/remap-keybaord ... changing keyboard mapping	2018-03-27 19:00:05 -07:00
Seth Alves	6948de7e24	default to serverless tutorial	2018-03-26 14:32:40 -07:00
Dante Ruiz	b8796db1e5	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-26 09:13:58 -07:00
Cristian Luis Duarte	6cb5cd7f92	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-26 11:19:42 -03:00
Cristian Luis Duarte	242b009562	Android - Use mouse events for interacting with UI. Now LoginDialog UI interation does not move radar camera. Remove repeated tooggle call in audio.js. Adapt button to simulated mouse events.	2018-03-23 18:59:55 -03:00
SamGondelman	a19f71e759	fix tonemapping on android	2018-03-23 14:16:47 -07:00
John Conklin II	563ff61325	Merge pull request #12661 from SamGondelman/android ... Android: Stats, disable IK, reduce impact of InputRecorder	2018-03-23 11:08:50 -07:00
John Conklin II	0bc23456c3	Merge pull request #12682 from ctrlaltdavid/21807 ... JSDoc that an entity's clientOnly property can be set at entity creation	2018-03-22 17:55:45 -07:00
Dante Ruiz	4d52caccde	making some more requested changes	2018-03-22 17:39:22 -07:00
Dante Ruiz	1d17658c80	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-22 16:29:16 -07:00
Clément Brisset	feec59655c	Merge pull request #12692 from highfidelity/stable ... Merge stable back into master	2018-03-22 15:08:30 -07:00
John Conklin II	6d9892856d	Merge pull request #12510 from sethalves/serverless-domains ... Serverless domains	2018-03-22 14:06:49 -07:00
Stephen Birarda	e8bea3a611	Merge pull request #12369 from simon-walton/BugFix ... Lexer code has confusion between strings and chars	2018-03-22 12:03:47 -07:00
Sam Gondelman	e46a8f022c	Merge pull request #12695 from gcalero/fix/current_context ... Fix/current context	2018-03-22 10:54:34 -07:00
Dante Ruiz	cea0f98aae	reverting files	2018-03-22 09:20:27 -07:00
Dante Ruiz	f5a954d08e	Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains	2018-03-22 09:06:42 -07:00
Gabriel Calero	12b289bbc1	Restore debug logger for GLES. Fix SIGABRT Cannot make QOpenGLContext current in a different thread	2018-03-22 12:38:56 -03:00
Simon Walton	10f3032746	Compare QString w/ char*, not char	2018-03-21 23:09:46 -07:00
Seth Alves	b551b144a7	remove unneeded setIsConnected call	2018-03-21 19:15:27 -07:00