Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,730 Commits 1 Branch 0 Tags 98 MiB
92ca32b2f9
Commit Graph

1730 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
binary1248
6469f35d99 Fix text being rendered with a vertical offset when the font's ascent doesn't match it's size. 2014-04-22 22:06:51 +02:00
Laurent Gomila
f99bbfc534 Reviewed the sf::BlendMode class (added a constructor, made minor modifications in comments) 2014-04-22 21:37:39 +02:00
Marco Antognini
7f0f89bac9 Fixed menu shortcut not working in fullscreen (close #537) 2014-04-22 12:47:12 +02:00
Marco Antognini
c222c28aa7 Removed dead code 
AutoreleasePoolWrapper is no more used since ARC is used on Mac.
 2014-04-21 18:29:07 +02:00
Marco Antognini
52bb192cff Removed debug log forgotten in the previous commit 2014-04-21 18:15:24 +02:00
Marco Antognini
2c96d49a03 Fixed mouse tracking in fullscreen on OS X 2014-04-21 18:07:43 +02:00
Marco Antognini
2eb4f69e41 Replaced some deprecated functions on OS X 
NSWindow convertBaseToScreen: -> convertRectToScreen:
NSView   convertPointToBase:  -> convertPointToBacking:
 2014-04-21 18:07:43 +02:00
Marco Antognini
d8812f0f5c Add support for retina displays (close #353) 
Based on PR #388 by Michael Bradshaw

Convert size to match the size requested by the user.
 2014-04-21 18:06:44 +02:00
Marco Antognini
8f0037d84d Improved fullscreen support on OS X (close #343) 
No hard resolution switch is done. Instead a view of the requested
size is displayed in the center of the main screen (letter boxing).

Running a stress test showed that the performance were equal
to a hard switch without the inconvenience of resizing the
user's apps. This also follows the guidelines defined by Apple:

> Avoid changing the display resolution from that chosen by the user.

source:
https://developer.apple.com/library/mac/documentation/graphicsimaging/Conceptual/OpenGL-MacProgGuide/opengl_fullscreen/opengl_cgl.html
 2014-04-21 18:06:44 +02:00
Jonathan De Wachter
5a4b54cb9c Merge pull request #574 from jcowgill/egl-linux-fixes 
Fixed various linux compile errors in EglContext
 2014-04-21 16:31:24 +02:00
James Cowgill
86b29c539d Fixed various linux compile errors in EglContext 2014-04-21 14:42:07 +01:00
Marco Antognini
f6edb83acd Updated Xcode templates readme 
Now that cmake is used to configure the template we cannot simply copy the templates to /Library. Using cmake to build the template is mandatory.
 2014-04-20 22:07:16 +02:00
Marco Antognini
6e3103464a Fixed unused parameter warning 2014-04-20 21:55:38 +02:00
Marco Antognini
42f6e83dfb Improved cmake warning message 
Related to #572
 2014-04-20 21:45:22 +02:00
Marco Antognini
6edc4b9518 Improved cmake script: add OS X specific options only on Mac platform 2014-04-20 21:32:05 +02:00
Marco Antognini
1bfc735a9e Improved style 2014-04-20 21:22:14 +02:00
Jonathan De Wachter
a348428476 [Android] Fixed stream pointer not initialized in Font.cpp 2014-04-20 12:58:59 +02:00
Jonathan De Wachter
273ad4c9ee [Android] Adapted sensor implementation 2014-04-20 12:58:56 +02:00
Mario Liebisch
dd7a3cb30b Fixed missing JoystickImpl member on Android 2014-04-20 12:58:54 +02:00
Laurent
03acb2ad9f Fixed compile errors in SensorImpl.mm and with EGL stuff on iOS 2014-04-20 12:58:52 +02:00
Laurent Gomila
80431deef4 Reviewed the sensor API 2014-04-20 12:58:50 +02:00