Brad Hefta-Gaub
|
ba79a3d70e
|
Merge pull request #4197 from huffman/fix-mouse-camera-controls
Remove call to gridTool.mousePressEvent
|
2015-01-30 08:57:17 -08:00 |
|
Ryan Huffman
|
5d8825f5eb
|
Remove call to gridTool.mousePressEvent
|
2015-01-30 08:56:37 -08:00 |
|
Brad Hefta-Gaub
|
5e327e7806
|
Merge pull request #4195 from thoys/patch-3
.gitignore multiple build directories
|
2015-01-29 21:33:44 -08:00 |
|
Brad Hefta-Gaub
|
0cc957c1fe
|
Merge pull request #4193 from huffman/revert-grid
Revert back to old grid tool window
|
2015-01-29 21:33:25 -08:00 |
|
Thijs Wenker
|
f26ad6c95c
|
ignore multiple build directories
ignore /build-test/, /build-vs2013/, /build-osx/, /build-ubuntu/ , /build-cygwin/
|
2015-01-30 02:52:24 +01:00 |
|
samcake
|
331104d1c6
|
Merge pull request #4194 from thoys/texture-max-area-2M
changing texture size limit from 1024*1024 to 2M i.e. (1024 * 2048).
|
2015-01-29 17:33:35 -08:00 |
|
Ryan Huffman
|
d06d8b8f01
|
Merge branch 'master' of github.com:highfidelity/hifi into revert-grid
Conflicts:
examples/libraries/gridTool.js
|
2015-01-29 17:27:58 -08:00 |
|
Thijs Wenker
|
ff29b1c8cc
|
style/conversion fixes
|
2015-01-30 02:18:51 +01:00 |
|
Andrew Meadows
|
3699a79e96
|
Merge pull request #4192 from samcake/temp0
Fix the missing textures not loaded in gpu::Texture because their size doesn't match their description
|
2015-01-29 17:13:46 -08:00 |
|
Thijs Wenker
|
a4c82072a2
|
changing texture size limit from 1024*1024 to 2M i.e. (1024 * 2048). It's dynamic and resizes the texture to the best fit within the 2M area.
|
2015-01-30 02:00:35 +01:00 |
|
Ryan Huffman
|
7017fdbac0
|
Update style of grid tools
|
2015-01-29 16:59:58 -08:00 |
|
Ryan Huffman
|
0307448ec3
|
Fix color index for entity grid tool
|
2015-01-29 16:59:37 -08:00 |
|
Ryan Huffman
|
eb69720af4
|
Update when grid tool window is shown
|
2015-01-29 16:58:48 -08:00 |
|
Ryan Huffman
|
c00346e8cb
|
Revert "Remove gridControls.html"
This reverts commit a0cb40597b.
|
2015-01-29 16:45:19 -08:00 |
|
Sam Gateau
|
a2ec6ea2e0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2015-01-29 15:35:15 -08:00 |
|
Sam Gateau
|
ec54ac7401
|
Fixing the non loading of some texture because the QImage bit size is not exactly what's expected
|
2015-01-29 15:24:36 -08:00 |
|
Sam Gateau
|
b2f16be92a
|
Fixing the non loading of some texture because the QImage bit size is not exactly what's expected
|
2015-01-29 15:17:55 -08:00 |
|
Brad Hefta-Gaub
|
8a32bd2eed
|
Merge pull request #4164 from ctrlaltdavid/20183
CR for 20183 Add Oculus support to notifications.js
|
2015-01-29 13:38:49 -08:00 |
|
Brad Hefta-Gaub
|
f5e092c0d2
|
Merge pull request #4187 from huffman/parallel-script-loading
Parallel script loading
|
2015-01-29 13:26:37 -08:00 |
|
Brad Hefta-Gaub
|
07d049ef2b
|
Merge pull request #4188 from PhilipRosedale/master
Add menu to paddleBall for hand choice
|
2015-01-29 10:56:57 -08:00 |
|
Philip Rosedale
|
0c3f4b894c
|
Menu for handedness, that really works.
|
2015-01-29 10:53:50 -08:00 |
|
Brad Hefta-Gaub
|
838cb41646
|
Merge pull request #4163 from PhilipRosedale/master
Popcorn & building blocks scripts, some fixes
|
2015-01-29 09:28:23 -08:00 |
|
Ryan Huffman
|
e6caefa023
|
Add comment to ScriptEngine::include()
|
2015-01-29 09:08:55 -08:00 |
|
Ryan Huffman
|
ce9e8910e4
|
Add callback to QScriptEngine::include(QString)
|
2015-01-29 09:04:57 -08:00 |
|
Andrew Meadows
|
02a21c7196
|
Merge pull request #4186 from huffman/camera-updates
Camera updates
|
2015-01-29 08:48:22 -08:00 |
|
Ryan Huffman
|
3447fea1db
|
Revert "Update grid tool to be an overlay"
This reverts commit 552a421f24.
Conflicts:
examples/libraries/gridTool.js
|
2015-01-28 16:01:04 -08:00 |
|
Ryan Huffman
|
1b81ee17ab
|
Update how orbit-by-key is appleid
|
2015-01-28 12:23:58 -08:00 |
|
Ryan Huffman
|
09af7ed10f
|
Remove extra print statement
|
2015-01-28 12:21:58 -08:00 |
|
Ryan Huffman
|
a775476cfa
|
Remove editEntities move-by-arrow-key completely
|
2015-01-28 12:21:50 -08:00 |
|
Ryan Huffman
|
55f41eb452
|
Update gridTool to not use clone
|
2015-01-28 12:20:08 -08:00 |
|
Ryan Huffman
|
135c8c1bdf
|
Disable move entity by arrows
|
2015-01-28 12:19:54 -08:00 |
|
Ryan Huffman
|
5633be0e92
|
Add ability to move orbit camera using keys
|
2015-01-28 12:19:42 -08:00 |
|
Ryan Huffman
|
e1ca6d5048
|
Disable editentities auto-off when moving avatar
|
2015-01-28 12:16:28 -08:00 |
|
Andrew Meadows
|
7a849e97ec
|
Merge pull request #4184 from samcake/temp0
Fix windows crash on start
|
2015-01-28 10:25:20 -08:00 |
|
Sam Gateau
|
dc01611f26
|
Initiailize the jont indices to -1 in FBXGemoetry to avoid problems until the skeleton data is actually loaded
|
2015-01-28 10:22:37 -08:00 |
|
Philip Rosedale
|
a85c6aa956
|
fix tabs?
|
2015-01-28 09:49:45 -08:00 |
|
Philip Rosedale
|
b515a0468b
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2015-01-28 09:35:07 -08:00 |
|
Philip Rosedale
|
117e6abb46
|
remove debug and PR fixes
|
2015-01-28 09:34:15 -08:00 |
|
Brad Hefta-Gaub
|
347c74ebae
|
Merge pull request #4181 from ctrlaltdavid/20276
CR for Job #20276 - Add Scripting Support for changes in Audio Devices
|
2015-01-27 19:36:17 -08:00 |
|
David Rowe
|
7286a9c5fb
|
Merge branch 'master' into 20276
|
2015-01-27 19:08:40 -08:00 |
|
Brad Hefta-Gaub
|
8994b9f51c
|
Merge pull request #4182 from AndrewMeadows/isentropic
fix bad integration of rapidly spinning objects
|
2015-01-27 18:33:31 -08:00 |
|
Brad Hefta-Gaub
|
aa2011a543
|
Merge pull request #4160 from samcake/temp0
Introducing the gpu::Texture class and using it for model rendering
|
2015-01-27 18:30:06 -08:00 |
|
Brad Hefta-Gaub
|
7f1df726bf
|
Merge pull request #4183 from Atlante45/master
Revert "Use QDickCache for every QNAM"
|
2015-01-27 18:28:35 -08:00 |
|
Atlante45
|
98fc1836d8
|
Revert "Use QDickCache for every QNAM"
This reverts commit 2f39b93823.
|
2015-01-27 18:09:22 -08:00 |
|
Andrew Meadows
|
58bb137c4d
|
bulletRotationStep --> computeBulletRotationStep
|
2015-01-27 17:37:12 -08:00 |
|
Grayson Stebbins
|
0bf20a207c
|
Added gverb instructions
|
2015-01-27 17:35:53 -08:00 |
|
Grayson Stebbins
|
24845b7856
|
Added gverb
|
2015-01-27 17:34:00 -08:00 |
|
Andrew Meadows
|
23bd3f90d9
|
Bullet-style rotation integration for kinematics
and for dead reckoning after wire-transfer
|
2015-01-27 17:27:15 -08:00 |
|
Grayson Stebbins
|
14f9d627f6
|
Note about Qxmpp version and support for Oculus Rift
|
2015-01-27 17:16:31 -08:00 |
|
Grayson Stebbins
|
dc1051b6a9
|
Reminder that everything should be 32-bit
|
2015-01-27 17:10:09 -08:00 |
|