Stephen Birarda
|
e22b33e96d
|
fix QUrl include for ubuntu
|
2015-03-31 17:00:04 -07:00 |
|
Stephen Birarda
|
61806935bb
|
add a networking constants class with metaverse URL
|
2015-03-31 16:40:21 -07:00 |
|
Philip Rosedale
|
c336d235bf
|
Merge pull request #4538 from birarda/damaged-xcode
potential fix for damaged xcode thanks to TBB
|
2015-03-31 16:04:26 -07:00 |
|
Brad Hefta-Gaub
|
b6f670a8d8
|
Merge pull request #4554 from samcake/yellow
Better support for Nvidia Optimus Laptop
|
2015-03-31 15:56:01 -07:00 |
|
Brad Hefta-Gaub
|
867c8078bd
|
Merge pull request #4553 from PhilipRosedale/master
Blocks fall when made, better edge colors
|
2015-03-31 15:53:44 -07:00 |
|
Brad Hefta-Gaub
|
b43761a6c1
|
Merge pull request #4545 from samcake/orange
No more FLat global lighting, always use one of the SPherical harmonics presets
|
2015-03-31 15:52:49 -07:00 |
|
Brad Hefta-Gaub
|
d77333953e
|
Merge pull request #4552 from sethalves/island
Fix various collision-model related bugs
|
2015-03-31 15:47:53 -07:00 |
|
Philip Rosedale
|
63fe49c60e
|
Merge pull request #4534 from birarda/master
don't use DX11 for bullet even if found
|
2015-03-31 15:21:29 -07:00 |
|
Sam Gateau
|
b4d11e2eb5
|
Add the needed global variable exported to enable the nvidia gpu on optimus platform (laptops with intel integrated) also log the opengl version and gpu and driver used
|
2015-03-31 15:18:59 -07:00 |
|
Sam Gateau
|
74f04c0c84
|
remove useless comment
|
2015-03-31 14:57:51 -07:00 |
|
Seth Alves
|
07493432da
|
Merge pull request #4550 from ctrlaltdavid/fix-typo
Fix typo
|
2015-03-31 14:51:28 -07:00 |
|
Sam Gateau
|
07a36158e6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2015-03-31 14:46:56 -07:00 |
|
Seth Alves
|
af6ce8fb07
|
HERE COMES AN S
|
2015-03-31 14:37:41 -07:00 |
|
Seth Alves
|
48144a46b1
|
don't keep empty mesh-parts. take units hint from a common first-line comment, if it's there.
|
2015-03-31 14:34:35 -07:00 |
|
Seth Alves
|
95cc8672c0
|
remove unneeded assert
|
2015-03-31 14:32:43 -07:00 |
|
David Rowe
|
154dacf791
|
Fix typo
|
2015-03-31 14:21:56 -07:00 |
|
Philip Rosedale
|
f4695643e3
|
Blocks fall when made, better edge colors
|
2015-03-31 14:13:19 -07:00 |
|
Seth Alves
|
55d506bb53
|
formatting
|
2015-03-31 14:04:49 -07:00 |
|
Seth Alves
|
ea2c5ff622
|
formatting
|
2015-03-31 14:04:33 -07:00 |
|
Seth Alves
|
9e0118492e
|
make sure to not leave in-use resources in UnusedResource list
|
2015-03-31 14:04:21 -07:00 |
|
Seth Alves
|
347ef3c4e1
|
use scaling from visual model on collision model rather than using the bounds from the collision model
|
2015-03-31 14:03:37 -07:00 |
|
Stephen Birarda
|
3ed097ff86
|
Merge pull request #4548 from AndrewMeadows/inertia
fix typo that broke avatar motion
|
2015-03-31 13:42:20 -07:00 |
|
Stephen Birarda
|
e5637a1f28
|
Merge pull request #4547 from ZappoMan/preloadOnImport
fix issue with preload not being called on import
|
2015-03-31 13:31:13 -07:00 |
|
Andrew Meadows
|
9739d68370
|
fix typo that broke avatar motion
|
2015-03-31 13:20:06 -07:00 |
|
Brad Hefta-Gaub
|
434349d947
|
Merge pull request #4541 from ctrlaltdavid/20428
CR for Job #20428 - Add the ability to minimize/maximize users.js
|
2015-03-31 13:09:46 -07:00 |
|
Brad Hefta-Gaub
|
e27a89b7c3
|
Merge pull request #4539 from birarda/settings-thread-delete-later
fix for cleanup of SettingsManager thread
|
2015-03-31 13:09:06 -07:00 |
|
Brad Hefta-Gaub
|
672d95cac6
|
Merge pull request #4546 from huffman/edit-tab-select
Fix edit.js not selecting all when tabbing between properties
|
2015-03-31 12:50:39 -07:00 |
|
ZappoMan
|
df99c314aa
|
fix issue with preload not being called on import
|
2015-03-31 12:44:44 -07:00 |
|
Stephen Birarda
|
d55ae62459
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-03-31 12:34:47 -07:00 |
|
Philip Rosedale
|
971108494a
|
Merge pull request #4544 from AndrewMeadows/inertia
fix for intermittent crash on Windows during login
|
2015-03-31 11:19:08 -07:00 |
|
Ryan Huffman
|
79305141d1
|
Fix edit.js not selecting all when tabbing between properties
|
2015-03-31 10:51:07 -07:00 |
|
Sam Gateau
|
edf0ca2b06
|
Forbifd the global ambient lighting to go the simple global value and instead fallback to the first Spherical harmonics preset
|
2015-03-31 10:29:03 -07:00 |
|
andrew
|
a2b5fdb540
|
merge
|
2015-03-31 09:28:23 -07:00 |
|
andrew
|
fdfb8bd1b4
|
fix intermittent crash on windows during login
|
2015-03-31 09:26:33 -07:00 |
|
Andrew Meadows
|
f1b1ed014b
|
merge upstream/master into andrew/inertia
|
2015-03-31 08:33:31 -07:00 |
|
Philip Rosedale
|
0c9e6ad3c0
|
Merge pull request #4543 from stojce/20397
CR for Job #20397 - Create a test script that builds and places a bunch of houses for load testing
|
2015-03-31 08:13:54 -07:00 |
|
Philip Rosedale
|
9ab87fdcba
|
Merge pull request #4537 from sethalves/vhacd-knobs
Vhacd improvements, quads in collision hulls, fix dice
|
2015-03-31 07:32:59 -07:00 |
|
Seth Alves
|
c8e623ace7
|
remove some debugging prints, added some comments
|
2015-03-31 07:18:20 -07:00 |
|
Seth Alves
|
52fc75a114
|
merge upstream
|
2015-03-31 07:18:04 -07:00 |
|
Philip Rosedale
|
4961cf37b6
|
Merge pull request #4540 from ZappoMan/scriptCaching
quiet warning flood when scripts are bad
|
2015-03-30 21:48:13 -07:00 |
|
Philip Rosedale
|
5325478940
|
Merge pull request #4528 from ZappoMan/avatarUI
Support for Auto-detecting FST type, and adding type hint to FST files when packaged
|
2015-03-30 21:31:22 -07:00 |
|
David Rowe
|
495b62b356
|
Add minimized state
|
2015-03-30 20:46:39 -07:00 |
|
David Rowe
|
622f10bd25
|
Add minimize button
|
2015-03-30 20:46:38 -07:00 |
|
ZappoMan
|
a88b3c02d2
|
quiet warning flood when scripts are bad
|
2015-03-30 18:24:34 -07:00 |
|
Stephen Birarda
|
7d5b8c430a
|
remove extra added space
|
2015-03-30 18:06:51 -07:00 |
|
Stephen Birarda
|
1cb12bd1da
|
Merge branch 'master' of https://github.com/highfidelity/hifi into settings-thread-delete-later
|
2015-03-30 18:03:35 -07:00 |
|
Stephen Birarda
|
b7174b5170
|
fix for cleanup of SettingsManager thread
|
2015-03-30 18:03:18 -07:00 |
|
Andrew Meadows
|
b8ff253f86
|
unlock after character is properly updated
|
2015-03-30 18:03:18 -07:00 |
|
Andrew Meadows
|
bdfe75b1f5
|
remove character from PhysicsEngine on shutdown
|
2015-03-30 18:03:18 -07:00 |
|
Seth Alves
|
63a59aa00a
|
fix a couple of crashes
|
2015-03-30 18:03:18 -07:00 |
|