Andrew Meadows
|
f93ee340fc
|
Merge pull request #4627 from sethalves/no-upper-size-limit-for-collisions
don't keep large things out of physics engine
|
2015-04-09 15:14:39 -07:00 |
|
Seth Alves
|
4ada3fc9a4
|
don't keep large things out of physics engine
|
2015-04-09 15:12:51 -07:00 |
|
Thijs Wenker
|
cf403a7ad8
|
Merge branch 'master' of https://github.com/worklist/hifi into 20367
|
2015-04-09 23:47:20 +02:00 |
|
Thijs Wenker
|
0cb5ee5bd1
|
- Scripts JS object renamed to ScriptDiscoveryService.
- Renamed Example script file for the ScriptDiscoveryService.
- Moved ScriptDiscoveryService functions to the RunningScriptWidget
|
2015-04-09 23:46:49 +02:00 |
|
Seth Alves
|
efa5c473d2
|
add fatten-faces mode to convex-hull tool for use on meshes which were derived from height-fields
|
2015-04-09 14:29:17 -07:00 |
|
Clément Brisset
|
fea7a58774
|
Merge pull request #4605 from ericrius1/light
Updated lightcontroller.js logic to find the nearest light when user cli...
|
2015-04-09 22:49:22 +02:00 |
|
Philip Rosedale
|
eaec0a6ea7
|
Merge pull request #4625 from ctrlaltdavid/users-tweaks
Tweak users display to work better with variety of backgrounds
|
2015-04-09 13:34:21 -07:00 |
|
David Rowe
|
d6c15549e4
|
Tweak users display to work better with variety of backgrounds
|
2015-04-09 13:03:12 -07:00 |
|
Brad Davis
|
3d6cf82659
|
Merge pull request #4624 from ctrlaltdavid/memory-fixes
Replace try with nothrow
|
2015-04-09 12:30:44 -07:00 |
|
Andrew Meadows
|
0751de4304
|
Merge pull request #4618 from ctrlaltdavid/large-address-aware
Add /LARGEADDRESSAWARE linker flag for Windows builds
|
2015-04-09 11:18:06 -07:00 |
|
Eric Levin
|
396325629e
|
added back original light controller script
|
2015-04-09 10:43:34 -07:00 |
|
David Rowe
|
ae3d606e95
|
Replace try with nothrow
|
2015-04-09 10:01:31 -07:00 |
|
Seth Alves
|
66ea6f4eb4
|
Merge branch 'master' of github.com:highfidelity/hifi into island
|
2015-04-09 09:59:00 -07:00 |
|
Clément Brisset
|
59a5fac2f1
|
Merge pull request #4619 from ctrlaltdavid/memory-fixes
Memory fixes
|
2015-04-09 18:51:02 +02:00 |
|
Eric Levin
|
c0e7cd1f6a
|
deleted unnecessary line with typo
|
2015-04-09 09:50:12 -07:00 |
|
samcake
|
91d6046051
|
Merge pull request #4622 from jherico/starfield_hack_fix
Ensure blending is enabled during starfield rendering
|
2015-04-09 09:45:14 -07:00 |
|
Brad Davis
|
21dd87c11c
|
Merge pull request #4620 from Atlante45/remove_url_extra_whitespace
Trim entity properties set from JS that are strings
|
2015-04-09 09:29:46 -07:00 |
|
Seth Alves
|
b472edbebb
|
remove debug print for something that no longer exists
|
2015-04-09 09:26:14 -07:00 |
|
Seth Alves
|
73a1265624
|
Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol
|
2015-04-09 09:21:06 -07:00 |
|
Brad Davis
|
5efb960645
|
Ensure blending is enabled during starfield rendering
|
2015-04-09 09:18:53 -07:00 |
|
Brad Davis
|
f496175fb9
|
Attempt to stop the crashing on exit caused by the Oculus SDK
|
2015-04-09 09:17:23 -07:00 |
|
David Rowe
|
b2dd53ac43
|
Coding standard
|
2015-04-09 08:37:24 -07:00 |
|
Atlante45
|
298a81cea9
|
Trim entity properties set from JS that are strings
|
2015-04-09 14:42:26 +02:00 |
|
Clément Brisset
|
36631dd3a3
|
Merge pull request #4608 from ctrlaltdavid/fix-animation-not-starting
CR for Animation fixes
|
2015-04-09 11:39:13 +02:00 |
|
Philip Rosedale
|
f51cafa066
|
Merge pull request #4616 from huffman/marketplace-always-visible
Marketplace always visible
|
2015-04-08 20:51:51 -07:00 |
|
David Rowe
|
76d6c6cac5
|
Delete char* items properly
|
2015-04-08 20:03:42 -07:00 |
|
David Rowe
|
e768852645
|
Fix catching bad_alloc
Non-allocation wasn't caught on Windows; it just crashed.
|
2015-04-08 20:02:22 -07:00 |
|
David Rowe
|
12f5b992c9
|
Add /LARGEADDRESSAWARE linker flag for Windows builds
Enables Interface to use more than 2GB of memory.
Reduces the incidence of bad_alloc crashes.
|
2015-04-08 20:01:01 -07:00 |
|
Seth Alves
|
62ff8bf735
|
set PROP_LAST_ITEM automatically
|
2015-04-08 17:07:20 -07:00 |
|
Seth Alves
|
51a0fdf3d4
|
formatting
|
2015-04-08 15:43:49 -07:00 |
|
Seth Alves
|
2448051c75
|
Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol
|
2015-04-08 15:39:40 -07:00 |
|
Seth Alves
|
1dd01cde00
|
expand svo to hold acceleration and id of current simulator node
|
2015-04-08 15:39:34 -07:00 |
|
Seth Alves
|
30a8b61df3
|
quiet compiler
|
2015-04-08 15:39:21 -07:00 |
|
Seth Alves
|
5c709e2638
|
quiet compiler
|
2015-04-08 15:39:07 -07:00 |
|
Ryan Huffman
|
a0e324f9f5
|
Add error for when importing on a domain without permissions
|
2015-04-08 13:58:14 -07:00 |
|
Ryan Huffman
|
b6af9fde9e
|
Make marketplace button always visible
|
2015-04-08 13:57:41 -07:00 |
|
Philip Rosedale
|
5e681ee56b
|
Merge pull request #4615 from huffman/align-checkboxes
Align checkboxes
|
2015-04-08 13:39:25 -07:00 |
|
Ryan Huffman
|
e3dea8ccc8
|
Remove margin in entityProperties
|
2015-04-08 13:24:03 -07:00 |
|
Ryan Huffman
|
92b91c9a38
|
Fix checkboxes not aligning with label
|
2015-04-08 13:23:48 -07:00 |
|
Philip Rosedale
|
b89a50590e
|
Merge pull request #4614 from huffman/new-entity-position
Update new entity positioning to be in front of camera
|
2015-04-08 12:55:57 -07:00 |
|
Ryan Huffman
|
e2a7072270
|
Update new entity positioning to be in front of camera
|
2015-04-08 12:50:02 -07:00 |
|
Philip Rosedale
|
9abe5ee292
|
Merge pull request #4612 from huffman/entity-properties-size
Entity properties size
|
2015-04-08 12:18:32 -07:00 |
|
Philip Rosedale
|
52f82b0768
|
Merge pull request #4613 from samcake/orange
fix the rendering bug on mac release
|
2015-04-08 11:27:06 -07:00 |
|
samcake
|
4fb5c8f907
|
fix the rendering bug on mac release due to the State::DepthTest not properly aligned to 4bytes. Improved the glCheckError for knowing where the error comes from.
|
2015-04-08 11:04:13 -07:00 |
|
Seth Alves
|
62fe9870e3
|
more command-line arguments
|
2015-04-08 10:48:13 -07:00 |
|
Ryan Huffman
|
83918c53b9
|
Update entityProperties properties to take up less space
|
2015-04-08 10:18:29 -07:00 |
|
Ryan Huffman
|
dc503ac068
|
Update entityProperties checkboxes to be inlined
|
2015-04-08 10:18:04 -07:00 |
|
Eric Levin
|
b8719f6e5f
|
made new alternative light script
|
2015-04-08 09:21:24 -07:00 |
|
Eric Levin
|
6de4cec836
|
made randomly chosen sound persistent between sessions by storing sound index in user data. Now using previous rotation and position to compute offset position
|
2015-04-08 09:20:29 -07:00 |
|
Seth Alves
|
b09cade568
|
Merge branch 'master' of github.com:highfidelity/hifi into island
|
2015-04-08 09:18:22 -07:00 |
|