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 |
|
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 |
|
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 |
|
Stojce
|
1debad3969
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 20143
|
2014-10-28 17:22:00 +01:00 |
|
Brad Hefta-Gaub
|
4e7e9641f0
|
Merge pull request #3673 from birarda/lobby
initial groundwork for lobby interface
|
2014-10-28 08:48:33 -07:00 |
|
Stephen Birarda
|
cb7a6cb93c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into lobby
|
2014-10-28 08:40:20 -07:00 |
|
Stojce
|
9be107c9c1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 20143
|
2014-10-28 08:24:23 +01:00 |
|
Brad Hefta-Gaub
|
b506a99200
|
Merge pull request #3671 from ctrlaltdavid/20107
CR for Job #20107 - Keys p and h and some control keys wont override
|
2014-10-27 20:30:15 -07:00 |
|
Brad Hefta-Gaub
|
cfe26ead6e
|
Merge pull request #3669 from lycanthus/20074
Worklist #20074
|
2014-10-27 20:29:23 -07:00 |
|
Andrzej Kapolka
|
fc3f27b70a
|
Merge pull request #3670 from samcake/temp0
Add NSIGHT profiling information to the Build
|
2014-10-27 17:03:19 -07:00 |
|
Andrzej Kapolka
|
2db893c23c
|
Merge pull request #3668 from AndrewMeadows/experimental
Experimental feature: skeleton offset
|
2014-10-27 17:02:01 -07:00 |
|
Stephen Birarda
|
e2536dd3f8
|
remove a debug line
|
2014-10-27 16:55:24 -07:00 |
|
Stephen Birarda
|
80d9014726
|
have spacebar fire an action event at center of screen
|
2014-10-27 16:54:28 -07:00 |
|
Stephen Birarda
|
209c12cb1c
|
repairs for texture replacement by name
|
2014-10-27 16:52:22 -07:00 |
|
ZappoMan
|
1de618ed3e
|
added new light related properties
|
2014-10-27 16:25:26 -07:00 |
|
Stephen Birarda
|
bb652c0784
|
rename signal in AbstractControllerScriptingInterface from cancel to back
|
2014-10-27 16:01:39 -07:00 |
|