Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 07:33:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
27257 commits 71 branches 56 tags 1.2 GiB
Commit graph

27257 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
35adf0c82d Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-27 10:48:48 -07:00
Seth Alves
b7da7374ba Merge pull request #5227 from jherico/cursor_fix 
Fixing always-on link cursor
 2015-06-27 10:47:51 -07:00
Seth Alves
567d98dfab Merge branch 'cursor_fix' of github.com:jherico/hifi into actions-over-wire 2015-06-27 10:45:34 -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
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
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
Brad Davis
e6fade8c13 Prevent tooltips from appearing with stale data 2015-06-26 18:16:56 -07:00
Brad Davis
3b987c1e73 Fixing always-on link cursor 2015-06-26 18:14:31 -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
Clément Brisset
252286bdc1 Merge pull request #5226 from Atlante45/html 
Restore jquery
 2015-06-26 18:00:04 -07:00
Atlante45
7aae36d73e Restore jquery 2015-06-26 17:58: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
Brad Hefta-Gaub
8ee0bd24fe Merge pull request #5222 from birarda/ac-failover 
add a forced failover for hanging STUN dns lookup
 2015-06-26 17:40:11 -07:00
Stephen Birarda
8fd309027f add a forced failover for hanging STUN dns lookup 2015-06-26 17:35:14 -07:00
Seth Alves
7def9c2e28 better handle failure to rez the stick 2015-06-26 17:10:50 -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
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
Seth Alves
8a6ab68eda Merge pull request #5217 from ZappoMan/fixDeadlock 
Fix for deadlock
 2015-06-26 16:27:30 -07:00
Seth Alves
b4537b081f fix clearActions 2015-06-26 16:02:47 -07:00
Seth Alves
db580d1e0b Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-26 15:45:24 -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
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
Stephen Birarda
5b660e8c91 Merge pull request #5214 from venkatn93/master 
Changing formatting of tooltip
 2015-06-26 18:27:59 -04:00
Seth Alves
50c0ee1f7e Merge pull request #5215 from ZappoMan/repairBadFormat 
repair bad ordering of PROP_SCRIPT_TIMESTAMP
 2015-06-26 15:03:40 -07:00
ZappoMan
ccbc048f64 repair bad ordering of PROP_SCRIPT_TIMESTAMP 2015-06-26 14:59:40 -07:00
Niraj Venkat
87fce44271 Changing formatting of tooltip 2015-06-26 14:41:38 -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
Philip Rosedale
c0e0982c2d Merge pull request #5154 from ctrlaltdavid/20547 
CR for #20547 - Add "reload" buttons for redownloading scripts
 2015-06-26 13:57:14 -07:00
Niraj Venkat
55b23731e8 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-26 13:54:46 -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
Clément Brisset
229b367186 Merge pull request #5211 from birarda/master 
fix for audio-mixer shutdown on UNIX/OS X
 2015-06-26 12:23:52 -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