Ryan Huffman
aa47043d57
Fix WAV file support
...
The previous implementation assumed the file only contained RIFF, WAVE,
fmt, and data chunks. It is valid for other chunks to appear, so I
updated it to skip any chunks until it finds the "data" chunk.
2014-05-27 11:24:48 -07:00
barnold1953
d1a4192ac5
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-27 11:20:23 -07:00
barnold1953
d4f66a4a3d
Added OverlayRenderer class and moved displayOverlay from Application to
...
OverlayRenderer.
2014-05-27 11:19:45 -07:00
Brad Hefta-Gaub
517d51cba7
Merge pull request #2928 from PhilipRosedale/master
...
Improved playSound.js to work without a spatial controller
2014-05-27 11:04:25 -07:00
Andrzej Kapolka
70ab33b65b
Some tricks to avoid shadow artifacts: render back faces to shadow buffer,
...
use polygon offset.
2014-05-27 10:54:18 -07:00
Philip Rosedale
ab80e3dc84
improved playSound.js to work if no spatial controller attached
2014-05-27 10:32:55 -07:00
Brad Hefta-Gaub
13366d9ba1
Merge pull request #2926 from ctrlaltdavid/chat_window
...
Fix chat window scrolling
2014-05-27 10:07:34 -07:00
Brad Hefta-Gaub
d63374f656
Merge pull request #2927 from AndrewMeadows/inertia
...
Improved detection of floor surfaces
2014-05-27 09:33:50 -07:00
Brad Hefta-Gaub
cac2db4a8a
Merge pull request #2925 from talentraspel/19706
...
separate style handling for chat area and its context menu.
2014-05-27 09:31:24 -07:00
Ryan Huffman
4a0a9f8a36
Update console style
2014-05-27 08:57:29 -07:00
Ryan Huffman
9af0269151
Update console style
2014-05-27 08:05:56 -07:00
Ryan Huffman
b9248e0bbf
Update JSConsole to QWidget
2014-05-27 08:03:46 -07:00
Ryan Huffman
422c2eac67
Update showConsole -> toggleConsole and change shortcut
2014-05-27 07:29:48 -07:00
Andrew Meadows
9175ae20d6
Merge upstream/master into andrew/inertia
2014-05-26 16:26:15 -07:00
Andrew Meadows
51850076e4
more correct detection of floor surfaces
2014-05-26 16:24:47 -07:00
Ryan Huffman
1d7272cbbf
Add console.ui interface file
2014-05-26 10:18:04 -07:00
Ryan Huffman
099777ef8c
Merge branch 'master' of git://github.com/highfidelity/hifi into 19648
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
2014-05-26 10:01:44 -07:00
Ryan Huffman
5a5d5b4983
Add JSConsole
2014-05-26 09:59:28 -07:00
Ryan Huffman
8aa9cea30e
Add custom evaluation of commands in ScriptEngine
2014-05-26 09:59:02 -07:00
Ryan Huffman
3d28cff9df
Add console to menu
2014-05-26 09:58:06 -07:00
Ryan Huffman
c362731226
Add support to load script engines not based on a file
2014-05-26 09:57:37 -07:00
David Rowe
7c3d3976ee
Fix chat window scrolling to stay at bottom
...
Stay at bottom window when:
- There is new chat.
- People come and go from online list.
- Chat window hides and restores when application focus changes.
- Interface is minimized and restored.
2014-05-25 16:42:36 -07:00
David Rowe
97e5c928a4
Fix chat scroll bar widget jumping
...
Hovering over the chat window's scroll bar was causing it to jump
around. Replaced the 12px style spacing that was causing the problem
with a widget-based solution.
2014-05-25 16:41:01 -07:00
Kai Ludwig
78e311f885
separate style handling for chat area and its context menu.
2014-05-25 20:24:15 +02:00
Clément Brisset
6bb933996f
Merge pull request #2920 from ZappoMan/aacube
...
Add RayPick support for models
2014-05-24 17:03:59 -07:00
Clément Brisset
f71a9b5df7
Merge pull request #2924 from talentraspel/19680
...
added missing locking against crashing in Overlays::~Overlays()
2014-05-24 17:03:37 -07:00
ZappoMan
a98ac0782a
CR feedback
2014-05-24 16:37:32 -07:00
Kai Ludwig
587f60631f
missed a tab
2014-05-24 21:28:03 +02:00
Kai Ludwig
c832df0783
added missing locking against crashing in Overlays::~Overlays()
2014-05-24 21:22:34 +02:00
ZappoMan
9d9600aad5
fix max dimension
2014-05-23 22:08:31 -07:00
Clément Brisset
3e671c1968
Merge pull request #2922 from birarda/master
...
fix credit amount in window title
2014-05-23 17:43:04 -07:00
Philip Rosedale
f4c274dbe6
Merge branch 'master' of https://github.com/worklist/hifi
2014-05-23 17:41:58 -07:00
Stephen Birarda
fe05beb88d
remove an unneeded debug
2014-05-23 17:41:58 -07:00
Brad Hefta-Gaub
3c05aa74b0
Merge pull request #2921 from ey6es/master
...
Support for shadows falling on models (including self-shadowing).
2014-05-23 17:40:17 -07:00
Stephen Birarda
9df0f2c1e5
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-23 17:38:28 -07:00
Stephen Birarda
714e29c887
fix credit amount in window title
2014-05-23 17:37:36 -07:00
Philip Rosedale
ad1c205063
Merge branch 'master' of https://github.com/worklist/hifi
2014-05-23 17:17:54 -07:00
Andrzej Kapolka
632f87dc88
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-23 17:15:03 -07:00
Andrzej Kapolka
e48f02f2c5
Remove unused variable.
2014-05-23 17:13:27 -07:00
ZappoMan
efd0580cfb
add ray picking to the model scripting interface
2014-05-23 17:09:37 -07:00
Clément Brisset
965d5778d6
Merge pull request #2917 from stojce/19705
...
Code Review for Job #19705
2014-05-23 17:07:17 -07:00
Andrzej Kapolka
ac2137c3b6
Fixed a couple copy and paste errors.
2014-05-23 16:56:10 -07:00
Clément Brisset
fb7db04573
Merge pull request #2918 from PhilipRosedale/master
...
Ability to move both slowly and fast with hand controllers
2014-05-23 16:55:16 -07:00
Andrzej Kapolka
84b78429f2
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-23 16:37:25 -07:00
Andrzej Kapolka
67e3454a86
Missed a few files.
2014-05-23 16:37:12 -07:00
Philip Rosedale
ef989e7ca9
Merge branch 'master' of https://github.com/worklist/hifi
2014-05-23 16:37:06 -07:00
Philip Rosedale
7c8ece6a5b
Merge pull request #2919 from AndrewMeadows/inertia
...
turn on gravity when there is a voxel floor to stand on
2014-05-23 16:36:57 -07:00
AndrewMeadows
4f8b2819d2
Merge pull request #2916 from birarda/master
...
make transaction amounts and balances signed 64-bit
2014-05-23 16:36:34 -07:00
Andrzej Kapolka
0baf757c0d
Basic support for shadows on models.
2014-05-23 16:35:51 -07:00
Philip Rosedale
d341e7314d
squared force on thrust controller
2014-05-23 16:25:19 -07:00
