mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-27 22:01:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,401 Commits 57 Branches 18 Tags 134 MiB
7345d08d9c
Commit Graph

3401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
binary1248
bdcdfffe11 Replaced Text underline offset/thickness with nicer font dependent values. 2014-06-12 00:49:23 +02:00
binary1248
da79517b36 Fix bitmap font resize failing silently when resizing to an unsupported pixel size (#448), fixed getKerning returning scaled values even for bitmap fonts. 2014-06-12 00:49:23 +02:00
rafoudiablol
0124ad0a85 Show error message everytime a shader uniform's location can't be found. 
Adjusted code style (TankOs).

Original commit message by the author:
  Show only 1 once the message "Parameter not found"

Conflicts:
  src/SFML/Graphics/Shader.cpp
 2014-06-11 14:43:28 +02:00
Stefan Schindler
228038fa8a Check socket descriptor limit. #153 
When calling select(), there's an upper limit for the socket descriptor
which is defined as FD_SETSIZE. When the socket descriptor is higher
than FD_SETSIZE, a call to select() will not work as expected, at least
for the proper sockets.

This patch adds an error message for this case.
 2014-06-11 14:35:15 +02:00
Mario Liebisch
159176f5ba [Android] Fixed TouchBegan reporting wrong coordinates 
* So far `sf::Event::TouchBegan` always reported the coordinates of the
first pointer/finger.
 2014-06-10 10:15:41 +02:00
Stefan Schindler
9690a7edee Fixed minor documentation issue. 2014-06-06 13:09:25 +02:00
Lukas Dürrenberger
265c411c39 Merge branch 'bugfix/osx-implementation' 2014-06-04 11:48:31 +02:00
Marco Antognini
46be2159cb Fixed OS X implementation of sf::Mouse::(get|set)Position 
The code was not updated at all when support for retina display was introduced.
 2014-06-01 20:07:24 +02:00
Jan Haller
bc1127da5b Output error message and abort program when XOpenDisplay() fails 
Fixes issue #508.

When the X11 display could not be opened, the application crashed without notice. Now, a meaningful error message is output to std::err() and std::abort() is called, causing immediate program termination.
 2014-05-28 12:05:46 +02:00
Marco Antognini
5912d205d3 Removed a dead store in sf::Ftp implementation 2014-05-28 11:18:39 +02:00
Marco Antognini
4f2c6c4489 Fixed potential memory leaks on OS X 
And renamed create* methods to new* to follow more closely Objective-C
naming convention regarding memory management.
 2014-05-28 11:18:38 +02:00
binary1248
1dae89a8e0 Moved glClientActiveTexture and glActiveTexture calls before glEnable(GL_TEXTURE_2D) to make sure texture unit 0 gets affected. (#523) 2014-05-27 10:56:11 +02:00
Mario Liebisch
ff869777a9 Fixed building for OpenGL ES 1.1 platforms 
* Added proper extension handling for `glBlendEquation` and related
  constants (required for OpenGL ES 1.1).
 2014-05-27 10:23:09 +02:00
Remco van Oosterhout
3fa1d0e03d Fixed issue where the viewport's width and/or height could be off by 1 pixel 
Signed-off-by: Stefan Schindler <stefan@boxbox.org>
 2014-05-27 09:14:00 +02:00
Joshua Adam Reisenauer
0375d7588f Fixed soundbuffer contents not being able to be updated when still attached to sounds (#354), sounds now detach from their buffer when it is reset. Signed-off-by: binary1248 <binary1248@hotmail.com> 2014-05-26 23:39:07 +02:00
binary1248
e6b5ce1f27 Make sure texture unit 0 is active when reseting RenderTarget states (#523), fix RenderTarget not clearing when a texture used as a RenderTexture color attachment is left bound in a different context (http://en.sfml-dev.org/forums/index.php?topic=9350.0). 2014-05-26 22:50:44 +02:00
Marco Antognini
3f61214571 Improved OS X implementation 
It makes sure the notifications sent to SFOpenGLView are only from its window.
 2014-05-26 15:37:33 +02:00
Marco Antognini
7d4235a38f Optimised OS X implementation regarding scaling factor 
This also adds support for changing the screen profile or moving the window to another screen.
 2014-05-26 15:37:09 +02:00
Lukas Dürrenberger
a3ab6efa23 Fix application crash when calling Shader::isAvailable() #608. 2014-05-23 10:44:10 +02:00
Marco Antognini
2215f55ef9 Moved more responsibilities to SFOpenGLView 
These changes will ease the implementation of mouse grab (#394)
 2014-05-23 09:52:18 +02:00
Marco Antognini
aa47dd5d33 Removed old documentation that doesn't apply anymore 2014-05-23 09:52:18 +02:00
Marco Antognini
7ae381533e Improved CMake script 
* Instead of configuring Xcode templates directly to /Library the files are first saved in CMAKE_CURRENT_BINARY_DIR
 * This avoid running CMake as root on some systems
 2014-05-23 09:52:18 +02:00
Marco Antognini
6c802952fb Added config of Xcode templates according to CMAKE_OSX_ARCHITECTURES 2014-05-23 09:52:18 +02:00
Marco Antognini
ea0364d568 Renamed INSTALL_XCODE4_TEMPLATES to INSTALL_XCODE_TEMPLATES 
Templates are compatible with versions 4 and 5 of Xcode.
 2014-05-23 09:52:18 +02:00
Marco Antognini
2d08ed684b Removed unnecessary check in cmake regarding the deployment target 
* Setting CMAKE_OSX_DEPLOYMENT_TARGET to something implies setting CMAKE_OSX_SYSROOT too
 * The default values are enough for most users
 * If someone is trying to compile SFML with 10.6 SDK it will simply fail later anyway
 2014-05-23 09:52:18 +02:00
Marco Antognini
6e01d1fde7 Improved style of Cocoa example 2014-05-23 09:52:18 +02:00
Marco Antognini
6a5391c0b6 Fixed warnings in Cocoa example 2014-05-23 09:52:18 +02:00
Marco Antognini
e33e061e96 Replaced deprecated functions on OS X 10.9 2014-05-23 09:52:17 +02:00
Marco Antognini
b9f5f19f7c Reverted OS X implementation to non-ARC 
* Apparently, there were some leaks not reported as such
 * Support for 32 bits computer is restored
 * Fix memory leak in sfStringToNSString (related to #484)
 * Unapply context when closing the window, freeing memory

The following commits are related to ARC modifications:

 * 42f6e83dfb
 * 6edc4b9518
 * f6c94451fb
 * 324d4a18e7
 * 0d47056132

Commit ac28902b57 is the last one before the introduction of ARC.
 2014-05-23 09:52:17 +02:00
Laurent Gomila
a8ab8fb061 Removed unused duplicate code 2014-05-22 22:53:20 +02:00
binary1248
1fe22e24d0 Fix the case where not having created a GlResource prior to calling Shader::isAvailable() would break context management. (#211) 2014-05-22 11:53:58 +02:00
firefly2442
749cbb2ff8 add HTTP support for PUT and DELETE 
Signed-off-by: binary1248 <binary1248@hotmail.com>
 2014-05-22 10:45:19 +02:00
Stefan Schindler
5250cc97d5 Updated glext, removed glxext. 
Removed glxext in favor of the system version.
 2014-05-13 15:17:01 +02:00
Marco Antognini
44a192d9b1 Merge pull request #596 from Ceylo/bugfix/595_OSXFrameworkCreation 
#595 Fix build of the SFML target on OS X with Xcode

Nevertheless, Xcode generator is not officially supported by SFML
 2014-05-13 14:55:31 +02:00
binary1248
c45039e907 Removed vertical tab support from Text (#442). 2014-05-13 10:40:38 +02:00
Lucas SOLTIC
2e09dd225b Fix build of the SFML target on OS X with Xcode 2014-05-13 00:21:39 +02:00
Lukas Dürrenberger
83951d1cae Merge pull request #586 from LaurentGomila/feature/no_travis 
Removed Travis CI config.
 2014-05-12 09:09:31 +02:00
Stefan Schindler
47913ee0aa Removed Travis CI config. 2014-05-12 08:49:53 +02:00
Jan Haller
0c3d361ceb Fixed problem with wrongly initialized sf::RenderStates::Default 
This static variable depended on the global variable sf::BlendAlpha, which may not be constructed yet.
 2014-05-01 00:39:57 +02:00
Jan Haller
cdf32a7881 Merge branch 'blendmodes' 
Introduces the sf::BlendMode class that supports separate blend functions and equations.
Replaces the old sf::BlendMode enum.

Further changes:
* Fixed merge conflicts resulting from GLExtensions in mobile branch
* GLExtensions: Added GLEXT_blend_equation_separate
* Added file BlendMode.cpp
* Replaced occurrences of sf::BlendMode value parameters with const-references
* Adapted rendering code in sf::RenderTarget
 2014-04-26 19:43:36 +02:00
Laurent Gomila
b7c536c710 Merge pull request #578 from jcowgill/freebsd-debian 
Fix Config.hpp so SFML compiles on Debian kFreeBSD
 2014-04-25 18:19:40 +02:00
James Cowgill
b188814937 Fix Config.hpp so SFML compiles on Debian FreeBSD 2014-04-25 15:41:47 +01:00
Laurent Gomila
597d133dcb Merge pull request #577 from AMDmi3/freebsd-fixes 
Freebsd fixes
 2014-04-25 16:28:14 +02:00
Dmitry Marakasov
27eadf2a7c Properly handle pkgconfig files on FreeBSD 2014-04-25 17:54:11 +04:00
Dmitry Marakasov
f1431e416c Use common unix sensor implementation on FreeBSD 2014-04-25 17:46:15 +04:00
Dmitry Marakasov
208164898b Don't use udev on FreeBSD 2014-04-25 17:45:49 +04:00
Jan Haller
3a7b425fb7 Improved sf::Http documentation concerning HTTPS 2014-04-23 19:31:31 +02:00
Marco Antognini
efe4354bc5 Improved resizing windows on OS X (close #474) 
sf::Window::setSize will fire a resize event if the view could not be created at the requested size.
 2014-04-23 13:14:42 +02:00
Marco Antognini
1ce8a42954 Merge pull request #548 from jdpage/master 
Adjust CMake module to provide correct deps on OSX
 2014-04-23 11:08:19 +02:00
Laurent Gomila
ee336a3037 Merge pull request #576 from binary1248/text_fix 
Fix text being rendered with a vertical offset when the font's ascent doesn't match it's size.
 2014-04-22 22:41:25 +02:00