Commit graph

18337 commits

Author SHA1 Message Date
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
David Rowe
627dad88cb Remove further ATL dependency in Windows speech recognizer 2014-10-28 12:42:35 -07:00
Ryan Huffman
8f53e1731b Add selectionManager.setSelections and hasSelection 2014-10-28 12:40:44 -07:00
ZappoMan
c3cd733c2f tweaks to edits for lights 2014-10-28 12:40:17 -07:00
ZappoMan
8570088f9d added light exampple 2014-10-28 12:26:45 -07:00
Stephen Birarda
8a4c716452 leverage the VerboseLoggingHelper for packets from unknown nodes 2014-10-28 12:15:52 -07:00
Stephen Birarda
9c30903eb6 add the VerboseLoggingHelper class for repeated messages 2014-10-28 12:05:56 -07:00
Stephen Birarda
477b5096e8 don't start/end action/back events on auto-repeat 2014-10-28 11:34:31 -07:00
Ryan Huffman
e21bf78d04 Remove cancel tool functionality 2014-10-28 11:21:26 -07:00
David Rowe
adf168b7ea Remove ATL build dependency for Windows speech recognizer 2014-10-28 11:14:45 -07:00
David Rowe
a0a6a5019b Recast Windows speech recognizer code to not use ATL
Visual Studio Express generates lots of linker warnings otherwise.
2014-10-28 11:01:44 -07:00
ZappoMan
7d2ef7923b Merge branch 'master' of https://github.com/highfidelity/hifi into moreLightPropertiesAttempt2 2014-10-28 10:50:02 -07:00
ZappoMan
f3242d8778 make PROP_DIFFUSE_COLOR a true property and wire up LightEntityProperties correctly 2014-10-28 10:46:50 -07:00
Stephen Birarda
a561252908 Merge branch 'master' of https://github.com/highfidelity/hifi into lobby 2014-10-28 10:36:29 -07:00
Stephen Birarda
27f7cdb2d4 handle location set/get in AddressManager, handle set to address map 2014-10-28 10:35:56 -07:00
Ryan Huffman
21b6a93fef Add entity tool for movement using arrow keys 2014-10-28 10:12:17 -07:00
Ryan Huffman
48eaa7ce12 Cleanup entity tools 2014-10-28 10:11:18 -07:00
Ryan Huffman
97ede6c75a Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-fixes 2014-10-28 10:00:49 -07:00
Stephen Birarda
b90db2856b add a method to AddressManager to handle address maps from JS 2014-10-28 10:00:39 -07:00
Ryan Huffman
e7d67ee3ba Move rotation handle update to a separate function 2014-10-28 10:00:34 -07:00
ZappoMan
a516d062a6 fix corruption in sitting points, added additional light properties 2014-10-28 09:55:13 -07:00