Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 09:23:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
24008 commits 76 branches 59 tags 1.2 GiB
Commit graph

24008 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
df5a03b447 Update script editor to set icons programatically 2015-04-02 09:10:47 -07:00
Andrew Meadows
fc4e6e9355 merge upstream/master into andrew/bispinor 2015-04-02 09:04:15 -07:00
Andrew Meadows
f4f219ca36 tweak jump velocity and hover transition 2015-04-02 09:03:33 -07:00
Andrew Meadows
f804b2311d remove hover-friendly behavior 2015-04-02 08:40:47 -07:00
Clément Brisset
01dc1b058c Merge pull request #4580 from birarda/master 
use non-persistent settings to avoid lobby crash confusion
 2015-04-02 17:37:24 +02:00
Seth Alves
17f110172f more command-line flags for v-hacd parameters 2015-04-02 06:57:47 -07:00
Seth Alves
57a4f3abe3 clear _saveNonCollisionGeometry when it's not needed, remove some debug prints 2015-04-02 06:57:27 -07:00
Brad Davis
c198cd9c26 Update to reflect new required package 2015-04-02 00:33:31 -07:00
David Rowe
349cc3241d Restore minimized windows to view 2015-04-01 18:59:34 -07:00
David Rowe
49de54de48 Use improved WebWindowClass for friends window 2015-04-01 18:58:59 -07:00
Seth Alves
9e1a276077 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-01 18:58:31 -07:00
Seth Alves
d3561f031f Merge pull request #4581 from jherico/oculus2 
Fixing build problem on linux
 2015-04-01 18:48:46 -07:00
Bradley Austin Davis
4a7fd318c3 Fixing build problem on linux 2015-04-01 18:45:50 -07:00
Seth Alves
abf83bcf9e Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-01 18:26:26 -07:00
Seth Alves
eb78fa0f85 if switching to the mode where collision hulls are drawn, updateGeometry and simulate 2015-04-01 18:24:25 -07:00
Seth Alves
997f7251c7 dont need _collisionGeometryScale 2015-04-01 18:23:43 -07:00
Seth Alves
78af7f900e don't need _collisionGeometryScale 2015-04-01 18:23:25 -07:00
Stephen Birarda
12cacad8f8 remove a stray message call in cmake file 2015-04-01 18:02:48 -07:00
Seth Alves
06b38615d5 sort meshes into the order they appeared in the model file so that start and end arguments mean something usefil 2015-04-01 17:53:33 -07:00
Seth Alves
bfab522ee7 debuging render mode 2015-04-01 17:52:30 -07:00
Seth Alves
8940ba0c2a new member variables related to rendering collision hulls 2015-04-01 17:52:18 -07:00
Seth Alves
00449ef7c0 new member variable to remember the order in which meshes appeared in the model file 2015-04-01 17:50:35 -07:00
Seth Alves
36cd69c38a new member variable to remember the order in which meshes appeared in the model file 2015-04-01 17:50:20 -07:00
Stephen Birarda
69f0c50a3c fix cleanup order to ensure environment is re-rendered 2015-04-01 17:50:12 -07:00
Seth Alves
420424a5ee make it possible to sort meshes into the same order they appear in the model file 2015-04-01 17:49:49 -07:00
Seth Alves
81200bb2a0 save collision hull scaling in model 2015-04-01 17:49:01 -07:00
Seth Alves
79b1a6aeb0 comma key toggles rendering of collision hulls 2015-04-01 17:45:47 -07:00
Stephen Birarda
862f26a095 put the friendly lobby back in default scripts 2015-04-01 17:41:17 -07:00
Stephen Birarda
40f7e683da don't attach iron man helmet while in lobby 2015-04-01 17:38:32 -07:00
Stephen Birarda
b27a86fb25 always render yourself, handle change of render values elsewhere 2015-04-01 17:36:43 -07:00
Stephen Birarda
03292fd869 allow developerMenuItems to handle new render options 2015-04-01 17:26:56 -07:00
Andrew Meadows
b537625e59 Merge pull request #4574 from ZappoMan/crashOnExit 
fix crash on shutdown related to entity scripts connecting to signals
 2015-04-01 17:26:33 -07:00
Brad Hefta-Gaub
ad27d7353b Merge pull request #4386 from jherico/oculus_old_renderer 
DO NOT MERGE - Update Oculus SDK integration
 2015-04-01 17:17:32 -07:00
Stephen Birarda
560f53b842 use new API to toggle environment from lobby 2015-04-01 17:08:15 -07:00
Stephen Birarda
ee088e12f3 leverage scene scripting values to toggle rendering 2015-04-01 17:06:06 -07:00
Philip Rosedale
55d47bbaa0 Merge pull request #4579 from huffman/edit-spinner-style 
Update styling of property spinners in edit.js
 2015-04-01 16:55:12 -07:00
Stephen Birarda
3f4a9c64f9 add render bools to the scene scripting interface 2015-04-01 16:53:17 -07:00
Brad Hefta-Gaub
e5757575de Merge pull request #4578 from samcake/orange 
tweak the default specular value for the Primitive entities to less shiny
 2015-04-01 16:36:53 -07:00
Bradley Austin Davis
58908f44ef Fixing crash on exit when using (or used) VR mode 2015-04-01 16:05:46 -07:00
Ryan Huffman
775bbdaebb Remove unnecessary css 2015-04-01 16:04:52 -07:00
Ryan Huffman
0f518b6dbd Update styling of property spinners in edit.js 2015-04-01 16:02:21 -07:00
Sam Gateau
4a6046b07c tweak the default specular value for the Primitive entities (sphere and cubes) so they do not shine so much 2015-04-01 15:50:04 -07:00
Bradley Austin Davis
fd47d4f3a5 Working on putting some more timing measurement into the code 2015-04-01 15:47:51 -07:00
Andrew Meadows
b37384d759 exit hover now not quite automatic when over floor 
remove MyAvatar::jump() method for more general API
 2015-04-01 15:13:27 -07:00
David Rowe
96e888864a Merge branch 'master' into 20422 2015-04-01 14:56:48 -07:00
ZappoMan
d87fe9efff fix typo 2015-04-01 14:47:04 -07:00
Stephen Birarda
6d05e87da0 Merge pull request #4577 from birarda/master 
fix for signup link from login dialog
 2015-04-01 14:45:16 -07:00
Stephen Birarda
526c9217a1 fix signup link from login dialog 2015-04-01 14:43:56 -07:00
ZappoMan
c66db5d8e4 another approach 2015-04-01 14:43:27 -07:00
ZappoMan
d7188bac0b another approach 2015-04-01 14:38:01 -07:00