Ryan Huffman
0877f9f159
Fix issues with running scripts window on Windows
...
Replace running scripts table with a new widget that uses a proper
layout that doesn't rely on hard-coded sizing. Custom painted lines
were replaced with a horizontal QFrame line.
2014-06-17 20:19:49 -07:00
Ryan Huffman
5ef9e3b3c0
Merge branch 'master' of git://github.com/highfidelity/hifi into 19644
...
Conflicts:
interface/src/Application.cpp
2014-06-11 14:34:59 -07:00
Ryan Huffman
355fe01490
Merge branch 'master' of git://github.com/highfidelity/hifi into 19644
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/ui/PreferencesDialog.cpp
interface/src/ui/RunningScriptsWidget.cpp
interface/ui/preferencesDialog.ui
interface/ui/runningScriptsWidget.ui
2014-06-11 13:30:47 -07:00
Brad Hefta-Gaub
62f85d0794
Merge pull request #3004 from matsukaze/master
...
Job #19766 BUG: Stop or reload all scripts crashes interface
2014-06-11 11:51:03 -07:00
wangyix
fc07ceb412
added killNode() slot for _packetCounts garbage collection
2014-06-11 10:54:44 -07:00
wangyix
01005dc792
Merge remote-tracking branch 'upstream/master'
2014-06-11 10:09:49 -07:00
matsukaze
679846267e
Job #19766 BUG: Stop or reload all scripts crashes interface fixed, part 3
...
Same comments as before, but without the local files changes mistakenly
checked in.
2014-06-10 22:42:01 -04:00
matsukaze
1e1cc69287
Revert "Job #19766 BUG: Stop or reload all scripts crashes interface fixed, part 3"
...
This reverts commit 46f2ab73bc
2014-06-10 22:37:34 -04:00
matsukaze
46f2ab73bc
Job #19766 BUG: Stop or reload all scripts crashes interface fixed, part 3
...
Move the conversion of scriptName to QUrl to the beginning of
Application::loadScript. Use the scriptURLString to query the
_scriptEngineHash map.
2014-06-10 22:29:58 -04:00
matsukaze
a48f38b1d2
Revert "Job #19766 BUG: Stop or reload all scripts crashes interface fix, part 2."
...
This reverts commit b4e9840865
2014-06-10 21:32:23 -04:00
Andrzej Kapolka
f677858891
Merge pull request #3009 from ZappoMan/bugFix
...
fix some bugs in models
2014-06-10 16:56:56 -07:00
ZappoMan
0ae7411bf0
fix some bugs in models
2014-06-10 13:37:53 -07:00
wangyix
b96b6c9857
added default constructor for NetworkPacket
...
updated param comments in ReceivedPacketProcessor
2014-06-10 12:24:47 -07:00
wangyix
d84beee3e4
VoxelPacketProcessor -> OctreePacketProcessor
...
added nodes bookkeeping in ReceivedPacketProcessor; added check in
sendNack() to not send NACKs to nodes that have sent packets that are
waiting in the message queue.
2014-06-10 11:05:51 -07:00
Andrew Meadows
c9ba71aa01
fix for broken neck on some body models
2014-06-10 09:38:38 -07:00
matsukaze
b4e9840865
Job #19766 BUG: Stop or reload all scripts crashes interface fix, part 2.
...
Keep the scriptUrl internal to the ScriptEngine class and refer to it
externally by the file name string.
Change the ScriptEngine constructor to accept a filename QString,
instead of a QUrl. Resolve constructor ambiguity in Particle, which
creates anonymous ScriptEngine.
2014-06-09 23:15:45 -04:00
Brad Hefta-Gaub
f3fb39574f
Merge pull request #3007 from wangyix/master
...
Added Developer menu option to disable nack packets.
2014-06-09 18:11:01 -07:00
wangyix
ffda98fe0b
var name change again
2014-06-09 17:50:29 -07:00
wangyix
4665df4d1f
nackdisable to disablenack
2014-06-09 17:41:20 -07:00
wangyix
de61029f05
Added dev menu option to disable nack packets
2014-06-09 17:30:09 -07:00
Andrew Meadows
589b2e8fb7
recover some code for one less magic vec3
2014-06-09 16:12:54 -07:00
Andrew Meadows
e8b6338de9
Fix IK for hydra hands.
2014-06-09 15:40:29 -07:00
matsukaze
c8c8bccbf3
Job #19766 BUG: Stop or reload all scripts crashes interface fixed.
...
QUrl(name).toString() does not equal name, therefore removing name from
ScriptEngineHash was failing, and a dangling pointer was left in the
script engine hash map.
2014-06-09 17:52:50 -04:00
Brad Hefta-Gaub
6cf30cf9d1
Merge pull request #3002 from wangyix/master
...
added code to nack and re-send dropped octree data packets
2014-06-09 13:52:21 -07:00
wangyix
e45f2fed4b
changed writelock to readlock
...
plus a coding standard fix
2014-06-09 13:42:45 -07:00
Brad Hefta-Gaub
2a4e6a1311
Merge pull request #3001 from Barnold1953/OculusOverlay
...
Simple raypicking for scripts with oculus rift.
2014-06-09 13:21:24 -07:00
wangyix
aa694d6967
removed debug code
2014-06-09 12:35:26 -07:00
wangyix
529dd827a2
moved around code in sendNack() a bit
2014-06-09 12:00:19 -07:00
barnold1953
936f04cece
Simple raypicking for scripts with oculus rift.
2014-06-09 11:55:29 -07:00
Andrzej Kapolka
28490f9bbc
Merge pull request #2994 from AndrewMeadows/ragdoll
...
Ragdoll Part 2: make MyAvatar's skeleton's collision shapes follow ragdoll
2014-06-09 11:55:19 -07:00
Andrew Meadows
4f9da0cc37
fix whitespace formatting
2014-06-09 11:50:31 -07:00
wangyix
3bc457d4d2
added octree scene stats locking and unlocking
2014-06-09 11:14:02 -07:00
wangyix
5286090812
removed interface print statements
2014-06-06 17:52:48 -07:00
wangyix
b39559d860
packet recovery seems to be working
...
Seems to impact FPS a lot. OctreeSceneStats is not being locked (causes
freezing, need to find out why).
2014-06-06 17:44:30 -07:00
wangyix
d21a8e73ff
Merge remote-tracking branch 'upstream/master' into packet_recovery_pull
2014-06-06 15:05:29 -07:00
wangyix
0b1bffa83c
added random packet drops; ready to test
2014-06-06 15:03:54 -07:00
wangyix
bd2148d4b7
added write lock/unlock
...
...for _octreeSceneStatsLock
2014-06-06 14:33:53 -07:00
wangyix
5c47485562
client-side nack sending complete; ready to test
2014-06-06 14:27:51 -07:00
wangyix
8cd5ec3b54
started work on sending nack packets from client
2014-06-06 11:50:34 -07:00
Stephen Birarda
b6b148cd9f
resolve conflicts on merge with upstream master
2014-06-06 11:31:16 -07:00
Stephen Birarda
f6011b65d7
fix input loudness for a stereo source
2014-06-06 11:26:04 -07:00
Stephen Birarda
ae2f6a3cb6
complete piping of stereo audio through mixer
2014-06-06 10:55:04 -07:00
Stephen Birarda
681ce247d6
tweak resample to handle 48 to 24 stereo, add stereo/mono byte
2014-06-06 10:27:59 -07:00
Stephen Birarda
7da091d2b4
initial hooks for stereo audio
2014-06-06 10:15:09 -07:00
Andrew Meadows
7f25c3e011
merge upstream/master into andrew/ragdoll
2014-06-06 08:53:37 -07:00
Andrew Meadows
551029c2f5
slave SkeletonModel's collision shapes to RagDoll
2014-06-06 08:51:22 -07:00
Andrew Meadows
c689d826f4
fix for broken windows build with PrioVR libs
...
The Model API changed but this code path was not updated.
2014-06-05 15:48:18 -07:00
Clément Brisset
02452819c3
Merge pull request #2988 from AndrewMeadows/ragdoll
...
RagDoll Part 1: basic data structure
2014-06-05 14:44:36 -07:00
Andrzej Kapolka
8d908a12a3
Fix build.
2014-06-05 12:28:02 -07:00
barnold1953
f0f7d0c55f
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay
...
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
2014-06-05 12:17:09 -07:00
