Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 20:29:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
12953 commits 76 branches 59 tags 1.2 GiB
Commit graph

12953 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
37ca6efc7c correctly handle SHADOW_RENDER_MODE in a bunch of places that were drawing shadows when they shouldn't 2014-05-07 11:48:32 -07:00
Andrew Meadows
9fc1c765d3 overhaul of CollisionInfo 
store Cube info for sphereAACube collisions
 2014-05-07 11:40:00 -07:00
Andrew Meadows
6c289b682d move #include <StreamUtils.h> to cpp file 2014-05-07 11:18:50 -07:00
Philip Rosedale
a6fcf915af Merge branch 'master' of https://github.com/worklist/hifi 2014-05-07 10:02:10 -07:00
Philip Rosedale
bc60c8ba92 Merge pull request #2806 from ey6es/master 
Specular map support.
 2014-05-07 08:58:29 -07:00
Philip Rosedale
f6aaaad211 removed some unneeded stuff 2014-05-06 22:44:36 -07:00
Philip Rosedale
fc962749c0 Arrow keys adjust distance from camera in mirror mode, air guitar script 2014-05-06 22:41:08 -07:00
Stojce Slavkovski
490ec23d8c Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-07 07:38:48 +02:00
Andrzej Kapolka
d0537e7ead Specular map support. 2014-05-06 17:32:10 -07:00
Philip Rosedale
00d0a81ace Merge branch 'master' of https://github.com/worklist/hifi 2014-05-06 17:28:08 -07:00
Clément Brisset
72e6ff3649 Merge pull request #2803 from ZappoMan/modelserver 
Model Server Bug Fixes/Bandwidth improvements
 2014-05-06 17:18:25 -07:00
Clément Brisset
d6caa3c32f Merge pull request #2804 from huffman/19640 
Code Review for Job #19640
 2014-05-06 17:14:34 -07:00
Brad Hefta-Gaub
82f71b248e Merge pull request #2805 from Atlante45/fix_hydra_move 
Slow down hydra move
 2014-05-06 17:10:14 -07:00
Atlante45
9c9556914e Slow down hydra move 2014-05-06 17:03:19 -07:00
Brad Hefta-Gaub
439c873a68 Merge pull request #2794 from AndrewMeadows/thermonuclear 
misc maintenance and bug fixes
 2014-05-06 16:51:28 -07:00
Ryan Huffman
f4cb17ba4a Merge remote-tracking branch 'upstream/master' into 19640 2014-05-06 16:18:25 -07:00
Ryan Huffman
911b8cd623 Update welcome screen 2014-05-06 16:17:40 -07:00
ZappoMan
c3f6cc0ccb code cleanup for style guide 2014-05-06 15:50:54 -07:00
ZappoMan
91e4a89573 cleanup old references to node which are really elements 2014-05-06 15:47:18 -07:00
Andrzej Kapolka
c38ab1acde Merge pull request #2802 from ey6es/master 
Fix for exports from Sketchup.
 2014-05-06 15:32:29 -07:00
ZappoMan
cde583452a make model server not oversend data 2014-05-06 15:31:45 -07:00
Andrzej Kapolka
353b9879b8 Fix for exports from Sketchup. 2014-05-06 15:15:42 -07:00
Andrew Meadows
80ed8e7cf0 disable environment gravity when not set in menu 2014-05-06 14:56:16 -07:00
Philip Rosedale
a03716a152 Merge branch 'master' of https://github.com/worklist/hifi 2014-05-06 14:51:14 -07:00
Clément Brisset
60d17e988d Merge pull request #2797 from ey6es/master 
Disabled depth determination based on scale for Faceplus, improved attachment edit UI, fix for attachments' not appearing in rear view mirror head mode.
 2014-05-06 14:24:03 -07:00
ZappoMan
cb302563df Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-06 14:12:17 -07:00
Stojce Slavkovski
ca81e95dee Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-06 22:41:27 +02:00
Brad Hefta-Gaub
0094e8fe4f Merge pull request #2798 from Atlante45/master 
EditModels.js
 2014-05-06 13:39:38 -07:00
Ryan Huffman
f3305a51e2 Remove XMLHttpRequestClass::escapeJavascriptString 2014-05-06 13:09:49 -07:00
Atlante45
abebb078b0 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-06 13:08:00 -07:00
Atlante45
61c2dd0468 Fixed orientation and offset issues 2014-05-06 13:07:31 -07:00
Stojce Slavkovski
8ee282e7d2 Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-06 22:01:48 +02:00
Andrzej Kapolka
432df1b65f Only add each texture once. 2014-05-06 12:41:31 -07:00
Andrzej Kapolka
983a3af4b9 Attachment translations in world space. 2014-05-06 11:50:37 -07:00
Andrzej Kapolka
082ff760d6 Un-default the "OK" button so that we can press enter on the URL field. 2014-05-06 11:47:35 -07:00
Ryan Huffman
5a7b133d25 Fix dates in XMLHttpRequest js files 2014-05-06 11:38:12 -07:00
Ryan Huffman
e191b8acb8 Merge remote-tracking branch 'upstream/master' into 19614 2014-05-06 11:32:38 -07:00
Ryan Huffman
39e6e61a6d Add XMLHttpRequest tests and examples 2014-05-06 11:31:33 -07:00
Ryan Huffman
2dda87fe7f Add XMLHttpRequest constructor to ScriptEngine 2014-05-06 11:28:35 -07:00
Ryan Huffman
7d7e012965 Add XMLHttpRequest 2014-05-06 11:28:09 -07:00
Andrzej Kapolka
9421af9f10 Fix for attachments' not appearing in rear view mirror head mode. 2014-05-06 11:14:48 -07:00
Andrew Meadows
68b0e91630 gravity disabled by default 2014-05-06 11:09:13 -07:00
Andrew Meadows
8a630a148e fix copy-n-paste typo 2014-05-06 11:03:51 -07:00
Andrzej Kapolka
72ebeffa5c Scratch that; I just didn't understand how magic invisible disappearing scroll 
bars worked on OS X.
 2014-05-06 10:59:28 -07:00
Andrzej Kapolka
c5fbf1b55f Force the scroll bar. 2014-05-06 10:57:11 -07:00
Andrew Meadows
2d0e4fb94f use START_LOCATION as default settings 2014-05-06 10:55:30 -07:00
Andrzej Kapolka
e0ecd611c9 Better attachment styling. 2014-05-06 10:53:54 -07:00
Andrzej Kapolka
a06697f2a1 Update attachment data on attachment delete. 2014-05-06 10:37:27 -07:00
Andrzej Kapolka
7eef1b56a2 Don't use the scale to determine the depth in Faceplus. Apparently it's not 
reliable.
 2014-05-06 10:19:29 -07:00
Andrew Meadows
d1a262bb56 maintenance: replace implicit casts with explicit 2014-05-06 10:02:41 -07:00