Andrew Meadows
b28a18dab0
Remove warning about null-op sprintf() in g++
2014-02-17 09:17:34 -08:00
Andrew Meadows
4848aa1d16
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-17 09:14:06 -08:00
ZappoMan
dd0909659a
Merge branch 'master' of https://github.com/worklist/hifi into overlaysupport
2014-02-16 19:20:06 -08:00
Philip Rosedale
37e1c00828
Merge pull request #2002 from ZappoMan/lowerLODnoFPSdrop
...
Automatically Adjust LOD
2014-02-16 18:14:24 -08:00
Jose Carlos
a8f1f9a00a
Added animation for fade out
2014-02-16 14:25:41 +01:00
gaitat
e30cf33a03
Fix for Worklist Job #19503
...
Formatting errors
2014-02-15 23:04:58 -05:00
Jose Carlos
af48998cc7
Fixed position of display name: we take into account skeleton and head's height
...
Saved opengl state in renderDisplayName
Moved display data to AvatarData
Unified static chat function for chat and display name
2014-02-15 18:40:36 +01:00
gaitat
fcd44f5817
Fix for Worklist Job #19503
2014-02-15 08:16:05 -05:00
Andrzej Kapolka
3e40927d3a
More work on spanning objects.
2014-02-14 18:01:48 -08:00
gaitat
eee839f423
Merge branch 'master' of github.com:highfidelity/hifi
2014-02-14 20:12:39 -05:00
Andrew Meadows
2d1218d304
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-14 16:34:32 -08:00
Andrew Meadows
335141049c
Cleaning up collision check API's and re-enabling collisions with particles.
2014-02-14 16:33:19 -08:00
Jose Carlos
19cb20f0cd
Added rect around the display name with proper size, paying attention to
...
QFontMetrics data
Fully wired up the message sending and receiving from server
2014-02-15 01:05:21 +01:00
ZappoMan
2eac9c293f
first working version of scriptable Overlays
2014-02-14 15:37:47 -08:00
Andrzej Kapolka
8920873d70
Working on support for "spanners" (objects that span multiple octree cells).
2014-02-14 15:35:42 -08:00
Jose Carlos
04c59b825e
merged from master
2014-02-14 20:52:22 +01:00
Andrzej Kapolka
8b3356f819
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-02-14 11:17:14 -08:00
Andrzej Kapolka
f4b47ea443
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-14 11:09:35 -08:00
stojce
0ddc475928
Merge branch 'master' of https://github.com/worklist/hifi into 19497
2014-02-14 18:30:54 +01:00
gaitat
58e773340a
Worklist Job #19503
...
Exposing the average audio intensity to javascript through the MyAvatar
object.
2014-02-14 09:40:59 -05:00
ZappoMan
dbd6cb71c9
fixed crash on shutdown with multiple scripts
2014-02-13 20:55:16 -08:00
Andrzej Kapolka
91fac4eebe
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-13 17:38:23 -08:00
Jose Carlos
b899834c54
Show "displayname" in correct position
...
Show "displayname" when on mouse hover
Persistant displayname data
2014-02-14 00:23:21 +01:00
Andrew Meadows
ee4733d0bd
Fixing a comment.
2014-02-13 12:41:23 -08:00
Andrew Meadows
439cbe3f87
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
...
Conflicts:
interface/src/avatar/Hand.h
interface/src/avatar/MyAvatar.cpp
2014-02-13 12:36:01 -08:00
ZappoMan
e9259db944
Merge branch 'master' of https://github.com/worklist/hifi into lowerLODnoFPSdrop
2014-02-13 12:20:29 -08:00
Andrzej Kapolka
23169c098e
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-13 10:27:36 -08:00
Andrzej Kapolka
9c91d3c2e7
Use the existing session stuff for metavoxels rather than a separate system.
2014-02-13 10:25:10 -08:00
Andrew Meadows
3a8aa0c47e
Removing HeadData::findSpherePenetration() as unused cruft.
2014-02-13 10:02:16 -08:00
stojce
fe6f5a341c
Merge branch 'master' of https://github.com/worklist/hifi into 19497
2014-02-13 18:14:20 +01:00
matsukaze
bf43db7c14
Merge remote-tracking branch 'upstream/master'
2014-02-13 11:37:53 -05:00
matsukaze
a89f3bb9e5
Fixes for style conformance
2014-02-13 11:23:50 -05:00
ZappoMan
20a6f4eea9
first cut at auto-LOD adjustment
2014-02-12 21:22:21 -08:00
Andrzej Kapolka
bb56e2847f
Global edits, edits use virtual function.
2014-02-12 20:00:07 -08:00
Andrzej Kapolka
5b207e4f8e
Work on creating new attributes.
2014-02-12 17:10:32 -08:00
Andrzej Kapolka
d6d95a586d
Working on deleting attributes.
2014-02-12 14:16:14 -08:00
Andrzej Kapolka
f9b0ff0608
Various bits of streaming work: send delete messages for main channel on
...
reliable channel, test messages on main channel.
2014-02-12 12:33:40 -08:00
Andrzej Kapolka
62db3ebb30
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-02-12 11:23:14 -08:00
matsukaze
9e5c8b1634
Merging upstream master
2014-02-12 12:32:53 -05:00
stojce
83d1d54bc2
Merge branch 'master' of https://github.com/worklist/hifi into 19497
2014-02-12 02:13:04 +01:00
stojce
68584c654b
Allow drag-and-drop of snapshots into Interface
2014-02-12 02:12:52 +01:00
Jose Carlos
319d1f6795
Wired up the send of the display data to the servers
...
Added the renderDisplayName in Avatar
2014-02-12 00:54:50 +01:00
Philip Rosedale
1412d49a2f
merge fix
2014-02-11 15:08:49 -08:00
Philip Rosedale
b6edd7be7b
add Vec3::subtract in JS
2014-02-11 15:07:25 -08:00
Andrzej Kapolka
3c535e6c9c
These need to be FST files, too.
2014-02-11 14:38:44 -08:00
ZappoMan
1fca763b9d
removed whitespace to get build to run
2014-02-11 12:43:48 -08:00
Andrzej Kapolka
36f1e59201
Working on support for sending messages through reliable channels.
2014-02-10 20:26:09 -08:00
ZappoMan
4b5e633258
tweaks to hydraMove.js, added scale to MyAvatar JS
2014-02-10 19:48:51 -08:00
ZappoMan
98211a832c
Merge branch 'master' of https://github.com/worklist/hifi into move_hydra_flying_to_js
2014-02-10 17:41:21 -08:00
ZappoMan
8b45e0e3a8
Merge branch 'master' of https://github.com/worklist/hifi into move_hydra_flying_to_js
2014-02-10 17:34:35 -08:00
ZappoMan
991c72006c
moving the hydra grab behavior to JS
2014-02-10 17:25:14 -08:00
Andrew Meadows
f6be83b63c
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-10 17:02:46 -08:00
Andrzej Kapolka
b9a5b13f0a
This should fix the remaining signed/unsigned warning on Windows.
2014-02-10 16:33:35 -08:00
Andrew Meadows
ab25fd03af
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-10 16:01:36 -08:00
Philip Rosedale
dabf3e34d6
Merge pull request #1964 from ZappoMan/multiple_voxel_scripts_crash
...
Fixes various crashes in running multiple voxel scripts simultaneously
2014-02-10 15:43:37 -08:00
Andrew Meadows
4edc6cd88b
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-10 15:42:56 -08:00
Philip Rosedale
ac9e2732b9
Merge pull request #1963 from birarda/authentication
...
default avatar head and body URLS
2014-02-10 15:42:53 -08:00
Philip Rosedale
64736fe290
Merge pull request #1961 from ZappoMan/silence_bad_edit_packet_warning
...
clean up bad edit packet warnings to help reduce log clutter
2014-02-10 15:42:23 -08:00
ZappoMan
0c547a8160
added Quat.safeEulerAngles() for JS
2014-02-10 15:37:49 -08:00
AndrewMeadows
8844b375d3
Merge pull request #1956 from ey6es/metavoxels
...
Fixes for streaming, added test application for metavoxel stuff (currently, datagram transmissions), Windows crash fix, fixes for Windows warnings that Brad reported.
2014-02-10 15:36:11 -08:00
ZappoMan
c68abb3499
nodelist bug
2014-02-10 15:33:07 -08:00
ZappoMan
4bb7bb2b77
make pending packets thread safe
2014-02-10 12:48:45 -08:00
ZappoMan
f8a24a2e99
fix crash in multiple voxel edit scripts running simultaneously
2014-02-10 12:19:46 -08:00
Stephen Birarda
37d7872677
fix a bug in version mismatched packets
2014-02-10 12:06:08 -08:00
Stephen Birarda
988c98d4d7
remove an antequated comment
2014-02-10 12:04:52 -08:00
Stephen Birarda
3e90bcd523
use shorter default URLs, set as placeholder text in prefs
2014-02-10 11:28:22 -08:00
ZappoMan
a0789d3a29
clean up bad edit packet warnings to help reduce log clutter
2014-02-10 11:21:27 -08:00
Stephen Birarda
712692f8bf
add fallback default URLs for head and body models
2014-02-10 11:15:35 -08:00
Stephen Birarda
27305c7a43
change default domain to root, don't double load domains on startup
2014-02-10 10:23:06 -08:00
Andrzej Kapolka
200a2d77c2
Incorporated fixes for warnings that Brad reported on Windows.
2014-02-10 10:13:52 -08:00
Andrzej Kapolka
d48b7b8ede
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-02-10 09:48:24 -08:00
Andrew Meadows
be1aaee359
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-10 09:05:08 -08:00
Andrew Meadows
10296577f4
More info when colliding with meshes + stubbery for poking avatar.
2014-02-10 09:02:29 -08:00
Andrzej Kapolka
c39f9f6271
Fix (hopefully) for Windows runtime error.
2014-02-10 00:59:51 -08:00
Andrzej Kapolka
e9579feef5
Reordering testing.
2014-02-10 00:41:15 -08:00
Andrzej Kapolka
ee2984ce6d
Streaming fixes.
2014-02-09 23:38:33 -08:00
Andrzej Kapolka
f81a9d9fe8
Circular buffer work.
2014-02-09 22:29:23 -08:00
Andrzej Kapolka
8c9f06ceec
Fix/tests for streaming.
2014-02-09 17:43:18 -08:00
Andrzej Kapolka
524ceb4ed2
Working on tests for datagram sequencing, added autogenerated ==/!= operators
...
to mtc.
2014-02-09 16:26:53 -08:00
ZappoMan
e35df7904b
cleanup bad merge
2014-02-09 12:32:12 -08:00
ZappoMan
fe1a6b8f29
improvements to rotating gesture detection
2014-02-09 12:29:57 -08:00
ZappoMan
dca0b05927
added easier support for calculating multitouch rotating behavior including deltaAngle, isRotating, rotating(direction) properties
2014-02-09 12:08:17 -08:00
ZappoMan
3bf8dd87e8
Merge branch 'master' of https://github.com/worklist/hifi into more_events
2014-02-09 10:32:14 -08:00
ZappoMan
9c21eb7949
removed comments
2014-02-09 02:56:26 -08:00
ZappoMan
70c5e674e9
add rotating detection to touch events
2014-02-09 02:54:12 -08:00
ZappoMan
d2b3e74f5d
added isPinching and isPinchOpening to touch events
2014-02-09 02:02:42 -08:00
ZappoMan
120807f9ba
add touch event radius
2014-02-09 01:31:48 -08:00
ZappoMan
02e6a3336d
added several new JS events attributes
2014-02-09 01:05:27 -08:00
Philip Rosedale
c6bf11361e
Merge branch 'master' of https://github.com/worklist/hifi
2014-02-08 16:52:28 -08:00
Philip Rosedale
03bc5adf64
Add Audio Noise Reduction
2014-02-08 16:35:37 -08:00
ZappoMan
07585dbe5b
add scripts to voxels
2014-02-08 12:07:24 -08:00
matsukaze
ab0b7bba00
Fixes for style conformance: tabs to spaces
2014-02-07 22:52:08 -05:00
matsukaze
52290266b0
Fixes for style conformance: replace constants with enums
2014-02-07 22:11:47 -05:00
ZappoMan
235673b7fe
Merge branch 'master' of https://github.com/worklist/hifi into ray_cast_scripting
2014-02-07 16:27:52 -08:00
Stephen Birarda
cf05600d73
fix miss of pingType in timePingReply, closes #1934
2014-02-07 15:27:44 -08:00
Stephen Birarda
3e13608e19
switch back to proper data-server
2014-02-07 15:06:57 -08:00
ZappoMan
802f72c732
more ray picking and intersection work
2014-02-07 15:06:32 -08:00
ZappoMan
e162aa4a40
Merge branch 'master' of https://github.com/worklist/hifi into ray_cast_scripting
2014-02-07 14:47:25 -08:00
Stephen Birarda
f945aac5cd
bump version on unverified packets whose header format has changed
2014-02-07 14:32:09 -08:00
Stephen Birarda
a1a4a3db8a
HifiSockAddr to SharedNodePointer changes in MetavoxelServer
2014-02-07 14:27:10 -08:00
Stephen Birarda
3bf0ed719c
remove a comment in HifiSockAddr
2014-02-07 14:08:42 -08:00
Stephen Birarda
dd4d944dea
ping inactive nodes in conjunction with domain server check in
2014-02-07 14:06:42 -08:00
Stephen Birarda
94c449e10c
Merge branch 'mesh-through-mixer' into authentication
2014-02-07 13:50:39 -08:00
Stephen Birarda
72a3e6f22c
fix long column in NodeList
2014-02-07 13:49:59 -08:00
Stephen Birarda
05f086ae74
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
2014-02-07 13:48:28 -08:00
Stephen Birarda
7c6d3cd01f
fix broken build from NetworkPacket
2014-02-07 13:46:59 -08:00
Stephen Birarda
455442088c
Merge branch 'master' of https://github.com/highfidelity/hifi into mesh-through-mixer
2014-02-07 13:45:14 -08:00
Stephen Birarda
3ad8e7260e
fix an accidental DOS and remove getNodeActiveSocketOrPing API
2014-02-07 13:42:52 -08:00
Stephen Birarda
a5636d2dc0
make ThreadedAssignment subclasses handle QUdpSocket readyRead, closes #1895
2014-02-07 12:25:43 -08:00
ZappoMan
c64b934d33
first cut at ray cast scripting
2014-02-07 11:23:04 -08:00
Philip Rosedale
72de486671
Merge pull request #1920 from ZappoMan/scriptable_camera
...
Scriptable camera
2014-02-07 11:21:12 -08:00
Stephen Birarda
66d4eeb805
enforce both a version and hash match for packets
2014-02-07 11:10:38 -08:00
Andrew Meadows
2e65592048
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-07 10:50:36 -08:00
Andrew Meadows
7a8186f1da
Adding ModelCollisionInfo struct to get more info about collisions against avatars.
...
Had to disable some collisions. Will go back and make them work again soon.
2014-02-07 10:48:30 -08:00
Andrew Meadows
0a4eec448e
Removing findSpherePenetration() from AvatarData class
2014-02-07 10:47:00 -08:00
Stephen Birarda
d39cccde77
add a method to find a node and upate based on packet
2014-02-07 10:32:16 -08:00
Stephen Birarda
7ceacd2751
remove blank if and fix ping reply construction
2014-02-07 10:24:01 -08:00
Stephen Birarda
fa1825fa32
repairs to ping-reply, removal of deconstructPacketHeader to simply return UUID
2014-02-07 10:20:50 -08:00
Andrzej Kapolka
d3b005112e
Changes from Philip's code review.
2014-02-07 10:03:23 -08:00
Stephen Birarda
b988308a8d
leverage writeDatagram helper in NodeList, ping if no active socket
2014-02-07 09:49:54 -08:00
ZappoMan
2157349804
added Camera.computePickRay()
2014-02-07 09:40:52 -08:00
ZappoMan
41f6650b20
implement movable independent camera with hydra
2014-02-07 01:23:30 -08:00
ZappoMan
e50f6389ca
add more JS Quat features
2014-02-07 00:00:30 -08:00
Andrzej Kapolka
d7df4173e5
Cleaner component creation.
2014-02-06 18:58:36 -08:00
Andrzej Kapolka
0a6288bda4
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-02-06 15:42:37 -08:00
Andrzej Kapolka
be21eee704
More work on parameterized scripts.
2014-02-06 15:41:21 -08:00
Stephen Birarda
c1132726bf
use SharedNodePointer in place of Node where appropriate
2014-02-06 14:58:03 -08:00
Stephen Birarda
97a7369c76
remove senderWithAddress from NodeList
2014-02-06 14:43:46 -08:00
Andrew Meadows
082b7cf1a9
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
...
Conflicts:
interface/src/avatar/Avatar.cpp
interface/src/avatar/Avatar.h
interface/src/avatar/MyAvatar.cpp
2014-02-06 14:37:19 -08:00
Stephen Birarda
a823722d27
add writeDatagram helper to NodeList to insert md5 hash
2014-02-06 14:28:58 -08:00
Andrew Meadows
b230f046a7
Minor formating fixes.
2014-02-06 14:11:11 -08:00
Andrzej Kapolka
f6320d3a81
I think this covers the basic bits necessary for the reliable streaming. Of
...
course, I haven't tested it yet.
2014-02-06 12:27:46 -08:00
Stephen Birarda
cb6316bf4d
fix KeyState enum spacing
2014-02-06 11:45:52 -08:00
Stephen Birarda
f10404b31e
allow setting of avatar URLs via AvatarData properties
2014-02-06 11:45:37 -08:00
Stephen Birarda
e72f6d16cc
rename NodeList ownerUUID to sessionUUID
2014-02-06 11:43:23 -08:00
Stephen Birarda
3dca04aacb
have the domain-server generate connection secrets, closes #1837
2014-02-06 11:30:53 -08:00
Stephen Birarda
6f638fa62c
have domain-server create a UUID for unidentified nodes, closes #1840
2014-02-06 10:34:34 -08:00
Stephen Birarda
f92f9ec0c2
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
2014-02-06 09:28:03 -08:00
Brad Hefta-Gaub
8fbce35944
fix slight glitch in last child delete from larger voxel
2014-02-06 03:44:21 -08:00
Andrzej Kapolka
6b4c8b62c6
Back down the rabbit hole I go, weee!
2014-02-05 21:28:36 -08:00
ZappoMan
3e4ce72b47
Merge pull request #1896 from birarda/library-cleanup
...
library and ScriptEngine cleanup
2014-02-05 20:34:31 -08:00
ZappoMan
7c8858c7b6
Merge pull request #1887 from ZappoMan/fixwindowsbuild
...
fix windows build errors and warnings
2014-02-05 20:32:51 -08:00
Andrzej Kapolka
98a432d3e5
Punting on the span tracking thing for now.
2014-02-05 19:24:16 -08:00
Andrzej Kapolka
e77feb8efd
More work on reliable transfer.
2014-02-05 16:19:16 -08:00
Stephen Birarda
f4fe2bb754
move octree-server libs to assignment-client
2014-02-05 16:04:23 -08:00
ZappoMan
ce30e83113
fix crash in octree server related to getActiveSocket() returning NULL
2014-02-05 14:56:00 -08:00
Brad Hefta-Gaub
a05e07460f
fix windows build errors and warnings
2014-02-05 13:54:17 -08:00
Andrzej Kapolka
5e9916302b
Working on clearing shared object references.
2014-02-05 13:28:19 -08:00
Andrzej Kapolka
3a378dbeaf
Working on extending the concept of a shared object.
2014-02-05 12:20:02 -08:00
Stephen Birarda
96fd73a766
fixed wrapped read of samples from end of buffer
2014-02-05 11:39:03 -08:00
ZappoMan
76bc4564ad
push to force rebuild
2014-02-05 10:24:00 -08:00
ZappoMan
53e7cd7797
fix particle init
2014-02-05 10:16:43 -08:00
AndrewMeadows
42528be7ca
Merge pull request #1846 from ZappoMan/fixdebugoutput
...
fix debug to properly work with outputBufferBits()
2014-02-05 10:03:09 -08:00
Stephen Birarda
c194ad1b2d
Merge pull request #1873 from ZappoMan/bugfixes
...
Fix corruption in voxel packets
2014-02-04 23:17:45 -08:00
ZappoMan
1b9cc4f5a5
more fixup to octree packets
2014-02-04 23:02:56 -08:00
ZappoMan
b0c41b086d
fix voxel packet corruption
2014-02-04 22:54:55 -08:00
ZappoMan
13d9b710f1
bump packet version
2014-02-04 20:23:12 -08:00
ZappoMan
a35e5eeb92
move modelScale before translation and rotation since that seems to fix the corruption
2014-02-04 20:20:06 -08:00
Andrzej Kapolka
be4f081465
More work on editing parameterized URLs.
2014-02-04 19:55:11 -08:00
matsukaze
ef3d795938
Fixes for style conformance
2014-02-04 21:58:14 -05:00
Andrzej Kapolka
4f4c4c68d9
Streaming cleanup, streaming script strings as repeated values.
2014-02-04 18:31:18 -08:00
Stephen Birarda
092c969e75
more repairs to face and skeleton model passing
2014-02-04 15:48:31 -08:00
Andrzej Kapolka
ca52d67041
Basic script guides now working.
2014-02-04 15:40:17 -08:00
Stephen Birarda
adaa36a51d
repairs to key-framed URL sending through avatar-mixer
2014-02-04 15:28:27 -08:00
Stephen Birarda
3959209bc2
complete movement of URLs to AvatarData for re-usability
2014-02-04 14:49:56 -08:00
Stephen Birarda
2b80a5fbb8
move face/skeleton model URLs to AvatarData
2014-02-04 14:40:41 -08:00
Andrzej Kapolka
3af86cb1a4
Working on script loading.
2014-02-04 14:07:01 -08:00
Andrzej Kapolka
fd31cc02ad
Working on loading scripts.
2014-02-04 14:06:17 -08:00
Stephen Birarda
8bf3b7586b
initial movement of mesh/skeleton URLs out of data-server through avatar-mixer
2014-02-04 13:02:33 -08:00
ZappoMan
2cf2e693b9
fix debug to properly work with outputBufferBits()
2014-02-04 12:29:55 -08:00
Andrzej Kapolka
a043278f03
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-02-04 11:25:18 -08:00
Andrzej Kapolka
cfbe4de647
Progress on shared object attributes; basic "throbbing" guide working.
2014-02-03 19:46:22 -08:00
Andrzej Kapolka
3f529e37b5
Working on streaming objects.
2014-02-03 16:34:04 -08:00
Stephen Birarda
d563c89482
fix for ScriptEngine crash
2014-02-03 16:25:38 -08:00
Andrzej Kapolka
7dfb83b6cc
Fix for obtaining values from editor.
2014-02-03 14:35:29 -08:00
Andrzej Kapolka
449cf1fbd3
Layout fix.
2014-02-03 12:45:45 -08:00
ZappoMan
c739c2452a
Merge pull request #1832 from birarda/script-timer
...
hide ScriptEngine calls from JS
2014-02-03 12:45:41 -08:00
AndrewMeadows
6dc959f780
Merge pull request #1831 from ZappoMan/scripting
...
More scripting work
2014-02-03 12:43:56 -08:00
Andrzej Kapolka
8df6d2bb6b
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-02-03 11:21:44 -08:00
Andrew Meadows
466a43c77f
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-03 10:47:00 -08:00
Stephen Birarda
028eec7164
don't allow calls to init, run, evaluate from JS
2014-02-03 10:33:31 -08:00
Stephen Birarda
e2842ab7a4
stop timers when the script does, add cleanup methods
2014-02-03 10:10:58 -08:00
ZappoMan
8b2f185937
always emit update even when no servers
2014-02-03 10:05:26 -08:00
Stephen Birarda
9dd8c11e1e
change script timer setup to match HTML dom standard
2014-02-03 09:59:16 -08:00
Stephen Birarda
d9cfaec4f0
Merge branch 'master' of https://github.com/highfidelity/hifi into script-timer
2014-02-03 09:32:13 -08:00
matsukaze
259b285841
Merging upstream
2014-02-03 10:25:32 -05:00
matsukaze
bbf4f889d8
Completed worklist job #19486
...
Job #19486 Don't render the duplicate triangles between adjacent
voxels.
Added checkable item to "developer" menu to activate/deactivate cull
shared faces.
Cull all shared voxel faces regardless of distribution in the octree.
Includes leaf to leaf, leaf to non-leaf, and non-leaf to non-leaf
comparison of contiguous faces.
Added new GL primitive renderer to manage the transfer of cube faces
from the voxel system to GL.
Added some useful classes for queue and lock management.
Modified statistics collection to report number of completely culled
nodes. Extra debugging info also includes the interior occlusions bit
mask of leaf voxels.
2014-02-03 09:45:12 -05:00
Andrzej Kapolka
ca9e82e2cb
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-31 19:42:21 -08:00
ZappoMan
ed3f7b9d28
Merge pull request #1822 from birarda/cleanup
...
application destructor cleanup, spacing cleanup
2014-01-31 18:03:19 -08:00
AndrewMeadows
867b66e73e
Merge pull request #1817 from ZappoMan/more_scripting_work
...
More scripting work
2014-01-31 17:54:44 -08:00
Stephen Birarda
d65a3ee174
spacing cleanup in Application and ScriptEngine
2014-01-31 17:38:53 -08:00
ZappoMan
579c601ff7
Merge pull request #1810 from birarda/master
...
scripting nomenclature changes
2014-01-31 17:14:07 -08:00
ZappoMan
289be04f0f
use tryLock in some cases where we don't want to block and pass already locked to the findParticleByID() in scripting interface
2014-01-31 17:12:50 -08:00
Stephen Birarda
d2fd4bf445
expose QTimer to the script engine
2014-01-31 16:36:44 -08:00
ZappoMan
5b825ecd5b
fix isKnownID
2014-01-31 15:46:19 -08:00
ZappoMan
19f218f37c
fix typo
2014-01-31 15:45:31 -08:00
ZappoMan
00e98ee42b
make tryLock actually return a bool
2014-01-31 15:44:48 -08:00
Stephen Birarda
dd83ff0538
move isAvatar property access to Agent object
2014-01-31 14:36:50 -08:00
Stephen Birarda
4b18e37dfb
fix for ttf return in DS, closes #1769
2014-01-31 14:13:05 -08:00
ZappoMan
9798538ea5
Merge branch 'master' of https://github.com/worklist/hifi into more_scripting_work
...
Conflicts:
libraries/particles/src/Particle.cpp
libraries/particles/src/ParticlesScriptingInterface.cpp
2014-01-31 14:10:45 -08:00
