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

19351 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
29d0d10103 track entities added to PhysicsEngine 
also fix for RigidBody's not going dynamic
and a fix for changed entities staying on changed list
 2014-12-02 17:47:48 -08:00
Andrew Meadows
6e88ab15f9 remove debug #include 2014-12-02 17:47:33 -08:00
Andrew Meadows
182cebbe40 Fix order of shape types for ShapeCollider 2014-12-02 17:47:00 -08:00
Andrew Meadows
9f11121df2 oops, forgot to add entities to Bullet simulation 2014-12-02 15:44:07 -08:00
Andrew Meadows
a21ebe4f6a merge andrew/thermonuclear into andrew/inertia 2014-12-02 15:31:30 -08:00
Andrew Meadows
c9ea6885c1 PhysicsEngine is now an EntitySimulation 2014-12-02 15:29:41 -08:00
Andrew Meadows
ff7559c2c2 merge upstream/master into andrew/thermonuclear 2014-12-02 11:41:29 -08:00
Brad Hefta-Gaub
22bee75f7f Merge pull request #3885 from birarda/double-scripts 
fix for ScriptEngine blocked load
 2014-12-02 11:19:28 -08:00
Andrew Meadows
b9944edf66 OctreeServer::createTree() is now protected 2014-12-02 11:13:37 -08:00
Andrew Meadows
0814949e4c moving EntityCollisionSystem back to entities lib 2014-12-02 11:05:17 -08:00
Andrew Meadows
919214b7cb split ShapeInfo into shared and physics parts 2014-12-02 10:44:40 -08:00
Stephen Birarda
0a92374ca6 fix an incorrect connection to script load error 2014-12-02 10:39:20 -08:00
Stephen Birarda
d7f168999d don't block main thread for a script load 2014-12-02 10:30:23 -08:00
Brad Hefta-Gaub
9d213f9fb7 Merge pull request #3884 from huffman/entity-tools-polish 
Entity tools polish
 2014-12-02 10:21:20 -08:00
Brad Hefta-Gaub
f379d63182 Merge pull request #3882 from ctrlaltdavid/vs2013-build-instructions 
Update build instructions for VS2013 Community and Professional
 2014-12-02 10:20:16 -08:00
Brad Hefta-Gaub
3f87287870 Merge pull request #3881 from ctrlaltdavid/find-vs2013-libovr 
Find Oculus libraries when using Visual Studio 2013
 2014-12-02 10:19:53 -08:00
Brad Hefta-Gaub
7f8f57b055 Merge pull request #3879 from birarda/master 
fix for ice-server heartbeat without an access token, hifi:// URL
 2014-12-02 10:19:12 -08:00
Stephen Birarda
36f716cd61 have script loading be separate from ScriptEngine constructor 2014-12-02 10:13:43 -08:00
Andrew Meadows
e6a9081184 Moving ShapeInfo to shared lib 2014-12-01 16:47:55 -08:00
Andrew Meadows
8aba2a06e0 Splitting Bullet stuff out of ShapeInfo 2014-12-01 16:47:33 -08:00
Ryan Huffman
9d9a7ead5b Remove unnecessary overlay property updates 2014-12-01 16:39:36 -08:00
Ryan Huffman
a8eb49a822 Remove now-unused *Offset variables 2014-12-01 16:38:40 -08:00
Ryan Huffman
0b7ddb009d Fix tabification of tool windows 2014-12-01 16:33:51 -08:00
Ryan Huffman
ce4d407378 Update normalizeDegrees to be exclusive on the -180 end 2014-12-01 16:12:18 -08:00
Ryan Huffman
06ab17987b Fix position of rotation degrees display 
The position of the display was not always correct depending on the
camera orientation relative to the selection.
 2014-12-01 16:08:50 -08:00
Andrew Meadows
1df6c32a4e moving Shape* back into shared lib 
removing dependency of entities lib on physics lib
physics lib now depends on entities lib
 2014-12-01 16:03:14 -08:00
Ryan Huffman
4f0683dc5e Fix stretch tools not following mouse correctly 2014-12-01 15:07:03 -08:00
Ryan Downe Karpf
ea62194057 Merge pull request #3883 from samcake/fbx 
Adding a filter on the apartment model to get better lightmaps
 2014-12-01 13:17:29 -08:00
dev
21d3892094 Merge branch 'master' of https://github.com/highfidelity/hifi into fbx 2014-12-01 13:03:18 -08:00
Ryan Huffman
da568c96ce Add rotation degrees overlay 2014-12-01 12:24:51 -08:00
Ryan Huffman
fc5adef501 Update the tool window to use tabbed windows 2014-12-01 12:24:40 -08:00
Ryan Huffman
2c524cd70c Darken colors of selection/highlight boxes 2014-12-01 12:24:34 -08:00
Ryan Huffman
1950ce5a4b Add option for white grid color 2014-12-01 12:24:24 -08:00
Philip Rosedale
b0877414a4 Merge pull request #3880 from ZappoMan/bugFixes 
oculus mirror lean hack
 2014-12-01 12:01:20 -08:00
Sam Gateau
845e687fc5 Adding a Hack for the apaartment model to boost the lightmaps 2014-12-01 11:45:07 -08:00
David Rowe
09eb150edc Update build instructions for VS2013 Community and Professional 2014-12-01 11:40:35 -08:00
David Rowe
7f36a11f35 Find Oculus libraries when using Visual Studio 2013 2014-12-01 10:40:37 -08:00
ZappoMan
6d7f799dbe oculus mirror lean hack 2014-12-01 10:32:35 -08:00
Stephen Birarda
40db44e4bd fix for custom hifi URL lookup 2014-12-01 09:59:51 -08:00
Stephen Birarda
c77bcb916e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-01 09:51:38 -08:00
AndrewMeadows
1b5b4c0b44 Merge pull request #3872 from ZappoMan/cleanupMenus 
remove Entities developer menu items from C++ menu, make them available through script
 2014-12-01 09:29:56 -08:00
Stephen Birarda
8449575fa2 fix for ice-server heartbeat without an access token 2014-12-01 09:25:21 -08:00
Philip Rosedale
72ad8061ba Merge pull request #3878 from birarda/master 
changes required for AC to discover a local DS
 2014-11-30 18:44:32 -08:00
Philip Rosedale
e44ca5a7f7 Merge pull request #3876 from ZappoMan/bugFixes 
fixes the stutter in animation when observer moves
 2014-11-30 18:44:21 -08:00
Stephen Birarda
59432e8d29 complete sharing of local domain-server port to local AC 2014-11-30 17:54:10 -08:00
Stephen Birarda
fed7d789f6 have the domain-server write its local port into shared memory 2014-11-30 17:29:18 -08:00
Brad Hefta-Gaub
b8be76d597 Merge pull request #3877 from samcake/fbx 
Hack for avoiding lightmaps loading in starchamber
 2014-11-30 15:30:39 -08:00
Sam Gateau
321d651d77 Hack for avoiding lightmaps loading in starchamber 2014-11-30 12:54:43 -08:00
Brad Hefta-Gaub
91fe014411 Merge pull request #3875 from PhilipRosedale/master 
Auto-turn body when head yaw is beyond 45 degrees in HMD
 2014-11-30 05:40:55 -08:00
Philip Rosedale
709a40516d Add auto-turn of body when head is beyond 45 degrees 2014-11-29 12:17:38 -08:00