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
Stephen Birarda
45ab8145a4
fix another implicit float cast
2014-05-23 16:22:08 -07:00
Stephen Birarda
1e9589c19e
fix an implicit cast to float
2014-05-23 16:18:21 -07:00
Stephen Birarda
831b0faa20
fix a mistyped constant
2014-05-23 16:15:11 -07:00
Stephen Birarda
1b00cda068
don't use powf for credit conversions
2014-05-23 16:12:34 -07:00
Andrew Meadows
8d660c76cc
merge upstream/master into andrew/inertia
2014-05-23 16:00:55 -07:00
Andrew Meadows
d425b5b322
Enable local gravity when there is a floor nearby.
2014-05-23 15:59:27 -07:00
Stephen Birarda
15a8272286
fix domain-server pending credits to actually be in credits
2014-05-23 15:43:02 -07:00
Stephen Birarda
34eb0f9f43
make transaction amounts and balances signed 64-bit
2014-05-23 15:34:34 -07:00
Brad Hefta-Gaub
50e812a82b
Merge pull request #2913 from talentraspel/19680
...
locking against crash
2014-05-23 15:08:20 -07:00
Stephen Birarda
3d566bc49f
Merge pull request #2915 from birarda/credits
...
fix a comment in script handling
2014-05-23 12:37:51 -07:00
Stephen Birarda
e7e19e8714
fix a comment in script handling
2014-05-23 12:37:27 -07:00
Andrzej Kapolka
aca50aa779
Merge pull request #2914 from birarda/credits
...
balances are 64-bit unsigned ints, fix script request
2014-05-23 12:36:49 -07:00
Stephen Birarda
7e78fc788a
fix double return false
2014-05-23 12:35:16 -07:00
Stephen Birarda
f4292fd29c
handle serving of scripts at temp unique UUIDs
2014-05-23 12:33:39 -07:00
Brad Hefta-Gaub
43bdc8c156
Merge pull request #2912 from Atlante45/point_and_glow
...
Point and glow
2014-05-23 12:31:41 -07:00
Atlante45
28536eaef2
CR
2014-05-23 11:53:34 -07:00
Stephen Birarda
9acf377573
balances are 64-bit unsigned ints
2014-05-23 11:52:39 -07:00
Stojce Slavkovski
b3b8e2d775
Merge branch 'master' of https://github.com/worklist/hifi into 19705
2014-05-23 20:50:10 +02:00
Stojce Slavkovski
be9aac08ee
add disabled
state to Share button on click
2014-05-23 20:49:48 +02:00