Leith Bade
886e21f755
Fix travis again x3
2014-12-04 01:57:12 +11:00
Leith Bade
772f154e4d
Fix Android crash
2014-12-04 01:51:17 +11:00
Leith Bade
243fb1de2d
Fix travis again x2
2014-12-04 01:35:52 +11:00
Leith Bade
4187ccc381
Fix travis again
2014-12-04 01:27:52 +11:00
Leith Bade
34aeae2455
Fix travis
2014-12-04 01:22:17 +11:00
Leith Bade
14cdd9c96f
Rename lots of things
2014-12-04 01:10:43 +11:00
Leith Bade
a26ef7f33d
Remove TODOs
2014-12-03 23:22:25 +11:00
Leith Bade
6be8c840bb
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
2014-12-03 23:03:14 +11:00
Leith Bade
08ce7157f1
Fix debug build
2014-12-03 22:58:33 +11:00
Konstantin Käfer
d3ab895153
switch to a newer version of GLFW
...
refs #679
2014-12-03 12:30:29 +01:00
Leith Bade
9db5d2ac55
Remove boost::make_unique
2014-12-03 22:27:40 +11:00
Leith Bade
31077a813c
Don't use malloc
2014-12-03 22:17:42 +11:00
Leith Bade
0899b9182a
Remove old TODO
2014-12-03 22:12:05 +11:00
Leith Bade
772fe9dcbc
Fix make_unique
2014-12-03 22:10:55 +11:00
Leith Bade
94d34ce7ac
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
...
Conflicts:
src/map/map.cpp
2014-12-03 22:02:55 +11:00
Konstantin Käfer
dbdc64592c
don't set the window title on every frame
...
this is a significant performance penalty, at least on OS X, and drops our frame rate below 60fps on even simple scenes. instead of showing the position of the map in the window, we should display it elsewhere
2014-12-03 11:59:39 +01:00
Leith Bade
f090d6b264
Use uv::async and various other fixes
2014-12-03 21:57:55 +11:00
Konstantin Käfer
82f3574d09
add array overloads to make_unique and move it to mbgl::util from std
2014-12-03 11:27:24 +01:00
Leith Bade
8208dfaba3
Use std::lock_guard
2014-12-03 20:56:41 +11:00
Leith Bade
2e30623bbc
Restore travis timing
2014-12-03 20:51:37 +11:00
Leith Bade
160c262b6e
Fix set -e
2014-12-03 20:49:11 +11:00
Leith Bade
e16f9cb291
Fix accidentally commented code
2014-12-03 20:47:05 +11:00
Leith Bade
3058cd2d60
Remove old TODO
2014-12-03 20:43:36 +11:00
Leith Bade
9346f6f6bd
Remove accidental friend
2014-12-03 20:14:11 +11:00
Leith Bade
35b0e2bfbd
Fix names in Map
2014-12-03 20:09:16 +11:00
Leith Bade
8762d5a9b6
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
...
Conflicts:
include/mbgl/map/map.hpp
src/map/map.cpp
2014-12-03 19:56:20 +11:00
Leith Bade
1bffbb0908
Use TESTMUNK in travis to start Testmunk
2014-12-03 19:46:35 +11:00
John Firebaugh
50669307c5
Remove unnecessary cast
2014-12-02 12:24:26 -08:00
John Firebaugh
a6522d4a5a
Texturepool ⇢ TexturePool ( fixes #655 )
2014-12-02 12:24:25 -08:00
John Firebaugh
8fdf645e12
Adhere to naming conventions
2014-12-02 12:24:25 -08:00
John Firebaugh
8f1772f18f
More complete uv::thread
2014-12-02 12:24:25 -08:00
artemp
9e819a4cbe
untabify
2014-12-02 16:38:04 +01:00
artemp
2c05b23f6a
update nunicode version to 1.5.1
2014-12-02 16:34:51 +01:00
Leith Bade
21460f0c6a
Remove token
2014-12-02 23:22:06 +11:00
Leith Bade
6bfc6a2b10
Fix deadlock in tests
2014-12-02 22:13:31 +11:00
Leith Bade
0935cef9c3
Fix tests when using GL 3.0+ context
2014-12-02 21:40:23 +11:00
Leith Bade
cfb6e2752c
Fix Linux build
2014-12-02 20:04:12 +11:00
Leith Bade
2b86522412
Share asset_request between platforms
2014-12-02 19:41:50 +11:00
Leith Bade
9a8c018a32
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
2014-12-02 19:05:05 +11:00
Leith Bade
42966004f3
Merge pull request #670 from mapbox/gl-debug
...
Use GL debug callbacks
2014-12-02 19:02:16 +11:00
Mike Morris
9aa638201d
Merge pull request #673 from mapbox/pixel-flip
...
Move pixel flip from headless test into HeadlessView::readPixels
2014-12-01 19:28:47 -05:00
Mike Morris
7e7b85e132
fix memcpy includes/namespace
2014-12-01 13:49:47 -08:00
Mike Morris
0fd7f26533
move pixel flip from headless test into HeadlessView::readPixels
2014-12-01 16:36:11 -05:00
Leith Bade
67d513816a
Fix typo
2014-12-02 04:42:07 +11:00
Leith Bade
5ad094e823
Fix iOS compile
2014-12-02 03:43:04 +11:00
Leith Bade
2800f36142
Add debug markers and labels
2014-12-02 03:24:42 +11:00
Leith Bade
66349e33ab
Add GL_ARB_debug_output
2014-12-02 03:09:09 +11:00
Dane Springmeyer
917c6d1925
readme setup: android on linux does not need all linux deps
2014-12-01 07:58:44 -08:00
Leith Bade
204700ff7e
Stop mipmap allocation for textures
2014-12-02 02:29:07 +11:00
Leith Bade
763e636fd7
Improve formatting
2014-12-02 02:01:10 +11:00
