Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 15:40:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
18307 commits 25 branches 0 tags 1.1 GiB
Commit graph

18307 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
c39b239f99 fix linux build for missing getpid() 2014-10-29 09:30:51 -07:00
ZappoMan
6b1dc67883 some cleanup 2014-10-29 08:17:30 -07:00
ZappoMan
a73cad91bc first cut at reading and mapping submeshes to named models 2014-10-29 08:09:10 -07:00
Adrianl3d
1d335c1218 Added textInputOverlayExample.js 
Displays a text overlay and captures keystrokes which appear on the
overlay. Demonstrates keystroke events, mouse click events, clickable
text overlay and image overlay buttons
 2014-10-29 23:39:44 +10:00
Brad Hefta-Gaub
b1bf83e0a4 Merge pull request #3685 from samcake/temp1 
Fix yosemite rendering bug
 2014-10-28 22:09:07 -07:00
Sam Gateau
dbdd5293fa Merged with master 2014-10-28 18:31:02 -07:00
Sam Gateau
7aaac69d35 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-10-28 18:22:42 -07:00
Sam Gateau
da70ec4c89 Fix the rendering bug on yosemite: due to the attribute channel number assigned by the compiler which colllides with the fixed pipeline vertex attrib channels, forced the attribute bind location after 3 2014-10-28 18:22:06 -07:00
Philip Rosedale
e5c9ad4525 Merge pull request #3661 from Atlante45/reverb_fixed 
Audio Environment packets
 2014-10-28 18:11:14 -07:00
Brad Hefta-Gaub
7ecc0ccb30 Merge pull request #3683 from birarda/lobby 
fix for location naming break after AddressManager changes
 2014-10-28 17:58:34 -07:00
Brad Hefta-Gaub
be65a798db Merge pull request #3681 from birarda/verbose-log-silencer 
logging tweaks to reduce spam from repeated log messages
 2014-10-28 17:58:17 -07:00
Sam Gateau
639497003d Trying to fix the type unkwon issues and other #include problems on linux vs windows 2014-10-28 16:57:47 -07:00
Stephen Birarda
9af097967d remove ctime since windows build did not fail without it 2014-10-28 15:56:30 -07:00
Stephen Birarda
992396ba63 add ctime for strftime call 2014-10-28 15:48:06 -07:00
Stephen Birarda
01de6305e9 add time header for date in log entry 2014-10-28 15:42:03 -07:00
Stephen Birarda
6ba0845767 fix warnings that were bugging Xcode 2014-10-28 15:39:28 -07:00
Stephen Birarda
33c247918e fix for domainID wrapped in braces 2014-10-28 15:37:42 -07:00
Sam Gateau
b8a8c7f639 FIxed uneeded variable framerate 2014-10-28 15:36:19 -07:00
AndrewMeadows
825482499a Merge pull request #3682 from ZappoMan/moreLightPropertiesAttempt2 
fix memory leak
 2014-10-28 15:33:14 -07:00
Stephen Birarda
2816e8f114 fix location DataWebDialog missing InterfaceLocation object 2014-10-28 15:32:23 -07:00
ZappoMan
47ba32e95e feedback 2014-10-28 15:27:56 -07:00
Brad Hefta-Gaub
86b455e58f Merge pull request #3680 from stojce/20158 
CR for Job #20158 - Change default field of view from 90 to 45
 2014-10-28 15:26:09 -07:00
Brad Hefta-Gaub
c39c716755 Merge pull request #3679 from AndrewMeadows/inertia 
move code out of "shared" and into new "physics" lib
 2014-10-28 15:25:38 -07:00
Brad Hefta-Gaub
caecf473ff Merge pull request #3678 from huffman/entity-tool-fixes 
Entity tool updates and fixes
 2014-10-28 15:24:21 -07:00
ZappoMan
4ec70041cc fix memory leak 2014-10-28 15:20:02 -07:00
AndrewMeadows
4a9015c0e6 Merge pull request #3674 from stojce/20143 
CR for Job #20143 - BUG:  Rearview mirror rendering at wrong size
 2014-10-28 15:02:25 -07:00
AndrewMeadows
ff9c2ec202 Merge pull request #3677 from ZappoMan/moreLightPropertiesAttempt2 
Light Entities
 2014-10-28 14:55:31 -07:00
Stephen Birarda
c4538836c1 always output the first matching repeated log message 2014-10-28 14:51:47 -07:00
Sam Gateau
0dab1c2bc5 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-10-28 14:50:39 -07:00
Stephen Birarda
424793b905 complete output of suppressed repeated messages to log 2014-10-28 14:49:14 -07:00
Sam Gateau
2a5442e099 Introducing the COntext and the Backend object and the specialized GLBackend for the real OpenGL backend to the graphics api 2014-10-28 14:43:15 -07:00
Sam Gateau
88eaeaee7d Introducing the COntext and the Backend object and the specialized GLBackend for the real OpenGL backend to the graphics api 2014-10-28 14:42:22 -07:00
Stephen Birarda
8e3102266a use the LogHandler in Interface 2014-10-28 14:23:34 -07:00
Stojce
01b8fa12e2 Change default field of view from 90 to 45 2014-10-28 22:22:50 +01:00
Stephen Birarda
d3bbd251db move Logging to LogHandler 2014-10-28 13:59:23 -07:00
Andrew Meadows
911c3bcc38 merge upstream/master into andrew/inertia 2014-10-28 13:53:46 -07:00
Andrew Meadows
4c3cdf5b7a move stuff out of shared and into physics library 2014-10-28 13:51:45 -07:00
Stephen Birarda
2711ff2b5f move functionality from VerboseLoggingHelper into the Logging class 2014-10-28 13:48:53 -07:00
Ryan Huffman
c802c74396 Add comment to new redo functionality 2014-10-28 13:48:48 -07:00
Ryan Huffman
bdfdeecc46 Fix bug with entity selection shadow 2014-10-28 13:45:31 -07:00
Ryan Huffman
cce1e23eec Update UndoStackScriptingInterface to not call redo automatically 2014-10-28 13:43:22 -07:00
Ryan Huffman
af103b22ff Remove extra print statements and whitespace 2014-10-28 13:42:40 -07:00
Ryan Huffman
76c3e9f483 Add support for undoing duplication and deletion commands 2014-10-28 13:42:02 -07:00
Ryan Huffman
68f51d2484 Add entity tool support for unkown entity ids 2014-10-28 13:39:41 -07:00
Stojce
1229f0e8fa Merge branch 'master' of https://github.com/highfidelity/hifi into 20143 2014-10-28 21:39:36 +01:00
ZappoMan
06b31baa2a Merge branch 'master' of https://github.com/highfidelity/hifi into moreLightPropertiesAttempt2 2014-10-28 13:32:45 -07:00
Brad Hefta-Gaub
12b6318eb3 Merge pull request #3675 from birarda/lobby 
add groundwork to jump to a location from lobby
 2014-10-28 13:32:32 -07:00
ZappoMan
f26bf5e07b duh 2014-10-28 13:19:47 -07:00
ZappoMan
6c63c2ecd9 cleanup 2014-10-28 12:47:46 -07:00
ZappoMan
8debb33c6a default light properties 2014-10-28 12:44:57 -07:00