Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 00:34:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
21329 commits 71 branches 56 tags 1.2 GiB
Commit graph

21329 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
1e64fc84e8 Moved startup Application info settings load out of Application 2015-02-02 17:19:54 -08:00
Atlante45
9abdb41764 Rearrange settings classes in correct files 2015-02-02 17:17:19 -08:00
Atlante45
633ec9807d New settings api 2015-02-02 15:56:03 -08:00
Atlante45
1cfd98b2d7 Name threads 2015-01-31 00:50:12 -08:00
Brad Hefta-Gaub
e73a000bb8 Merge pull request #4208 from birarda/master 
update to @problem's new interface icon
 2015-01-30 16:53:32 -08:00
Brad Hefta-Gaub
918349b227 Merge pull request #4196 from ctrlaltdavid/20277 
CR for Job #20277 - Interface user agent string change
 2015-01-30 16:52:30 -08:00
Andrew Meadows
7a2def167b Merge pull request #4206 from sethalves/rework-bandwidth-meter 
Rework bandwidth meter dialog
 2015-01-30 16:41:07 -08:00
David Rowe
729fbbf5ac A further custom User-Agent string 2015-01-30 15:56:01 -08:00
Stephen Birarda
f78f6ab4cf fix check for debug/release icon 2015-01-30 15:41:44 -08:00
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
Seth Alves
067deefeb6 avoid use of snprintf 2015-01-30 15:23:40 -08:00
Stephen Birarda
ae87dac523 update to new interface icon 2015-01-30 15:22:21 -08:00
Seth Alves
eda7785d3b minor edit to make diff nicer 2015-01-30 14:41:03 -08:00
David Rowe
5474c0634e Merge branch 'master' into 20277 
Conflicts:
	libraries/script-engine/src/ScriptEngine.cpp
 2015-01-30 13:49:45 -08:00
Seth Alves
5c9d64c482 Merge branch 'master' of github.com:highfidelity/hifi into rework-bandwidth-meter 2015-01-30 13:46:43 -08:00
Seth Alves
620efb2bbe change display style of bandwidth detail dialog, include a totals line 2015-01-30 13:43:28 -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
Seth Alves
dd9d054286 Start on refactoring of bandwidth metrics 2015-01-30 11:44:57 -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
Seth Alves
2999a77f87 merge from master 2015-01-30 11:15:01 -08:00
Seth Alves
f0edba9a6b Start on refactoring of bandwidth metrics 2015-01-30 11:11:17 -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