Seth Alves
300d35219d
move functions our of header to cpp file
2015-06-26 16:54:01 -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
Seth Alves
70aa762f61
merge from upstream
2015-06-26 15:34:10 -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
Seth Alves
bc7271769c
merge from master
2015-06-26 14:29:40 -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
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
Niraj Venkat
b1c361b324
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-26 09:45:39 -07:00
Andrew Meadows
2974b44dcd
Merge pull request #5212 from sethalves/physics-lock-entity-tree
...
lock entity-tree during physics operations which access entity-tree
2015-06-26 09:45:06 -07:00
Seth Alves
50d8525460
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-26 07:20:59 -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
Howard Stearns
ce1e67b55a
Merge pull request #5179 from DaveDubUK/walk-1.25
...
walk.js version 1.25
2015-06-26 07:02:09 -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
Brad Hefta-Gaub
63812f28ad
Merge pull request #5206 from SamGondelman/cameraMode
...
fix bug that was preventing camera mode switches
2015-06-25 18:55:13 -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
Stephen Birarda
a77cf4fb7f
fix audio-mixer shutdown on UNIX/OS X
2015-06-25 16:34:38 -07:00
bwent
e3526467c7
Revert changes to ModelPropertiesDialog
2015-06-25 16:04:02 -07:00
Niraj Venkat
23f4f7d824
Place name is underlined
2015-06-25 15:56:40 -07:00
Niraj Venkat
8ea01b45ae
Word wrap implementation
2015-06-25 15:46:43 -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
Niraj Venkat
fec8318cfa
Merge pull request #5208 from AlexanderOtavka/edit-js-properties
...
Make hyperlink its own section in edit.js.
2015-06-25 14:33:23 -07:00
Niraj Venkat
de26dc9c49
Further changes to tooltip
2015-06-25 14:15:06 -07:00
Niraj Venkat
210a1205a7
More layout changes
2015-06-25 14:07:03 -07:00
Sam Gondelman
56944afd39
avatar doesn't move in independent mode, alphabetized menu options
2015-06-25 12:36:36 -07:00
Zander Otavka
803f644edf
Make hyperlink its own section in edit.js.
2015-06-25 11:40:09 -07:00
Niraj Venkat
1a6acdc5b7
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-25 09:39:13 -07:00
Philip Rosedale
60c10b7191
Merge pull request #5207 from ctrlaltdavid/saccades
...
DO NOT MERGE - Back out saccade speed limit
2015-06-25 09:17:40 -07:00
David Rowe
d38a5a1771
Back out saccade speed limit
2015-06-25 07:38:06 -07:00
DaveDubUK
ce31e586b0
fixed sounds. fixed constants
2015-06-25 12:40:51 +07:00
DaveDubUK
ececf68f06
Merge branch 'master' of https://github.com/highfidelity/hifi into walk-1.25
2015-06-25 12:15:07 +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
Anthony J. Thibault
c480c85f85
Fixes for switching between fullAvatar and head & body avatars while in first person.
...
Need to always add _skeletonModel to the main scene when switching to head/body avatar.
Need to always remove _firstPersonSkeletonModel from main scene when switching to head/body avatar.
2015-06-24 17:35:23 -07:00
