Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 05:13:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
18171 commits 71 branches 56 tags 1.2 GiB
Commit graph

18171 commits

This branch
This branch
All branches
Author SHA1 Message Date
AndrewMeadows
ff9c2ec202 Merge pull request #3677 from ZappoMan/moreLightPropertiesAttempt2 
Light Entities
 2014-10-28 14:55:31 -07: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
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
477b5096e8 don't start/end action/back events on auto-repeat 2014-10-28 11:34:31 -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
Stephen Birarda
b90db2856b add a method to AddressManager to handle address maps from JS 2014-10-28 10:00:39 -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
Stephen Birarda
cb7a6cb93c Merge branch 'master' of https://github.com/highfidelity/hifi into lobby 2014-10-28 08:40:20 -07: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
Stephen Birarda
8e6b6d5294 have controller A button fire action at center of screen 2014-10-27 15:58:42 -07:00
Stephen Birarda
8a9f2d172a rename HFCancelEvent to HFBackEvent, fire from joystick 2014-10-27 15:51:59 -07:00
Stephen Birarda
04e7e979aa bubble up HFCancelEvent from ESC key 2014-10-27 15:42:40 -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
9e086a8d08 Merge pull request #3672 from ey6es/metavoxels 
Fix for metavoxel stream crash/crash on exit.
 2014-10-27 15:11:53 -07:00
Andrzej Kapolka
4ab90ce49c Avoid killing the updater twice. 2014-10-27 15:04:03 -07:00
Andrzej Kapolka
7bcc267cb5 Fix for crash on exit. 2014-10-27 15:01:06 -07:00
Sam Gateau
6101c3b758 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-10-27 14:55:42 -07:00
Stephen Birarda
76493597da move SpatialEvent from EventTypes to its own file 2014-10-27 14:47:44 -07:00
Sam Gateau
fd514ccfc9 Fixed the cmake so if NSIGHT is not available then no problem 2014-10-27 14:47:31 -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
ZappoMan
5d7a0c2934 added light properties to edit tools 2014-10-27 14:34:43 -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
Stephen Birarda
0ddf665b86 add an HFMetaEvent class as super class for meta events 2014-10-27 12:56:48 -07:00