Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-17 18:59:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
21502 commits 17 branches 0 tags 1.1 GiB
Commit graph

21502 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
4562c29be8 Merge branch 'master' of https://github.com/highfidelity/hifi into android 
Conflicts:
	interface/src/avatar/Hand.cpp
 2015-01-30 12:02:11 -08:00
Atlante45
22f7cbc00d Minimal temporary setup for avatars in GVR 2015-01-30 11:42:50 -08:00
Atlante45
d9152136ea Remove unused header 2015-01-30 11:41:48 -08:00
Atlante45
19ea9724ab Re-add accidentally removed int size() 2015-01-30 11:41:14 -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
Atlante45
ff5ce25d19 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-29 16:55:51 -08:00
Atlante45
2d973e5288 Move updateMyAvatar to AvatarManager 2015-01-29 16:55:32 -08:00
Ryan Huffman
c00346e8cb Revert "Remove gridControls.html" 
This reverts commit a0cb40597b.
 2015-01-29 16:45:19 -08:00
Atlante45
6b7a391885 move a couple avatar initialisations outside avatar maanger 2015-01-29 16:00:57 -08:00
Atlante45
9095eeeeb9 Return WeakPointer in avatarHashMap 2015-01-29 15:50:59 -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
Atlante45
cb8e4f33bc Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-29 15:22:01 -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
Atlante45
647a935eaa Remove app->getAvatar 2015-01-29 15:16:40 -08:00
Stephen Birarda
98833e732d fix instructions for soxr on windows 2015-01-29 14:47:38 -08:00
Stephen Birarda
de5a0fe157 actually pass launchURLString to RenderingClient 2015-01-29 14:32:49 -08:00
Stephen Birarda
f37fc30e0c hand the launchURL off to RenderingClient 2015-01-29 14:29:41 -08:00
Stephen Birarda
2657af8d4b use proper flags for ANDROID, pass url to C++ 2015-01-29 14:13:10 -08:00
Atlante45
381ccfac37 Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-29 14:10:39 -08:00
Atlante45
c7fa91d11c Privatize AvatarManager constructor 2015-01-29 14:07:42 -08:00
Stephen Birarda
dc866b62e4 repairs to hifi url handling 2015-01-29 13:50:11 -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
Stephen Birarda
dd4f4f0993 repairs for hifi scheme handling on android 2015-01-29 13:03:39 -08:00