Commit graph

21996 commits

Author SHA1 Message Date
Kai Ludwig
4048627de7 2n try: removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMouse.js, because the function scriptEnding it is no longer available in that script. 2015-02-17 18:50:20 +01:00
Kai Ludwig
fa1bcc43e6 removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMouse.js, because the function scriptEnding it is no longer available in that script. 2015-02-17 18:40:20 +01:00
Andrew Meadows
ac93f86522 Merge pull request #4292 from birarda/master
add a NULL initializer for linked data create callback
2015-02-16 12:26:15 -08:00
Stephen Birarda
20b0dee80c add a NULL initializer for the linked data create callback 2015-02-16 12:07:22 -08:00
Andrew Meadows
935b5ab5b3 Merge pull request #4290 from ZappoMan/backupFixes
fix a couple of bugs in backup settings
2015-02-16 09:56:20 -08:00
Clément Brisset
84bd1aeedf Merge pull request #4283 from birarda/master
fix for ASI playSound called from same thread
2015-02-16 09:12:59 -08:00
Stephen Birarda
8acaa062a2 Merge pull request #4281 from Atlante45/fix_mute_environnement
Fix mute environnement
2015-02-16 09:11:47 -08:00
ZappoMan
573d7971ac fix a couple of bugs in backup settings 2015-02-13 20:23:12 -08:00
Brad Hefta-Gaub
9b6049489b Merge pull request #4280 from AndrewMeadows/inertia
remove a couple crash modes on shutdown
2015-02-13 17:11:56 -08:00
Andrew Meadows
76b10a60ba Merge pull request #4285 from ZappoMan/editLogging
added logging of edit commands in the server
2015-02-13 17:02:05 -08:00
Andrew Meadows
45208d468e Merge pull request #4282 from ZappoMan/bugfix
some backup logging improvements & a bug fix
2015-02-13 16:54:25 -08:00
Brad Hefta-Gaub
f6ff0665ca Merge pull request #4286 from huffman/fix-nat-dims
Fix "reset to natural dimensions" when dimensions not known
2015-02-13 16:31:34 -08:00
Brad Hefta-Gaub
2f492082c1 Merge pull request #4287 from sethalves/fix-Rectangle3d-drawing-problem
fix Rectangle3d drawing problem
2015-02-13 16:30:46 -08:00
Andrew Meadows
9122364c3b merge upstream/master into andrew/inertia 2015-02-13 16:20:09 -08:00
Andrew Meadows
cfbf8fdca7 explicit cleanup of loaded model animations
in Application dtor
2015-02-13 16:19:10 -08:00
Andrew Meadows
45ec7fdf07 Merge pull request #4288 from ZappoMan/dependancyCleanup
change ScriptCache and SoundCache to derive from Dependency
2015-02-13 16:00:47 -08:00
ZappoMan
1fc0225939 change ScriptCache and SoundCache to derive from Dependency 2015-02-13 15:33:41 -08:00
Seth Alves
42511f3b7f M-x mangle buffer 2015-02-13 15:23:22 -08:00
Seth Alves
98b445b22f the geometryCacheID for Rectangle3DOverlay wasn't being initialized (so was randomish). if they overlapped, some would be drawn looking like others 2015-02-13 15:21:03 -08:00
Ryan Huffman
2df850eb8d Fix natural dimensions check 2015-02-13 15:02:16 -08:00
Ryan Huffman
0495833ca6 Disallow entity models to be reset to natural dimensions if unknown 2015-02-13 15:00:37 -08:00
ZappoMan
bc5a1477e6 added logging of edit commands in the server 2015-02-13 14:59:57 -08:00
Andrew Meadows
589077bce6 try again: move stuff around in ~Application 2015-02-13 14:01:56 -08:00
Brad Hefta-Gaub
5c048db5f5 Merge pull request #4284 from sethalves/fix-butterflies
if butterflies stop moving, they are no longer kinematic, so give them a velocity
2015-02-13 12:45:08 -08:00
Stephen Birarda
28430d928a use direct connection to ensure injector is stopped 2015-02-13 11:52:51 -08:00
Seth Alves
6ff4f8c2c0 give butterflies an initial velocity so that they are on the kinematics list 2015-02-13 11:52:23 -08:00
Stephen Birarda
1ba85518fc fix for playSound called from same thread 2015-02-13 11:36:41 -08:00
Andrew Meadows
37be7251fe merge upstream/master into andrew/inertia
Conflicts:
	interface/src/Application.cpp
2015-02-13 11:10:13 -08:00
Andrew Meadows
5113258d72 Merge pull request #4279 from birarda/android
fix cleanup of AudioClient, avoid gvr-interface crash on OS X
2015-02-13 10:58:50 -08:00
Brad Hefta-Gaub
59b2c38eb1 Merge pull request #4277 from huffman/fix-select-box
Update editEntities to not select new entity when edit tools are off
2015-02-13 10:50:11 -08:00
Brad Hefta-Gaub
1827d9f3cd Merge pull request #4256 from samcake/temp1
Getting rid of glLIghts and replacing by the model::Light
2015-02-13 10:49:53 -08:00
Stephen Birarda
e3475d4d7f Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-02-13 10:19:00 -08:00
Andrew Meadows
d69efa03d8 Merge pull request #4276 from birarda/master
repairs to memory management for AudioInjectors
2015-02-13 10:15:07 -08:00
Stephen Birarda
13fc0b1fcd fix AudioInjector debug line to be more clear 2015-02-13 09:36:16 -08:00
Atlante45
7a107adbc1 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_mute_environnement 2015-02-13 11:00:41 +01:00
Atlante45
4b7d4d7290 Don't use DataStream to write MuteEnv packet 2015-02-13 10:56:04 +01:00
Brad Hefta-Gaub
6c8a78a9a7 Merge pull request #4278 from huffman/fix-edit-grid
Fix edit grid
2015-02-12 17:20:03 -08:00
Brad Hefta-Gaub
3531463978 Merge pull request #4265 from Triplelexx/#20300
#20300
2015-02-12 17:19:01 -08:00
Andrew Meadows
c3b432c4b5 wrap explicit exit() in #ifndef DEBUG 2015-02-12 17:02:21 -08:00
Andrew Meadows
07a12f8b4c remove a couple crash modes on shutdown 2015-02-12 16:55:14 -08:00
ZappoMan
f1a5865201 added more logging to persist and backup, fixed bug in start up case for no models.svo and backup 2015-02-12 15:17:48 -08:00
Stephen Birarda
30b371559d fix a typo in RenderingClient 2015-02-12 15:11:24 -08:00
Stephen Birarda
4e71e128f3 remove QThread not currently used in client 2015-02-12 13:42:36 -08:00
Stephen Birarda
6c25205856 fix audio cleanup and close action in Application 2015-02-12 13:35:22 -08:00
Ryan Huffman
813673b720 Fix grid tool not showing minor grid width 2015-02-12 13:19:09 -08:00
Ryan Huffman
a3d09e6adc Fix edit grid not showing up 2015-02-12 13:18:58 -08:00
Stephen Birarda
ff6f8ea4a1 cleaner cleanup of AudioClient from RenderingClient 2015-02-12 13:14:30 -08:00
Ryan Huffman
51ce8c7100 Update editEntities to not select new entity when edit tools are off 2015-02-12 13:09:37 -08:00
Stephen Birarda
ef9cc2aacc repair ability for desktop to add gvr target 2015-02-12 12:49:29 -08:00
Stephen Birarda
0154ac9734 final script repairs for new AudioInjector API 2015-02-12 11:52:20 -08:00