Andrew Meadows
dab1f026d7
simpler EntityItem::simulate() bypass for bullet
2014-12-18 13:56:18 -08:00
Andrew Meadows
85fd1fc14f
merge andrew/thermonuclear into andrew/inertia
...
Conflicts:
interface/src/Application.cpp
libraries/entities/src/EntityItem.cpp
2014-12-18 13:46:06 -08:00
Andrew Meadows
49fad6222e
merge upstream/master into andrew/thermonuclear
2014-12-18 13:28:37 -08:00
Andrew Meadows
b03e6c53e1
fixing derived classes to use new EntityItem API
...
remove 'forceCopy' argument in EntityItem::setProperties()
2014-12-18 11:41:20 -08:00
Andrew Meadows
28381a3b70
cleanup of EntityItem::_created timestamp logic
...
EntityItem::_created initializes to 0 in ctor
and must be set either by EntityItemProperties (via server update)
or manually whenever a script creates a fresh entity
2014-12-18 11:39:02 -08:00
Brad Hefta-Gaub
fe5af952a4
Merge pull request #3979 from huffman/rollback-gridtools
...
Roll gridTool.js back temporarily
2014-12-18 09:38:46 -08:00
Andrew Meadows
756d09d895
fix typo that broke the build
2014-12-17 16:06:15 -08:00
Andrew Meadows
6e7eccdb27
merge upstream/master into andrew/thermonuclear
2014-12-17 15:59:45 -08:00
Andrew Meadows
75d468da9e
set _lastEdited to _created rather than to zero
2014-12-17 15:59:16 -08:00
Andrew Meadows
44ebf37510
handle case where obj at rest but still falls
2014-12-17 15:52:34 -08:00
Andrew Meadows
1e5c44f117
accept changes with the same Edit timestamp
2014-12-17 15:48:49 -08:00
Clément Brisset
1617d79f2e
Merge pull request #3974 from ZappoMan/librarization
...
Librarization of Entities Rendering
2014-12-17 15:34:01 -08:00
Andrew Meadows
547c4cdaf9
make non-bullet entity simulation work again
2014-12-17 14:52:38 -08:00
Andrew Meadows
c6afa0f7e1
remove test hack for higher than normal ground
2014-12-17 14:17:30 -08:00
ZappoMan
7db350eac2
remove calls to glut in entities
2014-12-17 14:07:26 -08:00
ZappoMan
881119ebf3
removed dead code
2014-12-17 13:23:12 -08:00
Andrew Meadows
6ea766b48d
merge andrew/thermonuclear into andrew/inertia
...
Conflicts:
interface/src/Application.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityTypes.cpp
2014-12-17 13:21:00 -08:00
ZappoMan
1a9cf126e4
Merge branch 'master' of https://github.com/highfidelity/hifi into librarization
...
Conflicts:
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.h
2014-12-17 13:16:11 -08:00
Brad Hefta-Gaub
0b3796ccfe
Merge pull request #3973 from Atlante45/applications_diet
...
Move GLWidget to DM
2014-12-17 13:06:00 -08:00
ZappoMan
9f9b8bcb68
move interface/entities to libraries/entities-renderer
2014-12-17 12:54:41 -08:00
Ryan Huffman
cb7f5a5b45
Roll gridTool.js back temporarily
2014-12-17 12:41:58 -08:00
Andrew Meadows
905d7f50eb
comments on TODO list
2014-12-17 12:39:48 -08:00
Andrew Meadows
8de309a7a9
more correct _created and _lastEdited
2014-12-17 12:38:26 -08:00
Andrew Meadows
5efd996548
clarifying some comments on member variables
2014-12-17 12:37:49 -08:00
ZappoMan
2be3b73e8c
move TextRender to libraries/render-utils
2014-12-17 12:32:52 -08:00
Andrew Meadows
e36ee2a961
more correct creation and edit times for entities
2014-12-17 12:19:34 -08:00
ZappoMan
a465aa20ff
more Application and Menu dependency removal
2014-12-17 11:41:42 -08:00
ZappoMan
5d636e21c6
more Application dependency cleanup
2014-12-17 11:10:45 -08:00
ZappoMan
d3bf28e879
more Application dependency cleanup
2014-12-17 11:10:24 -08:00
Brad Hefta-Gaub
61ec1bdd6a
Merge pull request #3977 from huffman/fix-minor-grid
...
Fix minor grid spacing not updating
2014-12-17 09:13:32 -08:00
Ryan Huffman
b95eac759e
Fix minor grid spacing not updating
2014-12-17 08:52:48 -08:00
Brad Hefta-Gaub
9c52086066
Merge pull request #3976 from birarda/simple-script-persist
...
simple model for persistent scripts in domain-server settings
2014-12-16 19:49:23 -08:00
Stephen Birarda
77bc00e410
a simple model for persistent scripts in domain-server
2014-12-16 18:34:39 -08:00
Atlante45
6304a5e819
Unused removed method
2014-12-16 16:50:15 -08:00
ZappoMan
3dfded89b8
remove menu dependency from EntityTreeRenderer, some Application cleanup
2014-12-16 16:28:09 -08:00
Atlante45
3f2b5aeca4
Cleaner destruction handling
2014-12-16 16:22:59 -08:00
ZappoMan
74a8f0059d
some Application dependecy cleanup
2014-12-16 15:43:24 -08:00
ZappoMan
d385a7b8ac
header file cleanup
2014-12-16 15:35:56 -08:00
Atlante45
b2dac6f53f
DM users update
2014-12-16 15:32:11 -08:00
ZappoMan
ee2ce718b4
header file cleanup
2014-12-16 15:14:14 -08:00
Atlante45
11a2ecab56
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/Menu.cpp
interface/src/entities/EntityTreeRenderer.h
interface/src/ui/ApplicationOverlay.cpp
libraries/render-utils/src/GlowEffect.cpp
libraries/render-utils/src/Model.cpp
2014-12-16 15:02:37 -08:00
Clément Brisset
7632dbead3
Merge pull request #3968 from ZappoMan/InterfaceConfigEctomy
...
Librarization
2014-12-16 14:56:11 -08:00
Atlante45
2039895898
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/renderer/GlowEffect.cpp
interface/src/renderer/TextureCache.cpp
2014-12-16 14:27:50 -08:00
ZappoMan
b449f650a0
more Model cleanup
2014-12-16 14:22:02 -08:00
ZappoMan
89101872bb
move Model and AnimationHandle to libraries
2014-12-16 14:04:39 -08:00
Atlante45
4d1529f77b
typedefs
2014-12-16 14:02:22 -08:00
ZappoMan
85c8951734
really remove the debug settings from Model rendering
2014-12-16 13:57:22 -08:00
Atlante45
e8a22f6f0f
Switched to chared pointers and macros
2014-12-16 13:54:52 -08:00
Atlante45
cf6aa563ac
DM returns shared pointer
2014-12-16 13:54:24 -08:00
Brad Hefta-Gaub
d322f587a7
Merge pull request #3972 from DaveDubUK/Window.nonBlockingForm-fix
...
Window.non blocking form fix
2014-12-16 13:52:27 -08:00
