Sam Gateau
|
d3a7b011bf
|
defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design. And cleaned the dead code in Application.cpp
|
2014-11-12 16:52:11 -08:00 |
|
Sam Gateau
|
8fb04af59d
|
defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design
|
2014-11-12 16:40:45 -08:00 |
|
Sam Gateau
|
5f0fdeccb2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
|
2014-11-12 00:27:12 -08:00 |
|
Sam Gateau
|
b716a512c6
|
Stable version of the Transform and usage for Model rendering with soimilar performances and same accuracy level
|
2014-11-12 00:26:44 -08:00 |
|
Stephen Birarda
|
9bd870f4b0
|
fix hifi url handling after update to 5.3.2
|
2014-11-11 20:45:04 -08:00 |
|
Sam Gateau
|
7a9f45d34f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
|
2014-11-11 16:40:11 -08:00 |
|
Sam Gateau
|
668c5e298d
|
clean up the Transform class and the rendering path in Model.cpp
|
2014-11-11 16:39:00 -08:00 |
|
Ryan Huffman
|
bedd9c76f2
|
Merge branch 'master' of github.com:highfidelity/hifi into entity-grid-tool
Conflicts:
examples/newEditEntities.js
|
2014-11-11 10:48:49 -08:00 |
|
Ryan Huffman
|
a1d771a0be
|
Rename WebWindow to WebWindowClass
|
2014-11-11 10:03:14 -08:00 |
|
Sam Gateau
|
ad51416c28
|
move the transform class files to the Shared library, still problem with negative scale composition
|
2014-11-11 09:54:35 -08:00 |
|
Andrzej Kapolka
|
5f89b6e00e
|
The spec actually says that the 'L' (should have been 'LL' anyway) isn't
necessary; the compiler will know to read the constant as a long long.
|
2014-11-10 11:58:52 -08:00 |
|
Sam Gateau
|
7ccb7495c7
|
Merge and resolve conflict on APplication.cpp
|
2014-11-10 10:07:24 -08:00 |
|
Sam Gateau
|
631ed9da78
|
let's start reusing the Batch per model from frame to frame
|
2014-11-10 10:04:19 -08:00 |
|
Brad Hefta-Gaub
|
fc89f92097
|
Revert "Revert "Fix build warning""
|
2014-11-07 21:53:56 -08:00 |
|
Brad Hefta-Gaub
|
09490b58b4
|
Revert "Fix build warning"
|
2014-11-07 21:47:28 -08:00 |
|
David Rowe
|
94d82455a0
|
Fix build warning
|
2014-11-07 19:56:54 -08:00 |
|
Andrzej Kapolka
|
cd110d6048
|
Fix for invalid projection matrix on startup.
|
2014-11-07 14:35:01 -08:00 |
|
Andrzej Kapolka
|
7008012492
|
Trigger fixes.
|
2014-11-07 14:20:31 -08:00 |
|
Andrzej Kapolka
|
a4db244182
|
Mirror/warning fixes.
|
2014-11-07 13:57:20 -08:00 |
|
Stephen Birarda
|
f1a238a6c2
|
piping for local UI sounds
|
2014-11-07 10:08:09 -08:00 |
|
ZappoMan
|
55576e7f9d
|
fix crash in mouse messages while quitting
|
2014-11-06 17:53:22 -08:00 |
|
ZappoMan
|
bceab4ead9
|
clear all octree related state when disconnecting from a domain
|
2014-11-06 17:25:49 -08:00 |
|
Ryan Huffman
|
3e109ee770
|
Add WebWindow widget for scripts
|
2014-11-06 14:57:04 -08:00 |
|
Sam Gateau
|
b0189efcdf
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2014-11-06 10:56:54 -08:00 |
|
Stephen Birarda
|
663167d684
|
wait on AudioInjectors when shutting down interface
|
2014-11-05 10:37:22 -08:00 |
|
Stephen Birarda
|
2c667d209d
|
make the AudioInjectorScriptingInterface a singleton
|
2014-11-05 10:10:05 -08:00 |
|
Sam Gateau
|
99eb46f218
|
Removed any checkGLError so they do not show
|
2014-11-04 17:10:17 -08:00 |
|
Sam Gateau
|
27aadd24b3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2014-11-04 16:43:26 -08:00 |
|
Sam Gateau
|
441d09a460
|
debugiing the mysterious glError coming from glFrustum
|
2014-11-04 16:42:58 -08:00 |
|
Brad Hefta-Gaub
|
24c324fd1d
|
Merge pull request #3735 from ctrlaltdavid/20126
CR for Job #20126 - Rift HUD shouldn't move with head
|
2014-11-04 15:52:10 -08:00 |
|
Brad Hefta-Gaub
|
583b7b1267
|
Merge pull request #3732 from thoys/20166
CR for Job #20166 - Extend AudioDeviceScriptingInterface to have muted property and mute event
|
2014-11-04 15:51:05 -08:00 |
|
Stephen Birarda
|
f53455ee55
|
use a ray from the near clip for action ray
|
2014-11-04 11:40:47 -08:00 |
|
Stephen Birarda
|
790aa848ae
|
leverage Camera object for scripting, remove sep interface
|
2014-11-04 10:33:55 -08:00 |
|
Stephen Birarda
|
957705998f
|
fix an uninitialized action ray when hitting spacebar
|
2014-11-04 10:19:56 -08:00 |
|
Stephen Birarda
|
8d6b041758
|
send a pick ray with HFActionEvent, not x,y
|
2014-11-04 10:01:25 -08:00 |
|
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 |
|
Thijs Wenker
|
af74fc09b9
|
Adds AudioDevice mute functionality to ScriptEngine
|
2014-11-01 02:42:22 +01:00 |
|
ZappoMan
|
a5088eece6
|
first cut at running scripts from entities
|
2014-10-31 14:03:30 -07:00 |
|
David Rowe
|
170e328f5a
|
Fix similar problem for HMD third person view
getUprightHeadPosition() changes with avatar lean.
|
2014-10-31 12:40:16 -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 |
|