Commit graph

2955 commits

Author SHA1 Message Date
Branimir Karadžić
3eb0659898 Cleanup. 2015-06-22 20:45:50 -07:00
Branimir Karadžić
b98be4305c Merge branch 'master' of cane:bkaradzic/bgfx 2015-06-21 20:00:18 -07:00
Branimir Karadžić
5e0948c7a8 Cleanup. 2015-06-21 20:00:00 -07:00
Branimir Karadžić
17a951bbb4 Merge branch 'dev' 2015-06-20 14:40:29 -07:00
Branimir Karadžić
8109de5461 Cleanup. 2015-06-20 14:27:59 -07:00
Branimir Karadžić
3c0134c167 OSX: Fixed amalgamated build. 2015-06-20 00:22:36 -07:00
Branimir Karadžić
0283c83c0a Cleanup. 2015-06-19 21:47:20 -07:00
Branimir Karadžić
f2e8d6c239 Fixed variable shadowing warning. 2015-06-19 21:08:32 -07:00
Branimir Karadžić
4408e44515 Merge branch 'master' of cane:bkaradzic/bgfx into dev 2015-06-19 20:01:42 -07:00
Branimir Karadžić
a39ba04e26 Fixed Linux build. 2015-06-19 19:55:23 -07:00
Branimir Karadžić
d7a9b56dc6 Added ObjC amalgamated file. 2015-06-19 17:34:01 -07:00
Branimir Karadžić
5ebe50c705 Cleanup. 2015-06-18 22:33:06 -07:00
Branimir Karadžić
c80cc04445 Removed mapped constant buffers (it doesn't improve performance). 2015-06-18 20:39:16 -07:00
Branimir Karadžić
faf3164ecb Fixed issue #436. 2015-06-17 10:04:12 -07:00
Branimir Karadžić
67f7d0a3d6 Cleanup. 2015-06-15 13:12:22 -07:00
Branimir Karadžić
ad768598b1 x11: Fixed joystick read. 2015-06-14 17:29:17 -07:00
Branimir Karadžić
dc5cac62c5 Merge pull request #434 from ocornut/imgui_scintilla_fixes
Scintilla/imgui: removed getFontInfo(), using data exposed by imgui
2015-06-14 16:50:19 -07:00
ocornut
d9b0daa0bc Scintilla/imgui: removed getFontInfo(), using data exposed by imgui 2015-06-14 17:31:44 -06:00
Branimir Karadžić
3d54383dd9 Fixed shader cache file path. 2015-06-14 10:03:59 -07:00
Branimir Karadžić
b2c22554dd Updated imgui. 2015-06-13 22:23:10 -07:00
Branimir Karadžić
4f356fd7da Updated shader makefile. 2015-06-12 21:10:29 -07:00
Branimir Karadžić
527ab0bcc1 shaderc: Metal fixes. 2015-06-12 15:22:01 -07:00
Branimir Karadžić
ce1b41336d shaderc: Adding metal shader type. 2015-06-12 15:08:01 -07:00
Branimir Karadžić
3dd3a86a4d Fixed amalgamated build. 2015-06-11 14:26:01 -07:00
Branimir Karadžić
85de7fa148 Fixed VS2008 build. 2015-06-11 20:16:38 -07:00
Branimir Karadžić
52cfaf0aaa Added Metal renderer backend stub. 2015-06-11 09:38:17 -07:00
Branimir Karadžić
9cae56fb96 Merge. 2015-06-10 19:46:22 -07:00
Branimir Karadžić
5cbc5d55f4 Cleanup. 2015-06-10 13:21:59 -07:00
Branimir Karadžić
a2716a3fe6 Cleanup. 2015-06-10 09:53:09 -07:00
Branimir Karadžić
cf6bcfa307 Merge pull request #432 from ocornut/imgui_scintilla_fixes
ocornut-imgui integrations: mouse wheel, render callbacks, keyboard
2015-06-10 09:20:57 -07:00
Branimir Karadžić
284b8ef65b Merge pull request #431 from attilaz/glimport
added iOS GL extension function import
2015-06-10 09:20:02 -07:00
ocornut
a3fd7b7132 Fixes for ocornut-imgui integration: keyboard keys, modifiers 2015-06-10 09:03:17 -06:00
ocornut
eccbae09b1 Fixes for ocornut-imgui integrations: mouse wheel, render callbacks 2015-06-10 08:53:50 -06:00
Kocsis Attila
e97be61a75 added iOS GL extension function import 2015-06-10 15:52:12 +02:00
Branimir Karadžić
f0b76697c5 Fixing GCC warnings. 2015-06-09 23:56:30 -07:00
Branimir Karadžić
6e6e16e2ba Pass thread exit code from app thread as process exit code. Issue #430. 2015-06-09 22:34:10 -07:00
Branimir Karadžić
b2bc9238d0 Pass thread exit code from app thread as process exit code. 2015-06-09 22:24:49 -07:00
Branimir Karadžić
ef143a1bb6 Fixed issue #429. 2015-06-09 19:57:10 -07:00
Branimir Karadžić
33de71efbd Merge pull request #428 from ocornut/imgui_scintilla_fixes
Fixes for ocornut-imgui integration
2015-06-09 16:00:29 -07:00
ocornut
4f19cdc436 Fixes for ocornut-imgui integration, handling negative scissor inputs, removed unnecessary vertex count calculation 2015-06-09 15:31:53 -06:00
Branimir Karadžić
efaa26db2a Merge pull request #427 from ocornut/imgui_scintilla_fixes
Scintilla: build with lexer enabled.
2015-06-09 14:28:07 -07:00
ocornut
cf4f43b9f5 Scintilla: build with lexer enabled. 2015-06-09 15:05:26 -06:00
Branimir Karadžić
85e6bea936 Updated script. 2015-06-08 21:16:23 -07:00
Branimir Karadžić
a510b8f347 Added Scintilla imgui. 2015-06-08 17:07:35 -07:00
Branimir Karadžić
c165fb20db Cleanup. 2015-06-08 10:41:48 -07:00
Branimir Karadžić
9ebcfab447 Cleanup. 2015-06-07 21:28:36 -07:00
Branimir Karadžić
ddf0959d35 Cleanup. 2015-06-07 21:20:55 -07:00
Branimir Karadžić
72454acc8e Cleanup. 2015-06-06 17:12:29 -07:00
Branimir Karadžić
67997930e3 Cleanup. 2015-06-06 17:13:52 -07:00
Branimir Karadžić
acfab2a171 Cleanup. 2015-06-06 16:57:43 -07:00