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

23806 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
2dcabb97b4 getting ready for pr for a few syntax issues 2015-04-03 17:10:51 -07:00
Sam Gateau
b8db0ff2d7 getting ready for pr for a few syntax issues 2015-04-03 17:05:08 -07:00
Sam Gateau
423434af10 FInd one of the issue with shadows for avatars 2015-04-03 12:34:30 -07:00
Sam Gateau
7718680091 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-03 10:33:24 -07:00
Sam Gateau
6f5c411a46 Fixing a few issues and syntax, trying to understand why the shadows are not rendering correctly 2015-04-03 10:32:20 -07:00
Andrew Meadows
88ee1c313a Merge pull request #4583 from huffman/fix-script-editor-icons 
Update script editor to set icons programatically
 2015-04-03 09:31:58 -07:00
Andrew Meadows
223c62c6f9 Merge pull request #4587 from jherico/warnings 
Working on removing some of the warnings in the xcode build
 2015-04-03 09:31:36 -07:00
Clément Brisset
7bd6d5ca5b Merge pull request #4588 from ZappoMan/svoImportFixes 
add logging for delete operations in the server
 2015-04-03 17:51:36 +02:00
Brad Hefta-Gaub
d34133a89b Merge pull request #4591 from Atlante45/entity_random_delete 
Remove unload callback
 2015-04-03 08:33:07 -07:00
Atlante45
0434b1fd28 Remove unload callback 2015-04-03 16:09:23 +02:00
ZappoMan
45ab438339 add logging for delete operations in the server 2015-04-02 16:44:04 -07:00
Bradley Austin Davis
44c9d4a742 Working on removing some of the warnings in the xcode build 2015-04-02 16:12:44 -07:00
Sam Gateau
f96079f4f9 fixed the getViewFUrstum warning in DEBUG mode 2015-04-02 14:43:15 -07:00
Seth Alves
cc7cda39f1 Merge pull request #4586 from ZappoMan/svoImportFixes 
BUG FIX - Import entities sometimes fails
 2015-04-02 14:30:06 -07:00
ZappoMan
84940d8e43 fix SVO import 2015-04-02 14:13:19 -07:00
Brad Davis
605cf19f6f Merge pull request #4565 from ctrlaltdavid/20422 
CR for #20422 - Add the ability to manage friends via Interface
 2015-04-02 14:10:40 -07:00
Clément Brisset
c7540af787 Merge pull request #4585 from birarda/no-gpu-link 
fix for resampled stereo audio array size
 2015-04-02 21:31:53 +02:00
Stephen Birarda
3f079e10aa user AudioConstants for size of int16_t 2015-04-02 11:35:23 -07:00
Stephen Birarda
41290dd3e3 push data pointer for recursive read from front 2015-04-02 11:34:39 -07:00
Stephen Birarda
164c06a190 fix resampled stereo audio array size 2015-04-02 10:41:52 -07:00
Andrew Meadows
a824403132 Merge pull request #4582 from sethalves/island 
Comma toggles rendering of collision hulls; more changes to vhacd stuff
 2015-04-02 10:37:17 -07:00
Brad Davis
91b38785ea Merge pull request #4573 from AndrewMeadows/bispinor 
fix for avatar unable to jump into hover on mac
 2015-04-02 09:45:46 -07:00
Seth Alves
41ec2fdbe3 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-02 09:19:54 -07:00
Seth Alves
a01ade2d8d more command-line options 2015-04-02 09:19:47 -07:00
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