27328 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	2a00586e21	Fix missing hack ... Matches hack in stopScript().	2015-06-17 16:11:29 -07:00
David Rowe	17f7d76025	Redownload scripts that are loaded via Script.load() when reloading all	2015-06-17 16:11:28 -07:00
David Rowe	5dab977c28	Add a reload script button after each script in list of running scripts	2015-06-17 16:11:26 -07:00
David Rowe	f220d40bb8	Re-download scripts upon Reload All	2015-06-17 16:11:25 -07:00
Bradley Austin Davis	1705eb8f80	Reverting some changes, putting overlay rendering in its own state manager	2015-06-17 16:08:19 -07:00
Brad Davis	8a1b519071	Working on overlays	2015-06-17 16:06:06 -07:00
Brad Davis	f2261b5ed5	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-17 15:34:50 -07:00
Brad Davis	2ab3f42c6a	Merge pull request #5124 from venkatn93/master ... New address bar with forward and back buttons	2015-06-17 15:33:10 -07:00
Seth Alves	15f156fcd2	Merge branch 'fix-build' of github.com:sethalves/hifi into actions-over-wire	2015-06-17 15:18:39 -07:00
Seth Alves	fbfa73af2d	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-17 15:18:17 -07:00
Brad Davis	c8cc3a46b3	Merge remote-tracking branch 'origin/fix-gl-matrix' into overlay	2015-06-17 15:13:35 -07:00
Brad Davis	ae1c9603b9	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-17 15:13:04 -07:00
Seth Alves	68df6b662d	fix ifdefs around asserts	2015-06-17 15:03:09 -07:00
Bradley Austin Davis	a27e06713b	Preserve the GL matrix stack when running batch commands	2015-06-17 14:57:14 -07:00
Seth Alves	44bb220130	fix debug build	2015-06-17 14:54:13 -07:00
Seth Alves	9a51a4c5b1	fix debug build	2015-06-17 14:48:37 -07:00
Seth Alves	0568dc983e	Merge pull request #5151 from ZappoMan/fixWarnings ... fix some warnings	2015-06-17 14:44:10 -07:00
Sam Gondelman	0157997126	fix findDevice	2015-06-17 14:42:11 -07:00
Seth Alves	22ac61e476	work around hiding of virtual functions in PolyVox entity classses	2015-06-17 14:40:24 -07:00
Niraj Venkat	225e2ebfdc	Fixing build issues and finishing up address bar	2015-06-17 14:27:16 -07:00
ZappoMan	f2ba91383c	fix some warnings	2015-06-17 14:26:36 -07:00
Seth Alves	59389ce506	Merge branch 'master' of github.com:highfidelity/hifi into overloaded-virtual	2015-06-17 14:18:47 -07:00
ZappoMan	58ee5217e3	fix some warnings	2015-06-17 14:08:02 -07:00
Niraj Venkat	9b9aba48f0	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-06-17 13:50:30 -07:00
Bradley Austin Davis	11fff7c6e5	debugging stack on OSX	2015-06-17 13:49:42 -07:00
Niraj Venkat	1328ea6199	Calling AddressManager back and forward functions	2015-06-17 13:41:41 -07:00
Philip Rosedale	196a1546ab	Merge pull request #5135 from howard-stearns/not-clipped-local-sounds ... Don't clip local audio sounds	2015-06-17 13:37:56 -07:00
Seth Alves	ac491dabdb	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-17 13:20:14 -07:00
Bradley Austin Davis	2172445db7	Merge remote-tracking branch 'upstream/master' into ovr6	2015-06-17 12:56:41 -07:00
Ryan Huffman	220a78eede	Merge pull request #5149 from SamGondelman/master ... fix compile issue if you don't have sdl2	2015-06-17 12:33:10 -07:00
Sam Gondelman	a37b089b33	merge with master	2015-06-17 12:17:09 -07:00
Sam Gondelman	c0797313a1	added mouseLook.js to default scripts	2015-06-17 12:08:23 -07:00
Brad Davis	4282c044ef	Working on mirror and overlay	2015-06-17 12:01:39 -07:00
Howard Stearns	b4dfaba55e	Incorporate ctrlaltdavid's changes.	2015-06-17 11:59:15 -07:00
Stephen Birarda	71475f13b5	Merge pull request #5146 from birarda/master ... fix for path handling on return of place info	2015-06-17 14:57:55 -04:00
Sam Gondelman	45a5f1364a	fix compile issue if you don't have sdl2	2015-06-17 11:56:44 -07:00
Seth Alves	3e758a8f43	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-17 11:53:12 -07:00
Andrew Meadows	61f62f96b0	Merge pull request #5129 from SamGondelman/master ... Integrating gamepads/hydras to input mapping system, zooming	2015-06-17 11:39:38 -07:00
Sam Gondelman	3af0c138dd	removed button image, extraneous variables	2015-06-17 11:39:11 -07:00
Brad Davis	1e90aaf9c3	Working on overlays still, mirror rendering and overlay order	2015-06-17 11:35:30 -07:00
Seth Alves	85564199c6	git rid if pull-to-point action (spring handles this). add new action which tries to maintain an entity's distance from a given point	2015-06-17 11:22:10 -07:00
Stephen Birarda	bc20ea6ed2	fix for path handling on return of place info	2015-06-17 11:18:43 -07:00
Sam Gondelman	17322645f2	added mouselook script, reticle and icons need changes	2015-06-17 11:17:38 -07:00
Brad Davis	5ded9e7eb9	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-17 10:50:01 -07:00
Philip Rosedale	8b8f0bcbde	Merge pull request #5132 from sethalves/polyvox ... Polyvox fixes	2015-06-17 10:49:35 -07:00
Clément Brisset	d67d350e72	Merge pull request #5143 from ZappoMan/atmosphereBatchFix ... Change atmospheres to render using batch compatible pipeline and shaders	2015-06-17 19:48:11 +02:00
Clément Brisset	42a5ddd116	Merge pull request #5144 from birarda/master ... make goToUser public again	2015-06-17 19:27:29 +02:00
Stephen Birarda	dc4ae082f8	make goToUser public again	2015-06-17 10:13:53 -07:00
ZappoMan	fb59939cf4	CR feedback	2015-06-17 10:02:02 -07:00
ZappoMan	e9bf553254	CR feedback	2015-06-17 09:59:38 -07:00