Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-17 17:36:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
27259 commits 74 branches 59 tags 1.2 GiB
Commit graph

9892 commits

Author SHA1 Message Date
Brad Hefta-Gaub
f16b8d5083 Merge pull request #5246 from jherico/inter_idle_timing 
Instrument the inter-idle time and tweaking the timeout setting
 2015-07-02 09:01:44 -07:00
samcake
3564499824 Merge pull request #5249 from ZappoMan/entityServerEditStats 
add more detailed edit timing to entity server
 2015-07-01 18:11:19 -07:00
Brad Davis
59027959b8 CR comments and fixing the average calculation 2015-07-01 16:30:42 -07:00
Brad Hefta-Gaub
b4f04af66f Merge pull request #5242 from jherico/packet_processing 
Eliminate per-packet locking for processing
 2015-07-01 16:11:27 -07:00
ZappoMan
24b4614703 add more detailed edit timing to entity server 2015-07-01 16:11:08 -07:00
Brad Davis
1d16d80c0c Comments from CR 2015-07-01 14:55:24 -07:00
Brad Davis
1e1f199fdb Undoing unwisdom 2015-07-01 14:54:26 -07:00
Brad Davis
4c200d75bc Tweaking packet processing locking 2015-07-01 14:53:08 -07:00
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
Brad Davis
d4d6f8f5d5 Eliminate per-packet locking for processing 2015-07-01 10:06:04 -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
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
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
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
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
ZappoMan
f61581d29d possible fix for deadlock 2015-06-26 15:42:04 -07:00
David Rowe
8d83e23bab Improve entity properties list code comment 2015-06-26 15:37:16 -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
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
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
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
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
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
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
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