Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-07 22:40:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
15485 commits 25 branches 28 tags 1.2 GiB
Commit graph

91 commits

Author SHA1 Message Date
Stephen Birarda
31488e72fe repairs for interface build to succeed 2014-08-08 13:17:53 -07:00
Stephen Birarda
892e30c5e1 get past assignment-client build after cmake auditing 2014-08-08 13:17:53 -07:00
Stephen Birarda
2bb37f2d64 more Qt module dependencies sorted out for libraries 2014-08-08 13:17:53 -07:00
Stephen Birarda
b5c8a4d2c6 fix requirement of networking in audio library 2014-08-08 13:17:52 -07:00
Atlante45
b360b6c55d PR cleanup + JS API 2014-08-05 17:07:03 -07:00
Atlante45
15cbfa0715 Merge branch 'master' of https://github.com/highfidelity/hifi into referentials 2014-08-04 12:45:57 -07:00
Brad Hefta-Gaub
211bed946f Merge pull request #3232 from huffman/19783 
Code Review for Job #19783
 2014-08-01 16:34:50 -07:00
Ryan Huffman
d01d605b40 Add ModelItemProperties::copyFromNewModelItem 2014-08-01 13:52:00 -07:00
Ryan Huffman
b98ee351a5 Remove unused ModelTree::getModelAt 2014-08-01 13:04:03 -07:00
Ryan Huffman
355cf07443 Fix style issue 2014-08-01 13:03:10 -07:00
Atlante45
ee4b7664b0 Merge branch 'master' of https://github.com/highfidelity/hifi into referentials 2014-07-31 13:39:23 -07:00
Ryan Huffman
49e35bbc84 Fix bug with ModelItemProperties 
When copying from a ModelItem the properties should be considered
changed
 2014-07-31 01:14:18 -07:00
Ryan Huffman
d54e3741ed Add ModelTree::findModelsInCube 2014-07-31 01:09:38 -07:00
Ryan Huffman
7bd1628465 Add SendModelsOperation 2014-07-30 18:36:43 -07:00
Atlante45
bc77630c5b Extanded FBXService + moved ModelReferential 2014-07-30 16:49:04 -07:00
Stephen Birarda
2796f71419 library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
Atlante45
069f1ed247 Added ModelReferential 2014-07-30 14:19:32 -07:00
Ryan Huffman
d777e4be53 Merge branch 'master' of git://github.com/highfidelity/hifi into 19783 
Conflicts:
	interface/src/scripting/WindowScriptingInterface.cpp
	interface/src/scripting/WindowScriptingInterface.h
 2014-07-25 15:53:36 -07:00
Atlante45
0d039b1cdb Fixed invokeMethod bug + removed debug 2014-07-23 14:38:37 -07:00
Clément Brisset
a5222c7bbd Merge pull request #3161 from ZappoMan/fixeParticleServerCrash 
fix crash in particle and model server from attempting to edit items that dont exist in the server
 2014-07-11 11:51:53 -07:00
ZappoMan
4c3a1d192e fix crash in particle and model server from attempting to edit items that dont exist in the server 2014-07-11 11:29:32 -07:00
Atlante45
e067a013a0 Made sitting point more consistant 2014-07-11 11:22:38 -07:00
Ryan Huffman
ade1903595 Add ModelTree::getModelAt 2014-07-09 04:14:47 -07:00
Atlante45
baf4a82269 Fix crash occuring when geometry not yet available 2014-06-27 09:56:03 -07:00
Atlante45
e41d3f407b Removed nested lock 2014-06-26 16:40:59 -07:00
Atlante45
a8c3501bdd Keep sitting points updated 2014-06-25 11:49:36 -07:00
Atlante45
1d7d970ff6 Added sitting points to modelItem 2014-06-25 11:48:48 -07:00
ZappoMan
fd3916e662 another hack attempt to fix unit tests on windows 2014-06-24 20:10:06 -07:00
ZappoMan
1eb5b3dda1 argggg ssize_t from stdlib.h 2014-06-24 19:58:59 -07:00
ZappoMan
d967c100c4 argggg ssize_t from types.h 2014-06-24 19:57:52 -07:00
ZappoMan
5486cd4019 argggg ssize_t 2014-06-24 19:29:26 -07:00
ZappoMan
71afc3f4d4 argggg ssize_t 2014-06-24 19:26:24 -07:00
ZappoMan
e5349024e6 argggg ssize_t 2014-06-24 19:15:48 -07:00
ZappoMan
7d759fc00c argggg 2014-06-24 19:11:32 -07:00
ZappoMan
3ad07f4b91 argggg 2014-06-24 19:08:16 -07:00
ZappoMan
40a842d251 windows build issue 2014-06-24 18:15:00 -07:00
ZappoMan
0ae7411bf0 fix some bugs in models 2014-06-10 13:37:53 -07:00
Atlante45
dece3ea095 Merge branch 'master' of https://github.com/highfidelity/hifi into temp_branch 2014-06-06 10:26:49 -07:00
Atlante45
4209c1102f Revert "Models.addModel now returns a more accurate modelID" 
This reverts commit 150477eea4.
 2014-06-06 10:26:08 -07:00
Atlante45
150477eea4 Models.addModel now returns a more accurate modelID 2014-06-05 15:47:25 -07:00
Atlante45
0bdd20abc9 Coding Standard 2014-06-05 15:46:07 -07:00
ZappoMan
152d99d810 removed some old debug code and updated a comment 2014-06-04 15:23:17 -07:00
ZappoMan
8d4a8f7e67 first cut at partial model elements 2014-06-04 10:22:49 -07:00
ZappoMan
b212f9edca fix ray picking at distances 2014-05-30 15:07:54 -07:00
ZappoMan
8a4955d75b temporarily disable the model aligned box picking 2014-05-30 11:13:37 -07:00
wangyix
c87c474877 removed debug info, cleaned code for pull req 2014-05-29 10:39:40 -07:00
wangyix
a0f9d2c106 Merge remote-tracking branch 'upstream/master' 2014-05-29 09:20:30 -07:00
wangyix
5d4b0df108 added flag,seq,st to EnvironmentData, untested 
removed/commented out debug prints
 2014-05-28 17:41:38 -07:00
wangyix
c799077379 added flag,seq,ts to ParticleErase and ModelErase 
... this fixes unreasonable flight-time issue
 2014-05-28 17:20:10 -07:00
ZappoMan
574bca38e6 clean up comments and variable names 2014-05-28 12:10:51 -07:00