Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-17 03:56:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
16974 commits 74 branches 59 tags 1.2 GiB
Commit graph

16974 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
e338c600c3 add debug to show that domain connection is being attempted 2014-09-04 09:29:29 -07:00
Ryan Huffman
51e616d122 Add margin to chat window for titlebar + menu 2014-09-04 07:20:27 -07:00
Ryan Huffman
bbc1bbdf47 Merge branch 'master' of github.com:highfidelity/hifi into 19968 2014-09-04 06:56:37 -07:00
Atlante45
ef51782f92 New ControlACs UI 2014-09-03 20:32:18 -07:00
Atlante45
417393c22e New Recorder UI 2014-09-03 20:31:57 -07:00
Atlante45
18fdb340c1 extended toolBars.js 2014-09-03 20:30:15 -07:00
Philip Rosedale
b262096e7c Merge branch 'master' of https://github.com/worklist/hifi 2014-09-03 20:09:46 -07:00
Philip Rosedale
cdaf59c962 Merge pull request #3346 from ZappoMan/virtualEntities 
More Entities work
 2014-09-03 20:09:36 -07:00
ZappoMan
68d2be97f7 formatting fixes 2014-09-03 19:46:33 -07:00
ZappoMan
be7a03b97e flock of butterflies as entities 2014-09-03 19:41:53 -07:00
ZappoMan
31716697c0 new example script 2014-09-03 18:35:09 -07:00
ZappoMan
3e1401014d more model naming cleanup and fixing example scripts 2014-09-03 18:32:44 -07:00
ZappoMan
5b8be780a7 add color to sphere property editor 2014-09-03 18:03:00 -07:00
Brad Hefta-Gaub
21c7a7c8a7 Merge pull request #3345 from ZappoMan/virtualEntities 
remove assert in favor of warning
 2014-09-03 17:38:07 -07:00
ZappoMan
e680260c89 remove assert in favor of warning 2014-09-03 17:17:36 -07:00
ZappoMan
d89b29581b remove assert in favor of warning 2014-09-03 17:14:34 -07:00
AndrewMeadows
8223481ecb Merge pull request #3341 from huffman/19967 
Code Review for Job #19967
 2014-09-03 16:51:19 -07:00
AndrewMeadows
9036954d38 Merge pull request #3311 from huffman/fix-wm-close 
Update assignment client to close on WM_CLOSE message on Windows
 2014-09-03 16:43:12 -07:00
stojce
f07f270dee restore default buttons events 2014-09-04 01:22:17 +02:00
Philip Rosedale
6ce7187239 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-03 16:13:43 -07:00
stojce
f12f45adec Layout fixes 2014-09-04 00:55:36 +02:00
Andrew Meadows
e120697a9b merge upstream/master into andrew/ragdoll 2014-09-03 15:49:32 -07:00
AndrewMeadows
bd55da4a83 Merge pull request #3335 from ZappoMan/virtualEntities 
Model Server to Entity Server Refactoring
 2014-09-03 15:48:58 -07:00
Andrew Meadows
a3b26582ba fix for nan in sphereVsAACubeHelper() 2014-09-03 15:39:26 -07:00
ZappoMan
d08e7ef96d fix bug in way too small entities 2014-09-03 15:20:42 -07:00
Andrzej Kapolka
f33a33401f Merge pull request #3338 from Atlante45/rec_file_format_tweaks 
AC playback control scripts
 2014-09-03 15:05:20 -07:00
Andrzej Kapolka
a02656070f Added some comments. 2014-09-03 14:43:11 -07:00
Andrzej Kapolka
686ad4f0ec Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-03 14:43:01 -07:00
Andrew Meadows
4270c4d989 merge upstream/master into andrew/ragdoll 2014-09-03 14:42:17 -07:00
Clément Brisset
72af7617fa Merge pull request #3332 from AndrewMeadows/ragdoll 
add AACubeShape to ShapeCollider
 2014-09-03 14:34:32 -07:00
Stephen Birarda
4554a89754 Merge pull request #3340 from MarcelEdward/hifi-19916 
Hifi 19916
 2014-09-03 14:20:13 -07:00
Andrzej Kapolka
0bd800faf2 Starting on materials attributes, fixed bug with Hermite deltas. 2014-09-03 14:09:04 -07:00
stojce
e5e2960826 Merge branch 'master' of https://github.com/highfidelity/hifi into 19964 2014-09-03 22:29:12 +02:00
Andrew Meadows
2c1aa31d1e give MyAvatar a VoxelShapeManager member 2014-09-03 13:19:41 -07:00
Andrew Meadows
83e04a0e8f add VoxelShapeManager class 2014-09-03 13:19:14 -07:00
Andrew Meadows
361d1e83b0 use PhysicsEntity::stepForward() in simulation loop 2014-09-03 13:18:35 -07:00
Andrew Meadows
6454fd2627 add PhysicsEntity::stepForward() 2014-09-03 13:18:12 -07:00
Andrew Meadows
54463ab668 add findContentInCube() and typedef CubeList 2014-09-03 13:17:47 -07:00
Andrew Meadows
06e1d4a8bc init Shape::_mass in all ctors 2014-09-03 13:16:49 -07:00
ZappoMan
76511762dc fix bug in getContainingElement() found by andrew, allow sciprting interface to return properties of local only entities 2014-09-03 13:14:06 -07:00
Andrew Meadows
0cc6f559d4 add AACube::operator<() so they can be sorted 2014-09-03 13:13:54 -07:00
ZappoMan
756840d541 CR feedback 2014-09-03 12:48:39 -07:00
ZappoMan
29bbeadbc7 fix method names for CR feedback 2014-09-03 12:44:57 -07:00
ZappoMan
ca3cf6d517 removed dead code 2014-09-03 12:42:51 -07:00
ZappoMan
59d0bb29a2 useless semicolon removal 2014-09-03 12:28:35 -07:00
ZappoMan
9a02545d9e useless semicolon removal 2014-09-03 12:26:05 -07:00
ZappoMan
25e8c7d3f1 useless semicolon removal 2014-09-03 12:22:02 -07:00
ZappoMan
f5b9fabdb9 fix CR feedback 2014-09-03 12:12:08 -07:00
ZappoMan
66a2f58192 fix to runaway saving file and optimizations to general encoding paths 2014-09-03 10:55:56 -07:00
Ryan Huffman
d4ebe577df Remove commented out icons 2014-09-03 08:28:25 -07:00