admin/CSFML
1
0 Fork 0
mirror of https://github.com/SFML/CSFML.git synced 2026-10-24 13:53:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
236 Commits 13 Branches 15 Tags
05847516fd94051641ccb525df0bed050b00fe4e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Gomila 75f95202b7 Merge pull request #123 from DJMaster/master 
Comments fixed
 2017-08-28 06:22:29 +02:00
Laurent Gomila 55e03e92be Merge pull request #122 from crumblingstatue/font-missing-const 
Add missing const qualifiers to sfFont methods
 2017-03-11 11:53:07 +01:00
Laurent Gomila b5facb85d1 Merge pull request #120 from crumblingstatue/master 
Add setVirtualKeyboardVisible
 2016-11-09 22:28:37 +01:00
Laurent Gomila bca82a4c6b Merge pull request #119 from crumblingstatue/master 
Inline the functions in ContextSettingsInternal
 2016-11-05 16:44:39 +01:00
Laurent Gomila 8ec6eb094f Merge pull request #117 from crumblingstatue/master 
Add sRgbCapable field to sfContextSettings
 2016-10-31 14:32:43 +01:00
Laurent Gomila 1226d9db94 Merge pull request #114 from crumblingstatue/context-get-settings 
Add missing sfContext_getSettings
 2016-10-25 17:27:07 +02:00
Laurent Gomila dbc7147b47 Merge pull request #113 from crumblingstatue/master 
Have sfContext_setActive return sfBool instead of void
 2016-10-25 14:00:49 +02:00
Laurent Gomila 4d35e0a91c Merge pull request #112 from SFML/bugfix/bumpversion 
Bump version number in Config.h
 2016-10-09 19:28:15 +02:00
Laurent Gomila 2aee52d65f Merge pull request #109 from DJMaster/patch-1 
Added missing headers separator
 2016-10-04 06:22:52 +02:00
Laurent Gomila f512854b54 Merge pull request #107 from DJMaster/master 
SFML\Graphics\PrimitiveType.h Typo fix
 2016-10-01 14:59:07 +02:00
Laurent Gomila 2017578197 Merge pull request #106 from dabbertorres/2.4 
Correct #105 and bump CMakeLists.txt version
 2016-10-01 09:15:20 +02:00
Laurent Gomila e4e1bcb139 Merge pull request #104 from crumblingstatue/master 
Add missing header for size_t in Shader.h
 2016-09-29 13:40:01 +02:00
Laurent Gomila 0e8c6379f0 Merge pull request #102 from dabbertorres/2.4 
Update to 2.4
 2016-09-29 11:17:42 +02:00
Laurent Gomila 8a7ba8ae8e Merge pull request #101 from DJMaster/audio-patch 
Added return value to function sfSoundBufferRecorder_start
 2016-08-18 22:30:19 +02:00
Laurent Gomila 14653882ae Merge pull request #103 from DJMaster/doxyfile-patch 
Removed MSCGEN_PATH local settings
 2016-08-13 09:13:19 +02:00
Laurent Gomila 74220430ea Merge pull request #95 from WillyGoat95/patch-1 
Fixed typo in readme
 2016-03-24 07:36:02 +01:00
Laurent Gomila 92fb5f6dc8 Merge pull request #94 from SFML/bugfix/sound_copypaste_debug_fix 
Corrected typo from copy-paste mistake...
 2015-11-27 16:11:21 +01:00
Laurent Gomila ee9b927dec Merge pull request #84 from SFML/feature/doc_fix 
Renamed documentation output file to CSFML.chm
 2015-06-02 07:34:05 +02:00
Laurent Gomila 9f4c4abaca Merge pull request #77 from Gyscos/master 
Use size_t instead of unsigned int to follow SFML change
 2015-05-02 10:12:59 +02:00
Laurent Gomila 4069448128 Merge pull request #78 from BlaXpirit/feature/color_subtract 
Added subtract function for Colors
 2015-05-01 22:21:06 +02:00
Laurent Gomila f3153dc9c1 Merge pull request #79 from SFML/feature/precise_mouse_events 
Added support for the MouseWheelScrolled event
 2015-05-01 22:20:19 +02:00
Laurent Gomila 1486a30e2f Merge pull request #74 from LaurentGomila/feature/gl_improvements 
Added support for context creation flags and texture/shader native handles
 2015-03-31 15:08:25 +02:00
Laurent Gomila 78eea7face Merge pull request #76 from LaurentGomila/bugfix/missing_headers 
Added missing headers to the general headers
 2015-03-30 22:42:52 +02:00
Laurent Gomila 2ca7fbfb61 Merge pull request #71 from LaurentGomila/feature/color_int_ctor 
Added the ctor to create a sfColor from an sfUint32
 2015-03-22 22:39:29 +01:00
Laurent Gomila 0fe078ec8a Merge pull request #72 from LaurentGomila/feature/partial_send 
Added support for patial TCP sends
 2015-03-22 18:41:29 +01:00
Laurent Gomila 10d785df80 Merge pull request #73 from LaurentGomila/bugfix/sample_count_type 
Changed getSampleCount return type to sfUint64 to better match SFML
 2015-03-22 18:40:39 +01:00
Laurent Gomila 57d3ee0d89 Merge pull request #69 from jcowgill/fix-conversion-null 
Fix pointer conversion warning when compiling without NDEBUG on Linux
 2015-03-04 18:45:04 +01:00
Laurent Gomila 141fbf55f6 Merge pull request #53 from eXpl0it3r/feature/version_2.2 
Updated CSFML's version to 2.2.0.
 2015-03-03 21:33:04 +01:00
Laurent Gomila 944b267262 Merge pull request #67 from BlaXpirit/master 
Remove non-ASCII symbols in Sensor.h
 2015-02-27 17:52:57 +01:00
Laurent Gomila caf9aba55e Merge pull request #68 from zsbzsb/update/touch_get_position_renderwindow 
Added sfTouch_getPositionRenderWindow(...) function
 2015-02-27 17:51:40 +01:00
Laurent Gomila 7c6e4e64b5 Merge pull request #66 from zsbzsb/bugfix/get_device_return 
Fixed wrong macro usage preventing debug compilation
 2015-02-26 20:33:14 +01:00
Laurent Gomila 91a09b3ce5 Merge pull request #65 from zsbzsb/feature/sensor_touch_events 
Added support for sensor and touch events
 2015-02-26 19:51:46 +01:00
Laurent Gomila a499927784 Merge pull request #63 from zsbzsb/feature/touch_api 
Added touch API
 2015-02-26 15:17:43 +01:00
Laurent Gomila fb1824b3b0 Merge pull request #62 from zsbzsb/feature/sensor_api 
Added sensor API
 2015-02-26 14:09:30 +01:00
Laurent Gomila c1873e4499 Merge pull request #64 from zsbzsb/update/copyright_year 
Fixed a few last old copyright years and email
 2015-02-26 07:49:56 +01:00
Laurent Gomila b7b2ed5d34 Merge pull request #61 from zsbzsb/update/copyright_year 
Updated copyright year and email
 2015-02-25 09:41:44 +01:00
Laurent Gomila 15009493e0 Merge pull request #60 from BlaXpirit/patch-1 
Added HTTP methods
 2015-02-24 22:57:41 +01:00
Laurent Gomila a7ff14c407 Merge pull request #59 from zsbzsb/feature/joystick_identification 
Added support for joystick identification
 2015-02-24 20:20:59 +01:00
Laurent Gomila e10f7caecb Merge pull request #58 from zsbzsb/feature/fontinfo_struct 
Added support for the Font::Info struct
 2015-02-24 16:56:10 +01:00
Laurent Gomila 4789261e1e Merge pull request #57 from zsbzsb/feature/sound_recorder 
Updated sfSoundRecorder
 2015-02-24 15:19:14 +01:00
Laurent Gomila 6fa1212560 Merge pull request #56 from zsbzsb/feature/underline 
Added underline functions to sfFont
 2015-02-24 08:40:11 +01:00
Laurent Gomila 302048d29e Merge pull request #55 from eXpl0it3r/bugfix/readme 
Updated the readme.txt and added a comment about FindSFML.cmake.
 2015-01-06 16:28:19 +01:00
Laurent Gomila 2a2951e608 Merge pull request #51 from FRex/master 
Added extern "C" inside ifdef __cplusplus to allow including and linking CSFML correctly in C++.
 2015-01-02 17:23:54 +01:00
Laurent Gomila 848b4d3aaa Merge pull request #49 from delehef/master 
Compile with OS X 10.10
 2014-11-22 23:09:56 +01:00
Laurent Gomila 8de6cde2d1 Merge pull request #48 from zsbzsb/feature/window_focus 
Added methods to check and request window focus
 2014-10-09 22:48:24 +02:00
Laurent Gomila d105eded16 Merge pull request #47 from zsbzsb/update/font_metrics 
Changed the font metrics to return floats instead of ints
 2014-10-09 17:30:19 +02:00
Laurent Gomila 59a7060088 Merge pull request #46 from zsbzsb/feature/strike_through 
Added text strikethrough and updated the style documentation
 2014-10-09 17:30:05 +02:00
Laurent Gomila c0b80724b4 Merge pull request #45 from zsbzsb/update/copyright_year 
Updated copyright year
 2014-10-03 07:58:12 +02:00
Laurent Gomila 9a2c8d0ecb Merge pull request #43 from zsbzsb/feature/processing_interval 
Updated CSFML to support sf::SoundRecorder::setProcessingInterval(...)
 2014-09-05 21:12:48 +02:00
Laurent Gomila b790fbd28f Merge pull request #42 from zsbzsb/feature/up_vector 
Updated CSFML to match the changes related to the up vector changes
 2014-09-05 20:33:16 +02:00
Laurent Gomila 42c2fb1f5c Merge pull request #39 from ResponSySS/patch-1 
Give a name to window style enum
 2014-06-22 15:28:14 +02:00
Laurent Gomila 2a1a11ca4b Merge pull request #38 from zsbzsb/master 
Updated CSFML to match the blending mode changes
 2014-06-10 13:40:40 +02:00
Laurent Gomila 8478569b4b Merge pull request #37 from zsbzsb/link_dynamically 
Added CMake option to link dynamically
 2014-06-06 23:24:55 +02:00
Laurent Gomila a6fdf83073 Merge pull request #36 from zsbzsb/master 
Removed export macros in the function definitions
 2014-04-11 08:32:55 +02:00
Laurent Gomila 4b4d84da0b Merge pull request #35 from eXpl0it3r/master 
Renamed a few missed variables when the config filehad been updated.
 2014-04-11 08:32:21 +02:00
Laurent Gomila bc9ae12596 Added missing include in CMake file 2013-11-24 20:27:42 +01:00
Laurent Gomila 6669a6590a Updated build files to reflect the latest changes in SFML 2013-11-04 22:39:52 +01:00
Laurent Gomila 85a648ccc6 Removed useless line in build scripts 2013-09-02 17:41:18 +02:00
Laurent Gomila bd0faf69c5 Updated version number 2013-07-21 09:30:53 +02:00
Laurent Gomila 91e11cc095 sfTcpListener_accept now returns a null pointer when it fails 2013-07-09 15:46:17 +02:00
Laurent Gomila 12b7c5a6a5 Updated links in readme.txt 2013-06-26 23:31:12 +02:00
Laurent Gomila acfb53c8d5 Merge pull request #25 from krepa098/master 
Added sfRenderTexture_set/isRepeated
 2013-06-01 10:38:54 -07:00
Laurent Gomila c7cabf8fb2 Added readme.txt to the install rules 2013-05-03 13:32:17 +02:00
Laurent Gomila f06b95526c Updated the documentation stylesheet 2013-04-25 21:40:56 +02:00
Laurent Gomila 7aab9a20d1 Updated the website links in readme.txt 2013-04-06 09:56:19 +02:00
Laurent Gomila 7535e03679 Updated the year in the copyright notice 2013-04-06 09:37:28 +02:00
Laurent Gomila 85db0634e5 Added functions to set the title of sfWindow/sfRenderWindow with a UTF-32 string 2013-03-24 12:25:09 +01:00
Laurent Gomila 2ec849d7b9 Added a compile flag to hide stupid VC++ warnings 2013-03-24 12:17:44 +01:00
Laurent Gomila 44288a186c Updated sfShader_bind and sfTexture_bind 2013-01-08 22:25:05 +01:00
Laurent Gomila de75c6a122 The Xxx_copy functions now take a const pointer 2012-12-08 13:53:57 +01:00
Laurent Gomila 8c9f98f17e Updated the main page of the API documentation 2012-12-02 23:14:21 +01:00
Laurent Gomila b2409bee14 Minor correction in API doc 2012-11-21 21:49:12 +01:00
Laurent Gomila 3277479584 Renamed convertCoords to mapPixelToCoords, and added its inverse mapCoordsToPixel 2012-11-10 10:49:49 +01:00
Laurent Gomila 00bd5c9a22 Renamed sfFtpListingDirectory_getFilename() to getName() 2012-10-26 17:10:21 +02:00
Laurent Gomila cc8637f65c Removed sfShader_unbind 2012-10-20 23:44:01 +02:00
Laurent Gomila 53f5e263a2 Correction in API documentation 2012-10-16 23:18:50 +02:00
Laurent Gomila 4310a05d67 Minor corrections in the API documentation 2012-10-11 11:07:19 +02:00
Laurent Gomila 65c8bfc655 Added overloads of sfMouse_getPosition and sfMouse_setPosition for sfRenderWindow 2012-10-06 00:13:10 +02:00
Laurent Gomila a74e57bcd4 Minor corrections in the API documentation 2012-10-05 18:04:42 +02:00
Laurent Gomila 1dd4f6484d Minor fix in API documentation 2012-10-03 20:21:21 +02:00
Laurent Gomila 5a60afa475 Typedef'd structures in Event.h 2012-09-29 22:39:34 +02:00
Laurent Gomila 9ee38bd681 Made SFML global objects "const" 2012-09-29 14:52:01 +02:00
Laurent Gomila 8f89740308 Merge pull request #10 from lmbarros/master 
Fixed sfFtp_connect() signature.
 2012-09-22 09:32:28 -07:00
Laurent Gomila d7240abb18 Removed the default font 2012-08-03 23:53:48 +02:00
Laurent Gomila 0757c89d7c Minor correction in API documentation 2012-07-10 20:22:35 +02:00
Laurent Gomila fe6c23f26f Added the sfKeyUnknown key code 2012-07-09 23:30:43 +02:00
Laurent Gomila 56d1db8b45 Added missing HTTP codes 2012-07-09 18:50:06 +02:00
Laurent Gomila 8e856b00b4 Added missing sfImage* argument in sfImage_createMaskFromColor 2012-06-26 22:07:52 +02:00
Laurent Gomila 046d415f98 Fix compiler errors in debug 2012-06-17 09:34:14 +02:00
Laurent Gomila 7e9321e57c Added missing include 2012-05-31 21:43:20 +02:00
Laurent Gomila 5aab13ca8d Added missing include of Http.h and Ftp.h to Network.h 2012-05-24 07:55:49 +02:00
Laurent Gomila 8f722ad0fc Fixed enum declaration errors (C++ style) in sfHttp and sfFtp 2012-05-24 07:55:30 +02:00
Laurent Gomila bfebe0aab4 sfTransform is no longer a wrapper around a sf::Transform*, it is a simple structure 2012-05-22 17:56:01 +02:00
Laurent Gomila bf614690ad Some functions were still using the old naming convention 2012-05-01 20:21:00 +02:00
Laurent Gomila d1b0c2221b Fixed bad prototype of sfMusic_setPlayingOffset 2012-04-30 17:45:43 +02:00
Laurent Gomila c581a975ed Added missing include of Sprite.h in Graphics.h 2012-04-24 17:37:26 +02:00
Laurent Gomila 1bfc30eafb Fixed function names in the documentation's code sample 2012-04-12 22:16:39 +02:00
Laurent Gomila e32420b01f The API documentation is now built by default with all other targets 2012-04-06 22:49:54 +02:00
Laurent Gomila ad035ec09d Replaced char* arguments for raw data with void* 2012-04-03 19:11:19 +02:00
Laurent Gomila 9554c00851 Fixed compile error in debug mode 2012-03-31 22:46:09 +02:00