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

18867 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stojce Slavkovski
cc487d76ca Merge branch 'master' of https://github.com/highfidelity/hifi into 20170 
Conflicts:
	examples/libraries/entityPropertyDialogBox.js
 2014-11-15 09:50:09 +01:00
Philip Rosedale
8b4b2c51cf Merge pull request #3802 from Atlante45/chessgame 
Chessgame
 2014-11-14 17:55:19 -08:00
Atlante45
4d7c5f2d4f Protect board from pieces 2014-11-14 17:35:20 -08:00
Atlante45
b1d29cf888 user data cleanup 2014-11-14 17:28:05 -08:00
Clément Brisset
c80dff064f Merge pull request #3798 from ZappoMan/persistThreadImprovements 
Persist thread improvements/Backup support
 2014-11-14 17:25:17 -08:00
Atlante45
87d472a5a9 2 space indent -> 4 space indent 2014-11-14 16:37:30 -08:00
Atlante45
94f3f461ce Cleanup script for chess boards 2014-11-14 15:21:34 -08:00
Atlante45
58796df843 scriptEntity url 2014-11-14 15:17:09 -08:00
Atlante45
a6f57cb7e2 Index error 2014-11-14 15:13:54 -08:00
Atlante45
b948ff2dc8 Move dead pieces 2014-11-14 15:13:13 -08:00
Atlante45
0227bc742b Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-14 13:30:04 -08:00
Brad Hefta-Gaub
8485a07352 Merge pull request #3799 from samcake/temp0 
improvement on stereo rendering (but not Occulus....)
 2014-11-14 13:06:43 -08:00
Andrzej Kapolka
226a5af37f Merge pull request #3801 from ey6es/master 
Default avatar fixes.
 2014-11-14 13:02:51 -08:00
Andrzej Kapolka
779f5f7614 Default avatar fixes. 2014-11-14 13:02:02 -08:00
Andrzej Kapolka
553a9f489e Merge pull request #3800 from ey6es/master 
Eliminate wacky scales in favor of newfangled "meters."
 2014-11-14 12:48:25 -08:00
Sam Gateau
4f878682a9 fix syntax 2014-11-14 12:38:50 -08:00
Sam Gateau
0973d197cf Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-14 12:25:00 -08:00
Sam Gateau
43a6a0420b remove useless comments 2014-11-14 12:24:38 -08:00
Andrzej Kapolka
14eb87aefd Eliminate wacky scales in favor of newfangled "meters." 2014-11-14 12:23:47 -08:00
Atlante45
4c40f5e7de Changed entity scripts debug 2014-11-14 12:20:20 -08:00
Atlante45
cc35b83d31 update pieces id 2014-11-14 12:19:26 -08:00
Sam Gateau
d9ae3eb5b6 clean version of the simple stereo ack, not available for Occulus yet 2014-11-14 12:07:59 -08:00
Atlante45
a1bd5623e1 refactor + solved network issues 2014-11-14 12:04:49 -08:00
ZappoMan
de12b2543d winblows 2014-11-14 11:50:45 -08:00
Brad Hefta-Gaub
1d14f94cb0 Merge pull request #3797 from huffman/entity-tool-properties 
Entity Tools - Properties window, Tool window, Various fixes
 2014-11-14 11:48:57 -08:00
ZappoMan
c33272bcd8 Merge branch 'master' of https://github.com/highfidelity/hifi into persistThreadImprovements 2014-11-14 11:34:37 -08:00
Brad Hefta-Gaub
fb83d08efd Merge pull request #3796 from birarda/master 
put back timestamps in log
 2014-11-14 11:33:19 -08:00
ZappoMan
899a3985a5 OctreePersistThread defaults to no backup, server always uses settings 2014-11-14 11:32:18 -08:00
ZappoMan
6ee4e611ac add persist settings to domain settings, make default backup interval 30 minutes 2014-11-14 11:31:06 -08:00
Sam Gateau
cc78000641 introduce the concept of side thorugh out the rendering traversal 2014-11-14 11:22:11 -08:00
ZappoMan
cd4b267732 implement persist backup 2014-11-14 11:11:32 -08:00
Ryan Huffman
28eebd3fa5 Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tool-properties 2014-11-14 10:53:18 -08:00
Ryan Huffman
604b1b620b Move dock window to ToolWindow 2014-11-14 10:52:08 -08:00
Brad Hefta-Gaub
1b6bed89fe Merge pull request #3795 from ctrlaltdavid/geometry-cache-crash-workaround 
Disable model overlay properties example
 2014-11-14 10:42:54 -08:00
Stephen Birarda
903cd05ff8 put newlines back in interface log 2014-11-14 10:39:45 -08:00
Stephen Birarda
86284036f1 put back timestamp in log 2014-11-14 10:35:13 -08:00
David Rowe
20fdd6d811 Disable model overlay properties example 
It causes intermittent crashes in
NetworkGeometry::setTextureWithNameToURL()
 2014-11-14 10:31:30 -08:00
Sam Gateau
f09b58c255 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-14 10:05:01 -08:00
Clément Brisset
7177104d87 Merge pull request #3793 from AndrewMeadows/bispinor 
fix warning about function terminating with no return call
 2014-11-14 09:58:27 -08:00
Sam Gateau
642f436fba first draft of factorizing the rendering traversal for both sides in stereo 2014-11-14 09:56:36 -08:00
ZappoMan
11058355a0 implement aboutToFinish for persist thread to allow final save before shutdown 2014-11-14 09:55:32 -08:00
Andrew Meadows
5ba213f8d1 fix for function override with no return 2014-11-14 09:33:11 -08:00
AndrewMeadows
edc599bc2d Merge pull request #3792 from ZappoMan/bugFixes 
fix a couple bugs
 2014-11-14 08:33:49 -08:00
Atlante45
4afcf9b240 Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-14 08:29:22 -08:00
ZappoMan
7b69642c67 fix bug in animation jitter on turn 2014-11-13 23:03:12 -08:00
ZappoMan
744f9bc508 better handle corrupt packets that would cause unreasonably deep recursion 2014-11-13 22:26:18 -08:00
ZappoMan
5da0d1e55a fix regexs for dangerously deep recurssion suppression 2014-11-13 20:53:31 -08:00
Brad Hefta-Gaub
db2b5fc28d Merge pull request #3791 from ctrlaltdavid/20128 
CR for Job #20128 - Make leapHands.js compensate for avatars without wrist joints
 2014-11-13 20:44:43 -08:00
Brad Hefta-Gaub
3441167838 Merge pull request #3790 from Atlante45/entities_userdata 
Entities userdata
 2014-11-13 20:43:57 -08:00
Brad Hefta-Gaub
27c37f3a4e Merge pull request #3784 from ctrlaltdavid/20157 
CR for Job #20157 - Enable "Get Overlay properties" from javascript
 2014-11-13 20:43:38 -08:00