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
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
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
8a6ab68eda
Merge pull request #5217 from ZappoMan/fixDeadlock
...
Fix for deadlock
2015-06-26 16:27:30 -07:00
ZappoMan
f61581d29d
possible fix for deadlock
2015-06-26 15:42:04 -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
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
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
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
Stephen Birarda
1a523297ba
Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo
2015-06-26 10:35:15 -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
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
Stephen Birarda
a02fabf398
Merge remote-tracking branch 'nv/master' into hyperlink-photo
2015-06-26 09:30:05 -07:00
Stephen Birarda
81770cfeb2
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-26 08:49:20 -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
