Stephen Birarda
|
2c74502394
|
move Interface icon back in icon sub-folder
|
2015-01-30 15:26:29 -08:00 |
|
Stephen Birarda
|
c4a2da15d1
|
change interface icon to lowercase
|
2015-01-30 15:26:07 -08:00 |
|
Stephen Birarda
|
ae87dac523
|
update to new interface icon
|
2015-01-30 15:22:21 -08:00 |
|
Brad Hefta-Gaub
|
53534cea61
|
Merge pull request #4203 from huffman/remove-auto-on-edit-entities
Fix editEntities.js automatically turning on
|
2015-01-30 13:15:57 -08:00 |
|
Ryan Huffman
|
a98829ed8a
|
Fix editEntities.js automatically turning on
|
2015-01-30 13:12:00 -08:00 |
|
samcake
|
efbf043f7d
|
Merge pull request #4202 from Atlante45/master
Edge case when removing all scripts
|
2015-01-30 13:01:53 -08:00 |
|
Atlante45
|
fae59ab939
|
Edge case when removing all scripts
|
2015-01-30 12:20:00 -08:00 |
|
samcake
|
1c89e27718
|
Merge pull request #4201 from Atlante45/master
Fix not saving stopped scripts
|
2015-01-30 11:39:40 -08:00 |
|
Atlante45
|
18c77e1cca
|
Fix not saving stopped scripts
|
2015-01-30 11:27:45 -08:00 |
|
samcake
|
e3fa2e1995
|
Merge pull request #4191 from ZappoMan/moreImmediateModeRemoval
Removal of glColorXXX()
|
2015-01-30 10:21:18 -08:00 |
|
Brad Hefta-Gaub
|
83201084c5
|
Merge pull request #4199 from huffman/fix-edit-includes
Fix editEntities.js includes
|
2015-01-30 10:16:44 -08:00 |
|
Ryan Huffman
|
0d1488e44f
|
Fix editEntities.js includes
|
2015-01-30 10:03:37 -08:00 |
|
Brad Hefta-Gaub
|
72c088fdc6
|
Merge pull request #4198 from huffman/edit-always-on
editEntities.js always on
|
2015-01-30 10:00:47 -08:00 |
|
Ryan Huffman
|
77c78689d1
|
Merge branch 'master' of github.com:highfidelity/hifi into edit-always-on
|
2015-01-30 09:28:09 -08:00 |
|
Ryan Huffman
|
018a4af9d6
|
Update camera tool to wrap cursor to window bounds rather than keep at center
|
2015-01-30 09:22:39 -08:00 |
|
Ryan Huffman
|
cddce8f795
|
Update editEntities to always be on + use right click for select
|
2015-01-30 09:21:27 -08:00 |
|
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 |
|
ZappoMan
|
66567fd89d
|
CR feedback
|
2015-01-29 17:24:56 -08:00 |
|
ZappoMan
|
c1bb03e9a8
|
CR feedback
|
2015-01-29 17:23:48 -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 |
|
ZappoMan
|
8c0db268e6
|
fix build buster
|
2015-01-29 13:41:39 -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 |
|
ZappoMan
|
534575fd10
|
fix a couple bugs in 3d textured version of renderQuad
|
2015-01-29 13:16:14 -08:00 |
|
ZappoMan
|
418b97a648
|
attempt to get color working for 3d textured quads
|
2015-01-29 12:04:34 -08:00 |
|
ZappoMan
|
87e91a5a94
|
Revert "attempt to get color working for 3d textured quads"
This reverts commit 0f390a98b8.
|
2015-01-29 11:44:36 -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 |
|
ZappoMan
|
0f390a98b8
|
attempt to get color working for 3d textured quads
|
2015-01-29 10:50:13 -08:00 |
|
ZappoMan
|
4abb2481d6
|
removed old comment
|
2015-01-29 10:10:53 -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 |
|
ZappoMan
|
5d2df7b03f
|
implement color for dashed lines
|
2015-01-28 18:51:23 -08:00 |
|