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

34463 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
89d120ab3d Few fixes to make the recorder.js run 2015-11-12 22:24:11 -08:00
samcake
1fd37b51a2 trying to get somewhere.... 2015-11-12 17:54:35 -08:00
samcake
da8270d50b Merge pull request #6377 from jherico/rec3 
Cleaning up clip and transform
 2015-11-12 11:50:10 -08:00
Brad Davis
ee1545f649 Cleaning up clip and transform 2015-11-12 11:48:47 -08:00
samcake
319f9fc30e Merge pull request #6376 from ZappoMan/fixModelCrash 
fix crash in Model::deleteGeometry when _rig is not initialized
 2015-11-12 09:37:30 -08:00
James B. Pollack
39f44115be Merge pull request #6373 from Atlante45/rotationBetween 
Rotation between
 2015-11-12 09:25:56 -08:00
Brad Hefta-Gaub
eefe26d96a fix crash in Model::deleteGeometry when _rig is not initialized 2015-11-12 09:24:49 -08:00
samcake
b9a0d0b843 Merge pull request #6363 from jherico/rec3 
Recording avatar data refactor
 2015-11-12 00:58:46 -08:00
Brad Davis
f521be10fe Avatar recording work in progress 2015-11-12 00:33:38 -08:00
Seth Alves
315b5e9da2 Merge pull request #6372 from ZappoMan/rightClickMenu 
Tweaks to "click"
 2015-11-11 17:27:50 -08:00
Atlante45
118d05d824 Use a clearer function 2015-11-11 17:24:50 -08:00
Clément Brisset
5e972ecaa1 Merge pull request #6374 from ZappoMan/entityEditRoundtripImprovement 
reduce client to server to client entity edit latency
 2015-11-11 17:19:06 -08:00
Brad Hefta-Gaub
80e15fb77d reduce client to server to client entity edit latency 2015-11-11 17:03:21 -08:00
James B. Pollack
1819e20f74 Merge pull request #6367 from ericrius1/marketplace 
Dynamic loading of models from specified directory
 2015-11-11 16:54:06 -08:00
Brad Hefta-Gaub
a721b13e46 Merge pull request #6364 from imgntn/cleanuptoybox 
Remove Bball and Targets AC Resetter Script from Toybox
 2015-11-11 16:23:33 -08:00
Brad Hefta-Gaub
c4ad1d978b Merge pull request #6344 from imgntn/easystar 
Adapt EasyStar A* Pathfinding Library and Add Example
 2015-11-11 16:22:47 -08:00
Atlante45
e4897a8de7 Use new constants 2015-11-11 15:58:27 -08:00
ericrius1
806d303dcd Added header file 2015-11-11 15:55:32 -08:00
Atlante45
115b63a117 Simplify rotationBetween 2015-11-11 15:54:48 -08:00
Brad Hefta-Gaub
2363ca044e Merge pull request #6280 from imgntn/colorbuster 
Color Busters Game
 2015-11-11 15:52:18 -08:00
ericrius1
56dc9092e0 added s3 server 2015-11-11 15:52:12 -08:00
samcake
e7a6c58a9a Merge pull request #6347 from EdgarPironti/record_branch 
Set clip for ControlledAC
 2015-11-11 15:33:25 -08:00
Brad Hefta-Gaub
d36cc1556a switch back context menu to secondary thumb 2015-11-11 15:32:07 -08:00
Brad Hefta-Gaub
4fddc86851 tweaks to click 2015-11-11 15:26:16 -08:00
ericrius1
4fc44b0929 Updated header summary to be more specific with how the loading works 2015-11-11 15:19:36 -08:00
Brad Hefta-Gaub
eb598bd3d3 Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu 2015-11-11 15:15:34 -08:00
EdgarPironti
da2b49a1b0 Remove hardcoded url 2015-11-11 15:07:33 -08:00
EdgarPironti
55d386aaab Fixes: Prompt and userData 2015-11-11 15:07:33 -08:00
EdgarPironti
0f057d7229 Set clip for ControlledAC 2015-11-11 15:07:32 -08:00
Clément Brisset
0402933c51 Merge pull request #6366 from ZappoMan/moreEraseHistory 
Left overs bug fix
 2015-11-11 14:33:12 -08:00
Brad Hefta-Gaub
2f903a9513 CR feedback and some cleanup 2015-11-11 14:21:14 -08:00
samcake
e15d2e022c Merge pull request #6369 from AlessandroSigna/controllers 
handControlledHead.js added
 2015-11-11 14:20:05 -08:00
Brad Hefta-Gaub
bdfe304f7a remove some logging 2015-11-11 14:08:15 -08:00
Brad Hefta-Gaub
040bae6014 more debugging 2015-11-11 12:31:50 -08:00
Brad Hefta-Gaub
5576cf188e Merge branch 'master' of https://github.com/highfidelity/hifi into moreEraseHistory 2015-11-11 12:14:03 -08:00
Brad Hefta-Gaub
866116d285 more debugging 2015-11-11 12:13:47 -08:00
AlessandroSigna
e4b1b54e00 added header 2015-11-11 12:07:54 -08:00
AlessandroSigna
f40e46957b handControlledHead.js added 2015-11-11 12:06:51 -08:00
Chris Collins
726d111827 Merge pull request #6371 from hyperlogic/tony/remove-cache-extract 
Remove cache-extract
 2015-11-11 11:25:03 -08:00
Anthony J. Thibault
a763858080 Revert cache-extract 
This reverts these commits:

* 82b26b7 Code convention fixes
* 9a484ff Fixes for windows
* 086b064 Dumps all urls extracted to stdout.
* c002888 Added cache extractor to the tools directory
 2015-11-11 11:22:05 -08:00
Anthony Thibault
820517f340 Merge pull request #6339 from hyperlogic/tony/cache-extract 
Added cache-extract to Tools
 2015-11-11 09:52:53 -08:00
ericrius1
3f5cd0237d Added header to dynamicLoader and removed files that are not ready for merging 2015-11-10 17:29:20 -08:00
Eric Levin
c2fe937a5c Removed logging line 2015-11-10 17:07:55 -08:00
ericrius1
0aefb8747f Dynamic loading of models from specified directory 2015-11-10 16:55:17 -08:00
ericrius1
e4b271d6d8 dynamic loading content from s3 2015-11-10 16:49:46 -08:00
Brad Hefta-Gaub
fc3602d780 change context menu to RightPrimaryThumb, add filter to mouse click to not count slow clicks 2015-11-10 16:46:58 -08:00
Brad Hefta-Gaub
3316b63bf6 add a fixme comment 2015-11-10 15:46:53 -08:00
Brad Hefta-Gaub
006a1d60c8 keep some additional erase entities history and send to viewers 2015-11-10 15:31:51 -08:00
Eric Levin
a2abc11df1 Merge pull request #6351 from huffman/script-path-resolution 
Update script engine path resolution behavior to behave consistently
 2015-11-10 14:10:42 -08:00
James B. Pollack
e7a2e82745 remove bball and targets resetter AC since we are doing this with hidden reset entities now 2015-11-10 13:58:07 -08:00