Commit graph

5669 commits

Author SHA1 Message Date
ZappoMan
6c63c2ecd9 cleanup 2014-10-28 12:47:46 -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
ZappoMan
a516d062a6 fix corruption in sitting points, added additional light properties 2014-10-28 09:55:13 -07: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
Andrzej Kapolka
2db893c23c Merge pull request #3668 from AndrewMeadows/experimental
Experimental feature: skeleton offset
2014-10-27 17:02:01 -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
Stephen Birarda
8a9f2d172a rename HFCancelEvent to HFBackEvent, fire from joystick 2014-10-27 15:51:59 -07:00
ZappoMan
bb1eacce7d more tweaks for new light properties 2014-10-27 15:37:52 -07:00
Stephen Birarda
7b5115c35f add a new meta event, HFCancelEvent 2014-10-27 15:37:31 -07:00
ZappoMan
ac9c5e7386 some initial adds to properties 2014-10-27 15:32:36 -07:00
ZappoMan
c17ffe9433 add the new properties to LightEntityItem class 2014-10-27 15:31:21 -07:00
Stephen Birarda
8556b8b95d fix HFMetaEvent headers for new placement 2014-10-27 15:28:02 -07:00
Stephen Birarda
a12e0dd0dc fix HFActionEvent headers for new placement 2014-10-27 15:27:27 -07:00
Stephen Birarda
c3fe7c7497 send global HFActionEvent from ControllerScriptingInterface 2014-10-27 15:21:47 -07:00
Andrzej Kapolka
4ab90ce49c Avoid killing the updater twice. 2014-10-27 15:04:03 -07:00
Stephen Birarda
76493597da move SpatialEvent from EventTypes to its own file 2014-10-27 14:47:44 -07:00
Andrzej Kapolka
15f8b3006b Remove debugging, fix streaming bug. 2014-10-27 14:45:34 -07:00
Stephen Birarda
818c97fcaf move WheelEvent out of EventTypes into its own file 2014-10-27 14:41:23 -07:00
Stephen Birarda
e72409bf39 move TouchEvent out of EventTypes to its own file 2014-10-27 14:37:04 -07:00
Stephen Birarda
3aa7c3c7dc move MouseEvent out of EventTypes into its own file 2014-10-27 14:30:20 -07:00
Stephen Birarda
5a390da509 move KeyEvent from EventTypes to its own file 2014-10-27 14:24:32 -07:00
Stephen Birarda
d38dd2c53a repairs for recursive source files, move HF meta events to SE 2014-10-27 14:18:23 -07:00
Andrzej Kapolka
5af52df558 Put some debugging in to track down a streaming crash. 2014-10-27 12:11:07 -07:00
Andrew Meadows
c1728c0296 Merge upstream/master into andrew/experimental 2014-10-27 10:08:48 -07:00
Stephen Birarda
d5a3ea77ff Merge branch 'master' of https://github.com/highfidelity/hifi into lobby 2014-10-27 09:28:50 -07:00
Stephen Birarda
f8b423ced6 bubble up isAutoRepeat state for KeyEvent 2014-10-24 16:12:15 -07:00
Stephen Birarda
3b436e04ae Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-24 09:43:04 -07:00
AndrewMeadows
64892a6b27 Merge pull request #3655 from Atlante45/fix_playback_loop
Fix player loop
2014-10-24 08:47:57 -07:00
Andrzej Kapolka
003d2f031a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-23 16:15:11 -07:00
Stephen Birarda
8c79d19e3e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-23 16:07:54 -07:00
Andrzej Kapolka
27d9de0cba More gradual improvements to heightfield voxelization. 2014-10-23 16:01:51 -07:00
Atlante45
20c862d199 Fix player loop 2014-10-23 14:35:24 -07:00
Andrzej Kapolka
ef0a400dcb Fix for clearing empty nodes. 2014-10-23 13:37:11 -07:00
Andrzej Kapolka
9c43748d35 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-23 11:50:46 -07:00
Atlante45
06d528fce5 bump audio version number 2014-10-23 09:28:48 -07:00
ZappoMan
5e497c2d97 added new macro for getter access to a color 2014-10-23 09:18:11 -04:00
Philip Rosedale
3ba3354e11 Merge pull request #3636 from Atlante45/reverb
Reverb
2014-10-22 21:51:57 -07:00
Andrzej Kapolka
631419d23c Tweaks to heightfield conversion. 2014-10-22 18:22:21 -07:00
Andrzej Kapolka
9af1516c79 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-22 17:45:20 -07:00
Andrzej Kapolka
271c01ad03 Fix for digging into converted heightfields. 2014-10-22 17:44:56 -07:00
Philip Rosedale
246ff1614f Merge pull request #3645 from birarda/avatar-by-name
fix for AvatarHashMap crash when erasing avatars
2014-10-22 17:43:44 -07:00
Clément Brisset
bf9d467328 Merge pull request #3638 from huffman/entity-tools-updates
Entity tool fixes
2014-10-22 17:40:21 -07:00
Stephen Birarda
8e67c5f534 don't erase from the AvatarHashMap on the wrong thread 2014-10-22 17:35:28 -07:00
Stephen Birarda
7b0f1477a1 expose AvatarList to Interface SE, add avatarWithDisplayName method 2014-10-22 15:28:04 -07:00
Atlante45
a48811777e Script engine audio dependency 2014-10-22 15:26:16 -07:00
Ryan Huffman
ac8d947cb1 Update ScriptUndoCommand to run on ScriptEngine thread 2014-10-22 15:18:49 -07:00
Ryan Huffman
14555c4534 Add UndoStackScriptingInterface and support when editing entities 2014-10-22 14:54:04 -07:00
Atlante45
86c965a922 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-22 14:20:22 -07:00