Commit graph

10213 commits

Author SHA1 Message Date
Clément Brisset
93d51717ce Merge pull request #5201 from ctrlaltdavid/20590
QA for #20590 - Delete Interface.ini.lock file at start-up if it exists
2015-07-01 13:54:02 -07:00
Seth Alves
6e3cab9f4d fix logic problem with previous fix 2015-07-01 12:37:15 -07:00
Seth Alves
593ed9f998 work around problem where EntityItem::setActionData is called before the entity tree is set up 2015-07-01 12:26:51 -07:00
Seth Alves
e8a6acd65b responses to code review 2015-07-01 10:42:04 -07:00
Seth Alves
5e2f7204b4 responses to code review 2015-07-01 10:29:42 -07:00
Brad Davis
d4d6f8f5d5 Eliminate per-packet locking for processing 2015-07-01 10:06:04 -07:00
Sam Gateau
63e3d0e741 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-01 07:48:37 -07:00
Sam Gateau
2f04a9d3da refining the shader pipeline and trying to pass a Status Getter from the model and fails 2015-07-01 07:47:46 -07:00
Seth Alves
a356cbf620 remove commented code 2015-07-01 07:33:46 -07:00
Seth Alves
b7e9056c04 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire-and-sim-ownership 2015-07-01 07:33:29 -07:00
Seth Alves
6e7973f5b9 coding-standard / code-review 2015-06-30 19:28:22 -07:00
Seth Alves
f4bbbcbec7 try to explain action class hierarchy in a comment 2015-06-30 19:05:34 -07:00
Niraj Venkat
a33a76ac27 Merge branch 'yellow' of https://github.com/samcake/hifi into stats 2015-06-30 16:12:56 -07:00
Niraj Venkat
aa55de46c2 Drawing full bounding box 2015-06-30 16:09:45 -07:00
Sam Gateau
8bd5e15f73 Exposing the viewport to the shader and have a first draft of the draw status pipeline 2015-06-30 14:43:57 -07:00
Niraj Venkat
2f2d5815db Merge branch 'master' of https://github.com/highfidelity/hifi into stats 2015-06-30 14:13:03 -07:00
Niraj Venkat
0ea2774d6e Merge branch 'yellow' of https://github.com/samcake/hifi into stats 2015-06-30 10:46:07 -07:00
Seth Alves
a300dec1f7 update entity data bytes whenever it's asked for 2015-06-30 10:42:34 -07:00
Seth Alves
505332c367 include action data among physics initiated network updates from interface to entity-server 2015-06-30 10:19:03 -07:00
Seth Alves
7d7e3769f6 suppress a log message 2015-06-30 09:56:15 -07:00
Ryan Huffman
abab284f38 Merge pull request #5235 from ericrius1/lineTransform
line entities can now be properly rotated using rotation property
2015-06-30 09:30:01 -07:00
Sam Gateau
20cb519c14 first draft at using the status of the item for representing stats and current data about it in the DrawStatus phase 2015-06-30 08:19:00 -07:00
Seth Alves
c3747ab8aa initialize some variables 2015-06-29 19:40:57 -07:00
Seth Alves
88fc74374b if a hold action is edited by a local script, mark it as 'mine'. if it's not 'mine', let the spring action handle the wire protocol 2015-06-29 19:27:10 -07:00
Seth Alves
0a734c9d3d Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire-and-sim-ownership 2015-06-29 16:56:04 -07:00
Seth Alves
fbede0a23f guard against feeding bullet a NaN 2015-06-29 15:54:24 -07:00
Niraj Venkat
d7791982ac Starting stats branch 2015-06-29 15:19:50 -07:00
Seth Alves
9b7ea19087 include action type in arguments delivered to scrips 2015-06-29 14:33:58 -07:00
Seth Alves
c539d9f233 allow for removal and readdition of an action in one time-slice without asserting 2015-06-29 12:22:06 -07:00
Seiji Emery
374150a39f Merge https://github.com/highfidelity/hifi 2015-06-29 11:56:50 -07:00
ericrius1
843ab6d5e3 line entities can now be properly rotated using rotation property 2015-06-29 11:08:09 -07:00
Brad Davis
5cfa22396c Merge pull request #5219 from venkatn93/master
Changing tooltip reticle
2015-06-29 10:51:16 -07:00
Seth Alves
3e88e1f400 unbungle merge 2015-06-29 10:04:27 -07:00
Seth Alves
1d122060a6 merge andrew's sim-ownership branch 2015-06-29 09:50:38 -07:00
Andrew Meadows
513285a00e use macros for packing/unpacking QByteArray 2015-06-29 07:27:34 -07:00
Andrew Meadows
769755e30a recycle PROP_SIMULATOR_ID 2015-06-29 06:20:14 -07:00
Seth Alves
0970f010a4 provide a way for scripts to get information about what actions an entity has and what the arguments of those actions are 2015-06-27 13:31:00 -07:00
Seth Alves
c0c1116c69 attempt some clean-ups in edge/unexpected situations 2015-06-27 11:09:28 -07:00
Seth Alves
aa3c7eac9b Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-27 10:12:59 -07:00
Seth Alves
30be515a94 remove unneeded lock around action-data in entity item. Actions now use a weak pointer to keep track of owner entity 2015-06-27 08:53:27 -07:00
samcake
fefe34e558 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-06-27 06:48:55 -07:00
samcake
1b69b38835 fix shader issue on mac 2015-06-27 06:34:58 -07:00
Andrew Meadows
426b343e2c remove cruft canAppendBytes() method 2015-06-26 23:12:48 -07:00
Andrew Meadows
4d4b97fe59 add priority promotion to reduce volunteer races
also fix priority inheritance from chained collisions
2015-06-26 22:30:06 -07:00
Brad Hefta-Gaub
9b42221123 Merge pull request #5216 from ctrlaltdavid/comment-update
Improve entity properties list code comment
2015-06-26 22:21:39 -07:00
Andrew Meadows
f274958beb fix bad merge during rebase 2015-06-26 22:13:06 -07:00
Andrew Meadows
e18506c77f promote volunteer priority
also remove some cruft
change uint8_t to be quint8
2015-06-26 22:00:43 -07:00
Andrew Meadows
d6c69e8fe6 pack terse update parameters near each other
also don't constantly resend ownership data
2015-06-26 22:00:43 -07:00
Andrew Meadows
ff67b54f87 don't read terse update data for objs we own 2015-06-26 21:58:40 -07:00
Andrew Meadows
1ba937eab9 fix bug in streaming of SimulationOwner class 2015-06-26 21:58:40 -07:00
Andrew Meadows
40f6ecd936 fix crash for dereference null pointer 2015-06-26 21:58:40 -07:00
Andrew Meadows
44d3074561 remove debug code 2015-06-26 21:58:03 -07:00
Andrew Meadows
12fc18092b SimulationOwner as one property 2015-06-26 21:58:03 -07:00
Andrew Meadows
b6d5adaef8 move global into function that uses it 2015-06-26 21:57:04 -07:00
Andrew Meadows
cf74dbe1dc partial progress toward sim ownership negotiations
works well for just a few objects but fails for piles
committing some debug stuff that will have to be torn out later
2015-06-26 21:57:04 -07:00
Andrew Meadows
c87e7c99ce bid for ownership on script-change phys properties 2015-06-26 21:57:04 -07:00
Andrew Meadows
4b29907216 trigger bid for ownership on action manipulations 2015-06-26 21:57:04 -07:00
Andrew Meadows
a33c350385 improved forcing of simulator ownership bid 2015-06-26 21:57:04 -07:00
Andrew Meadows
8510110324 increase sim priority when flagged for ownership 2015-06-26 21:57:04 -07:00
Andrew Meadows
2579247c34 claim ownership faster for scripted manipulations 2015-06-26 21:57:04 -07:00
Andrew Meadows
7c793c6397 accept simulation release from entity-server 2015-06-26 21:57:04 -07:00
Andrew Meadows
d0ac3e4514 more work on simulator priority
scripts that edit terse update data try to assert priority
physics simulation tries to assert "volunteer" priority
max priority rules are applied in entity server
2015-06-26 21:57:04 -07:00
Andrew Meadows
82ba5cd4b6 sim ownership uses expiry, apply priority rules 2015-06-26 21:57:04 -07:00
Andrew Meadows
443c7d9c70 allow equal priority to take simulation ownership 2015-06-26 21:57:04 -07:00
Andrew Meadows
8afd9a5e1d add EntityItem::_simulatorPriority as uint8_t 2015-06-26 21:57:04 -07:00
Seth Alves
5ecc39b811 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-26 20:06:10 -07:00
Seth Alves
9f6ec4120d undo previous experiment 2015-06-26 18:43:56 -07:00
Seth Alves
0739c46249 if new action data is the same as the old action data, don't re-unpack it 2015-06-26 18:13:53 -07:00
Brad Hefta-Gaub
fbf2f51ded Merge pull request #5224 from sethalves/fix-nan-in-vec3
don't try to convert a vec3 containing NaN to a script value
2015-06-26 17:55:38 -07:00
Seth Alves
0f3ac976c3 don't try to convert a vec3 containing NaN to a script value 2015-06-26 17:53:28 -07:00
Stephen Birarda
8fd309027f add a forced failover for hanging STUN dns lookup 2015-06-26 17:35:14 -07:00
Brad Davis
84505c49c4 Merge pull request #5213 from birarda/hyperlink-photo
add photo replacement for hyperlinked places
2015-06-26 17:05:33 -07:00
Atlante45
d02c69111b Fix compile error in text shader 2015-06-26 16:56:47 -07:00
Seth Alves
5e65972265 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-26 16:55:34 -07:00
Seth Alves
1326791502 add sanity check to PhysicalEntitySimulation::addAction 2015-06-26 16:55:16 -07:00
Seth Alves
31a3ca641d clean up left-over action if it's re-added 2015-06-26 16:54:46 -07:00
Seth Alves
300d35219d move functions our of header to cpp file 2015-06-26 16:54:01 -07:00
Sam Gateau
61ea59d63b Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-06-26 16:39:15 -07:00
Niraj Venkat
9101b4ad70 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-26 16:28:01 -07:00
Niraj Venkat
fe8d539cf5 changing link icon 2015-06-26 16:27:04 -07:00
Atlante45
27a1a55275 Don't cull text background/Text is emissive 2015-06-26 16:17:41 -07:00
Atlante45
efd805bea7 Introduce new emissive simple program
Also fixes the shading on web entities using that program
2015-06-26 16:17:41 -07:00
Atlante45
017b4045e5 Fix web entity texture not displayed 2015-06-26 16:17:41 -07:00
Atlante45
078a5a8439 Formatting 2015-06-26 16:17:40 -07:00
Atlante45
3c49e6231e Sam's fix for pipeline edge case
Basically if we bind a uniform texture and the pipeline is not setup
correctly on mac
2015-06-26 16:17:40 -07:00
Atlante45
e6cdd4a9ff Fix web entities back culled 2015-06-26 16:17:40 -07:00
Atlante45
f753a54494 Fix web entities incorrect dimensions 2015-06-26 16:17:39 -07:00
Seth Alves
b4537b081f fix clearActions 2015-06-26 16:02:47 -07:00
Sam Gateau
51eab1bd39 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-06-26 15:45:47 -07:00
Sam Gateau
f73e56a93f Covering all the case for rendering the light passes 2015-06-26 15:45:15 -07:00
ZappoMan
f61581d29d possible fix for deadlock 2015-06-26 15:42:04 -07:00
Sam Gateau
c41ebcae78 Covering all the case for rendering the light passes 2015-06-26 15:40:08 -07:00
David Rowe
8d83e23bab Improve entity properties list code comment 2015-06-26 15:37:16 -07:00
Seth Alves
70aa762f61 merge from upstream 2015-06-26 15:34:10 -07:00
Stephen Birarda
ff33922716 handle conflicts on merge with upstream master 2015-06-26 15:33:35 -07:00
ZappoMan
ccbc048f64 repair bad ordering of PROP_SCRIPT_TIMESTAMP 2015-06-26 14:59:40 -07:00
Stephen Birarda
9b84eabd18 Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo 2015-06-26 14:40:01 -07:00
Seth Alves
bc7271769c merge from master 2015-06-26 14:29:40 -07:00
Stephen Birarda
a0df52e860 add note for UI link 2015-06-26 14:17:54 -07:00
Stephen Birarda
7e19a540fd add the new placeholder image 2015-06-26 14:13:23 -07:00
Stephen Birarda
18e2b62ecc initial image replacement for hyperlink preview 2015-06-26 14:12:26 -07:00
David Rowe
1898c6bd55 Merge branch 'master' into 20547
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
2015-06-26 13:05:51 -07:00
Seth Alves
9e8113a63c bump protocol version 2015-06-26 12:36:10 -07:00
Seth Alves
005bd8bda5 merge from upstream 2015-06-26 12:33:35 -07:00
Brad Hefta-Gaub
2c30711229 Merge pull request #5210 from bwent/faceCameraProp
Added faceCamera property for text entities
2015-06-26 12:29:25 -07:00
Seth Alves
d09588b7fa put upper bound on size of serilized action parameters so they'll fit in MTU 2015-06-26 12:11:34 -07:00
Seth Alves
6a39aecdd4 back out mistaken commit 2015-06-26 12:11:03 -07:00
Seth Alves
798c9492d3 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-26 11:47:21 -07:00
Stephen Birarda
522b715628 remove comment, styling cleanup 2015-06-26 11:41:34 -07:00
Stephen Birarda
c6df573933 fix some OS X warnings, add description to tooltip 2015-06-26 10:50:31 -07:00
Brad Davis
8dcd91fdab Merge pull request #5192 from venkatn93/master
Hyperlink tooltip and address bar remodel
2015-06-26 10:28:52 -07:00
Seth Alves
c95db5672a include argument-packing version in serialized argument data 2015-06-26 10:01:45 -07:00
Seth Alves
f5f1d0829c Merge branch 'physics-lock-entity-tree' of github.com:sethalves/hifi into actions-over-wire 2015-06-26 07:20:51 -07:00
Seth Alves
015498a6e0 move function up so this builds in non-debug mode 2015-06-26 07:20:22 -07:00
Seth Alves
2682c4720d fix alt-branch of ifdef 2015-06-26 07:04:10 -07:00
Seth Alves
a0d77c061c lock the entity tree during physics operations that access then entity tree. if the simulation and entity-tree are both going to be locked, be sure to lock the entity tree first (and unlock it last), because this is what the network-reading thread does 2015-06-26 07:00:28 -07:00
Seth Alves
7c26641560 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-25 17:40:27 -07:00
bwent
aa865680ab Added faceCamera property to Text Entities
…and removed from base
2015-06-25 15:38:38 -07:00
Niraj Venkat
6b14a64c8c Formatting changes and teleport on click 2015-06-25 15:15:44 -07:00
Brad Hefta-Gaub
6c4a4866d3 Merge pull request #5202 from Atlante45/overlay
Overlay have correct bounds
2015-06-24 19:00:55 -07:00
Brad Hefta-Gaub
77bbb23a1e Merge pull request #5175 from hyperlogic/ajt/first-person-avatar
Render a different model when in first person view.
2015-06-24 18:54:47 -07:00
Clément Brisset
e05b4e3115 Merge pull request #5203 from howard-stearns/set-injector-options-from-script
Set injector options from script
2015-06-24 16:54:11 -07:00
Anthony J. Thibault
3853395298 Bug fixes for switching between head/body and full body avatars
The head model visibility is now updated in preRender()
Moved the near clip plane in a bit more
Invalidate head bone vector on LOD switching.
Removed _currentSkeletonModel pointer, instead use _prevShouldDrawHead to detect when we should flip the visibility bit.
2015-06-24 16:10:47 -07:00
Anthony J. Thibault
99a03bac21 Render a different model when in first person view.
Currently this model is identical to the third person model, except
that the head bones have been 'cauterized' by applying a zero scale transform.
This allows us to set the near clip back to a reasonable value.
2015-06-24 16:10:47 -07:00
Atlante45
85b2771c4a Extend Extents 2015-06-24 15:44:48 -07:00
Clément Brisset
6db4184748 Merge pull request #5171 from huffman/fix-edit-rotate
Fix edit.js rotation display
2015-06-24 15:35:15 -07:00
Seiji Emery
6e87f44ec7 Merge remote-tracking branch 'upstream/master' 2015-06-24 15:12:57 -07:00
bwent
0516caaa32 Added CHECK_PROPERTY_CHANGE macro 2015-06-24 14:58:33 -07:00
Ryan Huffman
4df1bea4ec Merge pull request #5167 from SamGondelman/hmdControls
hmdControls.js for movement when wearing an HMD
2015-06-24 14:40:31 -07:00
Howard Stearns
3b8a46b87d Allow scripted audio injectors to have options set. 2015-06-23 21:01:34 -07:00
Seth Alves
28582ed14d Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-23 19:50:35 -07:00
David Rowe
33b48947a5 Delete Interface.ini.lock file at start-up if it exists
Otherwise Interface freezes.
2015-06-23 17:36:19 -07:00
bwent
99cd9bada1 Added Billboard entity property and enabled billboarding for text entities 2015-06-23 16:22:34 -07:00
Seth Alves
a46e8ed14c quiet compiler 2015-06-23 15:27:35 -07:00
Seth Alves
0af137af36 save encoded action data rather than generating it on demand 2015-06-23 15:27:25 -07:00
ericrius1
b1190bee6e deleted empty files I accidently committed. 2015-06-23 14:13:13 -07:00
David Rowe
93509f4c6e Code review 2015-06-23 11:25:02 -07:00
Seth Alves
6e34678a59 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-23 10:48:21 -07:00
Seth Alves
4bf4e9f5da Merge pull request #5164 from ericrius1/lineBounds
Line bounds
2015-06-23 10:47:38 -07:00
Sam Gateau
2fb4ed06c0 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-06-23 10:18:56 +02:00
Seth Alves
20f173a474 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-22 19:36:09 -07:00
Brad Hefta-Gaub
a3e1987078 Merge pull request #5176 from huffman/fix-raypicking-crash
DO NOT MERGE - Fix recalculateMeshBoxes being called outside of mutex
2015-06-22 19:03:31 -07:00
Seiji Emery
dfe58a5ed4 Disabled Model (entity) Tests, as they are waaay out of date and will not run with the current codebase. These should get reimplemented at some point. 2015-06-22 17:42:07 -07:00
Brad Hefta-Gaub
e0f9f8b613 Merge pull request #5183 from birarda/ac-scripts
fix AC crash with no controller scripting interface
2015-06-22 17:22:56 -07:00
Philip Rosedale
6ef7e486b1 Merge pull request #5165 from ctrlaltdavid/20582
CR for #20582 - Fix the issue with Domain backups
2015-06-22 17:02:38 -07:00
Seth Alves
f75506bf1b Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-22 15:37:10 -07:00
Seth Alves
4849e2922e quiet valgrind 2015-06-22 14:21:25 -07:00
Brad Davis
98f7b0a689 Merge pull request #5181 from birarda/master
fix for double store on index path lookup
2015-06-22 13:58:36 -07:00
Seth Alves
7f4e3f8216 when deserializing action, remove any existing actions that weren't part of the serialized data 2015-06-22 13:12:34 -07:00
Seth Alves
55975fd611 don't add an action of we're about to remove it 2015-06-22 13:11:42 -07:00
Howard Stearns
240272be11 Merge pull request #5161 from PhilipRosedale/master
Always test and remove DC Offset
2015-06-22 12:09:08 -07:00
Philip Rosedale
111b0f286d Merge pull request #5160 from ctrlaltdavid/addressbar-tidy
Tidy address bar code
2015-06-22 12:08:33 -07:00
Philip Rosedale
e5c1e0ca67 Merge pull request #5159 from howard-stearns/refactor-playSound
Refactor playSound
2015-06-22 12:07:08 -07:00
Stephen Birarda
ff21c22245 fix AC crash with no controller scripting interface 2015-06-22 11:56:07 -07:00
Stephen Birarda
a9eccb687a fix for double store on index path lookup 2015-06-22 11:26:17 -07:00
Sam Gateau
9994cb7540 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-06-22 20:00:48 +02:00
Sam Gateau
6444bcab1b commenting out 2015-06-22 20:00:06 +02:00
ericrius1
362d9a2481 syncing brush sphere with line color 2015-06-22 10:35:00 -07:00
Brad Davis
3231bbba5a Merge remote-tracking branch 'upstream/master' into overlay
Conflicts:
	interface/src/Application.cpp
2015-06-22 09:44:16 -07:00
Brad Davis
1b44c220a7 Prep work for procedural stars & stuff 2015-06-22 09:43:12 -07:00
Seth Alves
bce8b0cc1b Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-22 07:19:55 -07:00
Seth Alves
c14276145d lock when reading or writing _actionsToAdd or _actionsToRemove 2015-06-22 07:19:40 -07:00
Seth Alves
03a2d190b0 quiet valgrind 2015-06-22 07:18:55 -07:00
Seth Alves
f284e9d070 quiet compiler 2015-06-22 07:18:30 -07:00
samcake
ca652730b5 REfine the gpu/Context.slh to get gpu_shader4 and gl_VertexID 2015-06-22 15:47:13 +02:00
Sam Gateau
f7ca1f608f Migrating the deferred lighting effect to Batch and in doing so, introducing the StandardShaderLib to gpu and the first 2 shaders 2015-06-22 14:06:14 +02:00
samcake
be8ae9580d Merge pull request #5177 from bwent/doubleClickEvent
Expose mouseDoublePressEvents to js
2015-06-22 11:13:05 +02:00
Seth Alves
77cb3c0caa quiet valgrind 2015-06-21 18:13:13 -07:00
Seth Alves
717c8ed3ad formatting 2015-06-21 18:12:24 -07:00
Bradley Austin Davis
4ccdc78866 Fixing frustum perspective bug 2015-06-21 15:53:24 -07:00
Seth Alves
746033f3bd Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-21 07:34:48 -07:00
Bradley Austin Davis
577962cb67 Merge branch 'master' into overlay 2015-06-20 10:37:55 -07:00
ericrius1
dbec1aad0c line entity points are now local to entity position. Changed paint script to reflect this 2015-06-19 18:54:28 -07:00
David Rowe
0b13accf94 Merge branch 'master' into addressbar-tidy
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
2015-06-19 17:42:27 -07:00
Ryan Huffman
1371f775ee Add mutex lock around access to Model::_calculatedMeshPartOffset 2015-06-19 16:51:13 -07:00
Ryan Huffman
a7f291154b Add lock around recalculateMeshPartOffsets call 2015-06-19 16:28:58 -07:00
Seth Alves
5381e6e9bb entity server has its own version of actions which simply remember the encoded arguments. Entities with actions don't experience simulateKinematicMotion 2015-06-19 16:20:07 -07:00
Seth Alves
6deedd19a3 zero velocities when we clear simulatorID 2015-06-19 16:19:21 -07:00
Niraj Venkat
482f12be8c Returning ref to stack to view controller 2015-06-19 16:05:45 -07:00
bwent
c315bcec24 Expose mouseDoublePressEvents to js 2015-06-19 15:52:27 -07:00
Ryan Huffman
1734d5e584 Fix recalculateMeshBoxes being called outside of mutex 2015-06-19 15:05:55 -07:00
Brad Davis
cc6b589ae5 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-19 14:48:38 -07:00
Howard Stearns
7cf7f0df1a Remove #include that was introduced in version 1 that is not needed in final. 2015-06-19 14:38:43 -07:00
Howard Stearns
b506fe0f1d Merge branch 'master' of https://github.com/highfidelity/hifi into refactor-playSound 2015-06-19 14:22:04 -07:00
Howard Stearns
dc10e15e96 Put the common stuff on AudioInjector rather than AudioClient, so that assignment-client (which depends on script-engine) does not need to depend on audio-client. 2015-06-19 14:20:00 -07:00
Niraj Venkat
054e12a315 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-19 11:22:50 -07:00
Niraj Venkat
1494aa4faa Adding new icon and getters 2015-06-19 11:18:16 -07:00
Ryan Huffman
35f9d49c06 Fix DrawOverlay3D::getOpaquePipeline invalid signature 2015-06-19 10:47:25 -07:00
Ryan Huffman
665baff665 Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-rotate
Conflicts:
	interface/src/ui/overlays/Circle3DOverlay.cpp
	libraries/render-utils/src/RenderDeferredTask.cpp
	libraries/render-utils/src/RenderDeferredTask.h
2015-06-19 10:07:57 -07:00
Ryan Huffman
690e2e38f2 Move circle3d and text overlays to batches 2015-06-19 09:45:13 -07:00
Seth Alves
89ec3c21b4 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-19 09:36:11 -07:00
Seth Alves
fca06d9d3d add actionData to properties that EntityItem transmits and receives 2015-06-19 09:36:06 -07:00
Sam Gateau
873955b17e Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-06-19 18:02:56 +02:00
Clément Brisset
5192796851 Merge pull request #5168 from samcake/daft
Improving the rendering job architecture
2015-06-19 18:00:39 +02:00
Sam Gateau
2920197e88 Merge branch 'daft' of https://github.com/samcake/hifi into punk 2015-06-19 17:48:07 +02:00
Sam Gateau
b0f5990bd7 fix syntax 2015-06-19 17:13:29 +02:00
Atlante45
9c7f24eeb6 Add culled option for simple programs 2015-06-19 16:50:38 +02:00
Sam Gateau
5a2d2485c0 Fix the cookie cutter problem in stereo, the alphaThreshold wasn 't assigned correctly for opaque 2015-06-19 16:30:48 +02:00
Sam Gateau
31633eca10 IMproving the probe system and cleaning the engine script 2015-06-19 10:41:40 +02:00
Sam Gateau
b09991d75b Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-06-19 09:35:40 +02:00
Brad Davis
9bef5f011b Reverting mirror functionality 2015-06-19 00:03:46 -07:00
Seth Alves
fce551099f first stab at sending action data across wire 2015-06-18 18:32:57 -07:00
ericrius1
0e177a3e31 deleted unnessary line break 2015-06-18 18:23:09 -07:00
Brad Davis
48b27acc79 Merge remote-tracking branch 'upstream/master' into overlay
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.cpp
2015-06-18 18:17:59 -07:00
ericrius1
7293330ced fixed indentation and lines delete when user exits to help with large model.svo/json file size 2015-06-18 18:17:02 -07:00
ericrius1
830a8b6909 checking for bounds and modified paint script to start a new line entity if user paints outside of line entity's bounding box 2015-06-18 18:14:03 -07:00
Seth Alves
32cf669d8b moving toward sending actions over wire 2015-06-18 17:51:41 -07:00
David Rowe
709508857c Delete maximum rolling backup file if it exists before rolling backup 2015-06-18 17:39:31 -07:00
Philip Rosedale
2f080a8e29 Merge pull request #5147 from sethalves/more-actions
offset action
2015-06-18 17:35:50 -07:00
Brad Davis
8e5da5acaa Fix debug compile error 2015-06-18 17:05:49 -07:00
ericrius1
8183e7393d adding check for points inside bounds' 2015-06-18 17:00:27 -07:00
ericrius1
6a5deaaef1 returning true from set line points 2015-06-18 16:54:39 -07:00
Seth Alves
5e80868fe0 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-18 16:31:07 -07:00
Seth Alves
c9a7136d51 Merge pull request #5162 from PhilipRosedale/smoother
Smoother motion for physical objects as viewed by remote observer
2015-06-18 16:30:34 -07:00
ericrius1
2b4146125f adding logic to check points of line are inside bounds 2015-06-18 16:27:06 -07:00
Seth Alves
816726efdc Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-18 15:33:46 -07:00
Seth Alves
021dc64789 merge from upstream 2015-06-18 15:03:09 -07:00
Seth Alves
3c90c851e9 start on code to de/serialize actions 2015-06-18 15:01:34 -07:00
Andrew Meadows
d88d9b2b88 Merge pull request #5141 from sethalves/overloaded-virtual
use -Woverloaded-virtual with g++.  quiet compiler warnings
2015-06-18 14:58:47 -07:00
Philip Rosedale
61a2196a30 Reduce error tolerances for ballistic prediction that trigger updating the server 2015-06-18 13:21:37 -07:00
Seth Alves
99afd07395 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-18 12:45:40 -07:00
Philip Rosedale
e46a820872 remove debug 2015-06-18 12:37:50 -07:00
Philip Rosedale
bffc1a38a7 Separate DC offset rejection, and call it all the time 2015-06-18 12:33:05 -07:00
Brad Davis
0cdee2d6ec preprocessor error on Linux/Mac 2015-06-18 12:14:55 -07:00
Sam Gateau
fb42613344 Fixing transparency that i just broke 2015-06-18 20:25:51 +02:00
Brad Hefta-Gaub
b008b810e1 Merge pull request #5145 from Atlante45/text
Bring back display names
2015-06-18 11:25:45 -07:00
Seth Alves
1e3681462c Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-18 11:20:59 -07:00
David Rowe
1047703718 Tidy address bar code
Re-enable and reposition mouse drag areas
Remove unused graphics assets
Remove unused includes
2015-06-18 11:18:56 -07:00
Howard Stearns
37d6e21ce3 Merge branch 'master' of https://github.com/highfidelity/hifi into refactor-playSound 2015-06-18 11:16:16 -07:00
Seth Alves
7d707447ca move multi-line function out of header 2015-06-18 11:07:50 -07:00
Seth Alves
97eeb20625 Merge branch 'master' of github.com:highfidelity/hifi into overloaded-virtual 2015-06-18 11:04:24 -07:00
Howard Stearns
fdf5860c4f Refactor playSound. 2015-06-18 10:39:58 -07:00
Seth Alves
53b5c8e6e7 more merge fallout 2015-06-18 10:19:12 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
Sam Gondelman
f752534f7c actionEvent signal, captureActions, began work on hmdControls.js 2015-06-18 09:52:36 -07:00
ZappoMan
383a2c3d63 another attempt 2015-06-18 09:43:39 -07:00
ZappoMan
673e1ee0cc first cut and removing openGl dependency in shared 2015-06-18 09:30:34 -07:00
Seth Alves
992c253a42 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-18 07:35:31 -07:00
Atlante45
26e8c490c3 constexpr not handled on windows 2015-06-18 15:23:54 +02:00
Atlante45
5166d833a7 Make array size a constexpr 2015-06-18 15:23:53 +02:00
Atlante45
30fbd37645 Transmit normal to text rendering shader 2015-06-18 15:23:52 +02:00
Atlante45
1cab853f18 Better guard Transform scale 2015-06-18 15:23:50 +02:00
Atlante45
8a3a7e5b7f Reorder triangle strip 2015-06-18 15:23:50 +02:00
Atlante45
a9d2bb1e1c Coding standard 2015-06-18 15:23:50 +02:00
Atlante45
254f05072f Fix inverted if 2015-06-18 15:23:49 +02:00
Atlante45
70a020c7e3 BevelRect use triangle strips 2015-06-18 15:23:49 +02:00
Atlante45
d7b9a1b032 Cleanup TextRenderer3D methods args 2015-06-18 15:23:49 +02:00
Atlante45
47634a48a6 Make renderDisplayName const 2015-06-18 15:22:49 +02:00
Atlante45
ca98b378df Adjust sdf frag shader alpha correctly 2015-06-18 15:22:49 +02:00
Atlante45
bdaf8a8a32 Fix bevel quads 2015-06-18 15:22:48 +02:00