Stephen Birarda
d3372537c5
Merge pull request #3715 from ZappoMan/entityScriptsAndEvents
...
Entity Scripts
2014-11-03 15:02:52 -08:00
Sam Gateau
4d1fbc1cf9
Fix end of line in Application.cpp
2014-11-03 14:39:34 -08:00
Sam Gateau
a4bd0acc91
Fix the syntax issue with if blocks
2014-11-03 14:36:03 -08:00
Sam Gateau
eae604d77e
Merged with upstream master
2014-11-03 13:37:17 -08:00
Sam Gateau
cecf79e580
Fix the problem of actual framerate target not beeing true to the value displayed in the menu, same for resolution scale. Removed the value in Application and relies exclusively on the menu state
2014-11-03 11:22:23 -08:00
Brad Hefta-Gaub
9fb4f91f2a
Merge pull request #3716 from ctrlaltdavid/20152
...
CR for Job #20152 - Interface cache goes away when you close Interface.
2014-11-03 11:07:36 -08:00
ZappoMan
49a389618e
Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents
2014-11-03 10:54:19 -08:00
ZappoMan
a5088eece6
first cut at running scripts from entities
2014-10-31 14:03:30 -07:00
ZappoMan
277da5a24f
first cut at wiring up new entity specific UI/UX events
2014-10-31 10:23:45 -07:00
David Rowe
ccc5e0d6ca
Increase Interface's disk cache from default 50MB to 10GB
2014-10-31 10:06:43 -07:00
ZappoMan
e78ac4c1d4
Merge branch 'master' of https://github.com/highfidelity/hifi into lockAndMaterialProperties
2014-10-30 16:36:19 -07:00
ZappoMan
81cc15495f
rename Models to Entities, and add menu option to disable Light entities
2014-10-30 14:43:43 -07:00
Brad Hefta-Gaub
1c4e71ebc1
Revert "Worklist #20074 "
2014-10-30 14:33:10 -07:00
Brad Hefta-Gaub
7b5d2ef9f8
Merge pull request #3706 from huffman/entity-tool-help
...
Add edit entities help window
2014-10-30 12:53:17 -07:00
Ryan Huffman
4f2fef0428
Add edit entities help window
2014-10-30 12:02:30 -07:00
Stephen Birarda
45763a96d7
Merge pull request #3697 from ZappoMan/shadowsTo3DOverlays
...
Shadows to3 d overlays
2014-10-30 09:21:25 -07:00
ZappoMan
2570caca40
move 3D overlay rendering into the render portion that supports lighting and shadows
2014-10-29 21:08:37 -07:00
Brad Hefta-Gaub
e314fa1fc3
Merge pull request #3652 from ctrlaltdavid/19976
...
CR for Job #19976 - Microsoft Speech API: allow me to control my avatar with voice
2014-10-29 20:46:12 -07:00
Stephen Birarda
5b3897f1cf
Merge pull request #3690 from ZappoMan/rayPickSubMeshes
...
Ray pick sub meshes
2014-10-29 12:10:29 -07:00
ZappoMan
c3d1d13fa9
Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes
2014-10-29 11:56:27 -07:00
ZappoMan
3e9bc23c2f
moving RenderArgs into shared so it can be used by overlays, first cut at ray picking against submeshes
2014-10-29 10:19:04 -07:00
Sam Gateau
dbdd5293fa
Merged with master
2014-10-28 18:31:02 -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
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
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
Stephen Birarda
d3bbd251db
move Logging to LogHandler
2014-10-28 13:59:23 -07:00
Stephen Birarda
2711ff2b5f
move functionality from VerboseLoggingHelper into the Logging class
2014-10-28 13:48:53 -07:00
Stojce
1229f0e8fa
Merge branch 'master' of https://github.com/highfidelity/hifi into 20143
2014-10-28 21:39:36 +01:00
Stephen Birarda
477b5096e8
don't start/end action/back events on auto-repeat
2014-10-28 11:34:31 -07:00
David Rowe
adf168b7ea
Remove ATL build dependency for Windows speech recognizer
2014-10-28 11:14:45 -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
Stephen Birarda
80d9014726
have spacebar fire an action event at center of screen
2014-10-27 16:54:28 -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
Stephen Birarda
c3fe7c7497
send global HFActionEvent from ControllerScriptingInterface
2014-10-27 15:21:47 -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
Stephen Birarda
6626787ae5
have mouse press/release fire HFActionEvent
2014-10-27 11:40:33 -07:00
Pete
8d97a20bd9
Worklist #20074
...
- Add new Preferences item for Oculus Max FPS, defaults to 75, range is
[30, 95]
- Load and save this value appropriately
- When VR mode is enabled/disabled, set the Render Target Framerate to
this value/unlimited
2014-10-26 21:14:20 -07:00
Stojce
61c80183ad
fix for mirror size on different scale resloutions
2014-10-26 08:12:07 +01:00
David Rowe
c6463abfb8
Prevent keys captured by script from being used as menu shortcuts
2014-10-25 09:22:30 -07:00
David Rowe
5f91f583e8
Merge branch 'master' into 19976
...
Conflicts:
interface/CMakeLists.txt
2014-10-24 20:34:45 -07:00
David Rowe
f373719f02
Don't include speech recognition if building with Visual Studio Express
2014-10-24 20:12:23 -07:00
