admin/CSFML
1
0 Fork 0
mirror of https://github.com/SFML/CSFML.git synced 2026-10-24 21:53:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
146 Commits 13 Branches 15 Tags
2.2
Commit Graph
146 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Gomila 141fbf55f6 Merge pull request #53 from eXpl0it3r/feature/version_2.2 
Updated CSFML's version to 2.2.0.
2.2 		2015-03-03 21:33:04 +01:00
Lukas Dürrenberger aad6f7b2d1 Updated CSFML's version to 2.2.0. 2015-02-28 11:25:49 +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
Zachariah Brown 109a02c829 Added sfTouch_getPositionRenderWindow(...) function 2015-02-26 21:30:37 -05:00
Oleh Prypin d849c0eae5 Removed non-ASCII symbols in Sensor.hpp 
https://github.com/LaurentGomila/SFML/issues/806
 2015-02-27 01:52:51 +02: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
Zachariah Brown 93dd72dc26 Fixed wrong macro usage preventing debug compilation 2015-02-26 14:27:52 -05: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
Zachariah Brown 7c5a55746a Added support for sensor and touch events 2015-02-26 12:00:22 -05:00
Laurent Gomila a499927784 Merge pull request #63 from zsbzsb/feature/touch_api 
Added touch API
 2015-02-26 15:17:43 +01:00
Zachariah Brown 4cc30a1f21 Added touch API 2015-02-26 09:05:41 -05:00
Laurent Gomila fb1824b3b0 Merge pull request #62 from zsbzsb/feature/sensor_api 
Added sensor API
 2015-02-26 14:09:30 +01:00
Zachariah Brown 1193ded996 Added sensor API 2015-02-26 07:57:12 -05: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
Zachariah Brown 6ca48631aa Fixed a few last old copyright years and email 2015-02-25 11:56:03 -05: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
Zachariah Brown f532c0dc98 Updated copyright year and email 2015-02-24 18:17:39 -05:00
Laurent Gomila 15009493e0 Merge pull request #60 from BlaXpirit/patch-1 
Added HTTP methods
 2015-02-24 22:57:41 +01:00
Oleh Prypin 2636bec9a1 Added HTTP methods 2015-02-24 22:51:20 +02: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
Zachariah Brown 0e6c07a149 Added support for joystick identification 2015-02-24 12:03:32 -05: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
Zachariah Brown 9f4120faf4 Added support for the Font::Info struct 2015-02-24 10:41:32 -05:00
Laurent Gomila 4789261e1e Merge pull request #57 from zsbzsb/feature/sound_recorder 
Updated sfSoundRecorder
 2015-02-24 15:19:14 +01:00
Zachariah Brown 58781d458e Updated SoundRecorder to support multiple recording devices 2015-02-24 09:03:31 -05: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
Zachariah Brown 62188c38ec Added missing get underline thickness and position functions 2015-02-23 21:01:39 -05:00
Zachariah Brown 6667deca6f Removed excessive documentation to remain more consistant with the rest of the code base 2015-02-23 20:59:55 -05: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
Lukas Dürrenberger c8b2e62da0 Updated the readme.txt and added a comment about FindSFML.cmake. 2015-01-06 16:17:01 +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
FRex 29382a4492 Added checks for __cplusplus so that CSFML can be used in C++. 2015-01-02 02:12:52 +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
Franklin Delehelle 31ac05d8f4 Compile with OS X 10.10 
Fixes the OS X version detection regex to allow compiling under OS X
10.10+.
 2014-11-22 18:44:40 +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
Zachariah Brown 766398d86e Added methods to check and request window focus 2014-10-09 15:23:25 -04: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
Zachariah Brown 1f8b022d17 Changed the font metrics to return floats instead of ints 2014-10-09 09:35:37 -04:00
Zachariah Brown 1529d3fa34 Added text strikethrough and updated the style documentation 2014-10-09 09:05:03 -04:00
Laurent Gomila c0b80724b4 Merge pull request #45 from zsbzsb/update/copyright_year 
Updated copyright year
 2014-10-03 07:58:12 +02:00
Zachariah Brown fdf58188ca Updated copyright year 2014-09-08 08:19:33 -04: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
Zachariah Brown 87d69530a0 Updated CSFML to support sf::SoundRecorder::setProcessingInterval(...) 2014-09-05 14:52:22 -04: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
Zachariah Brown 6abeaed4aa Updated CSFML to match the changes related to the up vector changes 2014-09-05 14:26:10 -04: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
ResponSyS ed44d9e0db Give a name to window style enum 
Window style sfUint32 enum was unnanmed, which made it hard to find in the documentation.
 2014-06-22 15:23:15 +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