TheCloud/nuklear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
859 Commits 1 Branch 0 Tags
Commit Graph

859 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Doug Thayer
72b362325d Fix issue with adding multiple fonts 
The total range count grabbed from nk_range_count was being used
to get the glyph count, which resulted in a buffer over-read.
 2016-04-24 14:05:34 -07:00
Micha Mettke
05ba026b79 Merge pull request #85 from mattn/fix-error 
Fix compilation error
 2016-04-23 12:07:37 -07:00
vurtun
7fab9fbd5c Merge branch 'mmozeiko-d3d11' 2016-04-23 20:55:42 -07:00
vurtun
b86a153b33 Removed C89 errors 2016-04-23 20:54:50 -07:00
Martins Mozeiko
062032e933 Created demo using Direct3D 11 for rendering. Uses VS2015 for compiler. 
Also fixes wrong location of GlobalUnlock in GDI rendering demo.
 2016-04-23 11:20:47 -07:00
vurtun
412f65fa65 Fix #108 pushing wrong texture in empty draw_list 
Fixed a small copy & paste error which pushes the wrong texture
into an empty draw list. In normal cases this never occurs but is
still a big if used independent of libraries use cases.
 2016-04-23 16:29:58 +02:00
Micha Mettke
87efb61a9f Merge pull request #102 from mmozeiko/gdi 
Demo with Win32 GDI rendering
 2016-04-23 03:43:13 -07:00
vurtun
5da8216f71 Fixed property text input 
Inserting text into a property would cause an assert because
I forgot to set the upper bounds of the text edit inside the property.
 2016-04-23 12:28:45 +02:00
vurtun
bdbc8f9c26 Removed private underscore of nk_tree__push #106 
`nk_tree__push` was not supposed to be seen as private but more like
the more extended way of handling duplicate tree elements. But I used
double underscore which is the general indicator for private. I renamed
it know to nk_tree_push_id, to hopefully make it clearer.
 2016-04-23 10:34:50 +02:00
vurtun
e5227c5ebc Merge branch 'hobbitalastair-master' 2016-04-22 22:26:50 +02:00
vurtun
dd8ea556de Merge branch 'master' of https://github.com/hobbitalastair/nuklear into hobbitalastair-master 2016-04-22 22:25:49 +02:00
Alastair Hughes
a0710d941f Added an error message if the display can't be opened 2016-04-23 07:54:05 +12:00
Martins Mozeiko
d6ada00cb8 Created demo using Win32 GDI rendering. Uses VS2015 for compiler. 2016-04-22 01:21:19 -07:00
Martins Mozeiko
7536d0d618 Cleaning up VS2015 compiler warnings. 2016-04-21 20:55:26 -07:00
vurtun
3929ec8dee Added some additional documentation 2016-04-21 17:35:52 +02:00
vurtun
bc8db2e3f3 Fixed #97 with text input at end of edit field 
This commit fixes a bug that occurs if you move the cursor inside
text and then back to the end of the text and insert a character.
Caused was the bug by an incorrect check if the cursor is at the
end of the string.
 2016-04-21 12:39:07 +02:00
Micha Mettke
68d274c094 Merge pull request #80 from r0fls/patch-1 
Added travis-ci build badge to readme
 2016-04-21 12:25:45 +02:00
vurtun
7c9659f3b8 Fixed #99 forgot to set clipboard callbacks 
Previously if you use `nk_edit_string` and use flag
`NK_EDIT_CLIPBOARD`, callbacks were not passed. I only tested it with
`nk_edit_buffer` and set the callbacks directly. This wrong behavior
is now fixed and should work copy & paste should behave correctly.
 2016-04-21 11:04:18 +02:00
vurtun
ca4d5bad8c Fixed blurry font for examples 
Oversampling for the default font is tweaked for the default font
with height 13. I set the wrong height for all examples which should
now be fixed.
 2016-04-20 19:53:26 +02:00
vurtun
7ccd95f2f1 Reverted qsort back to own implementation 
Forgot the remove some test code for the last commit.
 2016-04-20 18:36:51 +02:00
vurtun
1d7f0244f9 Revert float '=' cond and oversample default font 
I previously used a conditional style so I don't have to compare
floats directly with eachother because of warning. This caused some
bugs and I now reverted back all conditions back to normal.
In addition I oversampled the default font to make it look better.
 2016-04-20 18:28:04 +02:00
vurtun
18b93fcc8a Fixed #90 cppcheck warning and errors 
Thanks to @codemeow I fixed some bugs and warnings found with
cppcheck. NOTE: it seems like all static analyzer fail to
detect the assert macro or hate combining assert ans if checks.
 2016-04-20 10:31:20 +02:00
vurtun
4a68332330 Merge branch 'ittner-user-default-compiler' 2016-04-20 08:47:04 +02:00
Yasuhiro Matsumoto
af5a1345d0 Fix compilation error 2016-04-20 10:46:48 +09:00
Alexandre Erwin Ittner
72e9496768 Use standard C compiler by default 
Always use the standard compiler as defined by the environment
variable CC. User can set it when a different compiler if required
(e.g. CC=clang make)
 2016-04-19 21:44:46 -03:00
Raphael Deem
4485a1f42e Added travis-ci build badge to readme 2016-04-19 15:44:11 -07:00
vurtun
092f463ea9 Added Travis CI file 2016-04-19 21:20:13 +02:00
vurtun
4d02cf9c80 Removed unused variable 2016-04-19 19:46:13 +02:00
Micha Mettke
a4e6859638 Merge pull request #75 from fdb/patch-1 
Fix a small typo in README
 2016-04-19 18:17:20 +02:00
Frederik De Bleser
d4967c0da3 Fix a small typo in README 2016-04-19 17:01:41 +02:00
Micha Mettke
2de6a021f3 Merge pull request #73 from ehmry/master 
correct type definitions without NK_INCLUDE_FIXED_TYPES
 2016-04-19 16:52:01 +02:00
vurtun
6b5a4f16e8 Merge branch 'fdb-osx-support' 2016-04-19 16:47:09 +02:00
Emery Hemingway
92f5257e92 correct type definitions without NK_INCLUDE_FIXED_TYPES 2016-04-19 15:28:44 +02:00
Frederik De Bleser
c2ea5d9927 Set OpenGL profile in SDL 
This ensures compatibility with OS X's 1.5 shader version.
 2016-04-19 14:05:59 +02:00
Micha Mettke
0aee386470 Merge pull request #71 from tversteeg/master 
Add .gitattributes file
 2016-04-19 13:56:05 +02:00
Frederik De Bleser
a88293a647 Update Allegro for OS X 2016-04-19 13:55:15 +02:00
Frederik De Bleser
da9899c618 Make examples work on OS X 
All examples use GLFW, so we update the Makefile, remove OpenGL include
headers (GLFW will include them automatically) and conditionally set a
different shader version.
 2016-04-19 13:49:07 +02:00
Frederik De Bleser
8ca1c35608 Update SDL example for OS X 
Just like GLFW example, use different settings in Makefile and
different shader versions.
 2016-04-19 13:47:17 +02:00
Frederik De Bleser
a8d124adf1 Avoid conditional includes in SDL example. 2016-04-19 13:46:06 +02:00
Frederik De Bleser
3b29a92f0d Avoid conditional includes. 
GLFW will automatically include the correct OpenGL headers, so we can
avoid having a conditional include in our code.
 2016-04-19 13:45:51 +02:00
Thomas Versteeg
a5b593034d Add .gitattributes file 
This file makes sure github doesn't confuse .c and .h files in this repository for C++ files
 2016-04-19 13:38:25 +02:00
Frederik De Bleser
26fc35ac94 Use lower shader version for better compatibility on OS X 
We just need the basic features for getting a texture on screen, so
GLSL version 1.5 is enough.
 2016-04-19 13:06:54 +02:00
vurtun
aac47632d0 Fixed #65 wrong parameter to XCreatePixmap 
I passed a depth value inside `nk_xsurf_resize` and changed it to
default value. I tested it by removing the resizing code and it
worked for me again. Hopefully this fixes the bug.
 2016-04-19 12:54:33 +02:00
vurtun
29b0fdee13 Merge branch 'waywardmonkeys-fix-typos' 2016-04-19 11:24:20 +02:00
vurtun
860fed393e Merge branch 'fix-typos' of https://github.com/waywardmonkeys/nuklear into waywardmonkeys-fix-typos 2016-04-19 11:23:31 +02:00
vurtun
acbe50caee Merge branch 'fdb-osx-support' 2016-04-19 11:18:44 +02:00
Frederik De Bleser
5b0b4c9ffd Support OS X for the GLFW demo. 
Use conditionals to support the appropriate includes and shader
versions needed for OS X.
 2016-04-19 11:02:22 +02:00
Bruce Mitchener
da46d536f9 Fix some typos. 2016-04-19 15:23:33 +07:00
vurtun
9b2822c06e Fixed #63 error and wrong header dragging calc 2016-04-19 00:35:52 +02:00
Micha Mettke
9893e1ffc0 Merge pull request #62 from angusholder/master 
Clearing up compiler warnings
 2016-04-18 22:53:45 +02:00