mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-30 07:11:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,807 Commits 55 Branches 18 Tags 134 MiB
4c8b770992
Commit Graph

2807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
binary1248
7defb17e8c Made a few functions in Texture and Shader a bit more thread-safe. 2014-08-13 08:44:48 +02:00
Maximilian Wagenbach
713407e159 Fixed a bug where calling Texture::getMaximumSize() before any GlResource is created would break context management. 2014-08-13 07:25:12 +02:00
STU
6ad7b21203 Fix a bug in the font system. 
When the finding a rectangle for a glyph at a particular character size,
if the glyph happens to be wider than the current texture size, but less
high than the unused height in the texture, the texture will not be
correctly doubled in size (since only the height is checked).

In practice, this only occurs when finding the rectangle for the *very
first* glyph (so the texture is at its default 128x128 size): otherwise,
the glyph would need to be unusually wide compared to its height to
trigger the bug.

This will trigger a debug assertion in Texture::update(). With assertions
disabled, there are knock-on effects and most text at that character size
will fail to render.
 2014-08-12 10:52:39 +02:00
Lukas Dürrenberger
7ace90986b Merge branch 'bugfix/winxp_stack_align' 2014-08-12 09:45:59 +02:00
Laurent Gomila
386f56d6a4 Merge pull request #673 from arnolddumas/master 
No space before exclamation mark.
 2014-08-03 22:47:23 +02:00
Arnold Dumas
700c2e3823 I missed one exclamation mark in the previous commit. 2014-08-03 21:18:27 +02:00
Arnold Dumas
1fa2ff0458 No space before exclamation mark. 2014-08-03 20:44:38 +02:00
Laurent Gomila
83e019e7d3 Fixed order of dependent libraries (SFML_DEPENDENCIES variable) in FindSFML.cmake 2014-07-26 21:01:17 +02:00
Jonathan De Wachter
ca77ea58d0 Merge pull request #646 from MarioLiebisch/android-keyevents 
[Android] Rewrote key event handling
 2014-07-24 12:20:18 +02:00
Mario Liebisch
621793a354 [Android] Rewrote key event handling 
* This fixes duplicate TextEntered events and should properly handle
`AKEY_EVENT_ACTION_MULTIPLE` (including key down and key up events; as
far as possible; see comment). Unfortunately I don't have/know any IME
utilizing this, so can't test it.
* The back button is now mapped to the Escape key (best match without
adding new keys).
* The volume buttons are no longer intercepted by SFML and no longer
generate events.
 2014-07-24 11:00:59 +02:00
Jonathan De Wachter
3f69629d0c Merge branch 'android_improvements' 2014-07-24 10:05:09 +02:00
Jonathan De Wachter
f7561f5fa1 Fixed EGL surface not recreated in the right thread 2014-07-24 10:04:27 +02:00
Jonathan De Wachter
796c87295c Improved readability of ?: operator 2014-07-24 08:35:23 +02:00
Foaly
5f3b6cb57a Added a strikethrough text style to sf::Text. Fixes issue #243. 2014-07-18 13:57:57 +02:00
binary1248
520025d904 Fixed a crash caused by the stack being unaligned when entering ThreadImpl::entryPoint if compiled by GCC or clang and run on Windows XP 32-bit. (#412) 2014-07-13 09:22:25 +02:00
Laurent Gomila
337df1ea5f Merge branch 'master' of github.com:LaurentGomila/SFML 2014-07-11 17:43:50 +02:00
Laurent Gomila
8db958042e Improved documentation of SoundStream::onGetData (#650) 2014-07-11 17:43:18 +02:00
Jonathan De Wachter
0a64da654c Merge pull request #656 from MarioLiebisch/android-nosurface-display 
[Android] Don't try to display without a surface
 2014-07-08 18:03:42 +02:00
Jonathan De Wachter
f491e94297 [Android] Redirect error messages to logcat by default 2014-07-08 17:59:33 +02:00
Lukas Dürrenberger
e625d79a04 Merge branch 'bugfix/soundstream' 2014-07-07 09:44:45 +02:00
Mario Liebisch
e73e408885 [Android] Don't try to display without a surface 
* Android apps would still try to call `eglSwapBuffers()` even though
they don't have a valid surface right now (i.e. due to being inactive/in
background).
 2014-07-05 18:42:41 +02:00
binary1248
57941c1696 Fixed invoking a virtual method (onSeek) in the destructor of SoundStream. 2014-07-05 16:19:30 +02:00
binary1248
74e425a9ed Made sure SoundStream adhered to its documented behavior, added a hint to SoundStream and Sound documentation regarding setting the offset while stopped. 2014-07-04 22:24:48 +02:00
Foaly
09aae0240d Fixed calling SoundStream::setPlayingOffset() unpausing a paused SoundStream (#203), guard m_isStreaming by a mutex, fixed calling SoundStream::pause() before the stream thread starts not properly pausing the stream (http://en.sfml-dev.org/forums/index.php?topic=15197.0), minor documentation fix in SoundStream. Signed-off-by: binary1248 <binary1248@hotmail.com> 2014-07-04 20:48:23 +02:00
binary1248
362a590454 Fixed FTP download and upload file sizes being limited by available RAM (#565). 2014-07-04 20:40:18 +02:00
Jan Haller
1851dcb109 Clarified Window::setIcon() ownership semantics 2014-07-03 14:08:13 +02:00
Laurent Gomila
471873dff9 Fixed typo in the sfml-graphics CMake file 2014-07-03 08:01:44 +02:00
Jonathan De Wachter
dd6b54d0eb [Android] Forgot to add two lines to the previous commit 2014-06-26 07:55:49 +02:00
Jonathan De Wachter
c462f7cd0a [Android] Got rid of the unnecessary additional event container 2014-06-26 07:33:03 +02:00
Jonathan De Wachter
57ca180d8d [Android] Hide status and navigation bar only if the fullscreen flag is on 2014-06-26 07:32:44 +02:00
Jonathan De Wachter
73008293ba Window style constraints are handled differently on mobile OSes 2014-06-26 05:22:49 +02:00
Jonathan De Wachter
cf52687203 [Android] onCreate nows waits for sf::Window to be created 2014-06-26 05:15:25 +02:00
Jonathan De Wachter
fb81ddfdcb [Android] VideoMode::getDesktopMode() returns the physical scren size in pixels 2014-06-26 04:56:06 +02:00
Jonathan De Wachter
d73418261b [Android] Do not hardcode java const values (JNI) 2014-06-24 07:40:16 +02:00
Jonathan De Wachter
ed7c80f6bb [Android] No longer force people to have debug version installed 2014-06-24 06:39:11 +02:00
Jonathan De Wachter
a06ecb0c7f [Android] Changed APP_PLATFORM value to android-9 in Application.mk 2014-06-21 21:31:21 +02:00
Jonathan De Wachter
9e3b466ee0 [Android] Fixed <uses-sdk> appears after <application> tag warning 2014-06-21 21:31:21 +02:00
Jonathan De Wachter
06b73f36bd [Android] Updated target SDK version to 19 2014-06-21 21:30:58 +02:00
Jonathan De Wachter
e726c24de4 [Android] Avoid hardcoding the debug mode in AndroidManifest.xml 2014-06-21 21:30:58 +02:00
Jonathan De Wachter
3e9f842e59 [Android] Workaround transparency issues on some Android devices 2014-06-21 21:30:58 +02:00
Jonathan De Wachter
b542785ed9 [Android] Keep the screen turned on and bright 2014-06-21 21:30:58 +02:00
Jonathan De Wachter
f0345d5201 [Android] Hide the navigation bar 2014-06-21 21:30:58 +02:00
Jonathan De Wachter
a88bab1d59 [Android] Hide the status bar 2014-06-21 21:30:57 +02:00
Jonathan De Wachter
a4846db016 [Android] Enable the usage of debug version of SFML libraries (#643) 2014-06-21 21:10:45 +02:00
Jonathan De Wachter
214c9b0662 [Android] Removed dependency on the window module from libsfml-main.a 2014-06-21 21:10:31 +02:00
Jonathan De Wachter
c522f6d596 Merge pull request #642 from MarioLiebisch/android-fingerfix 
[Android] Fixed redundant touch moved events
 2014-06-21 20:18:41 +02:00
Jonathan De Wachter
775277b8fb [Android] Updated example to handle screen rotation events (#531) 2014-06-21 20:11:41 +02:00
Jonathan De Wachter
6302cc0762 Merge pull request #641 from MarioLiebisch/android-statesfix 
[Android] Fixed the app crashing on rotation
 2014-06-21 20:07:57 +02:00
Mario Liebisch
121c3b2fd7 [Win32] Fixed Unicode inconsistency 
For Unicode builds this change is more cosmetic, but it should fix
SFML's window class being registered as "S" rather than "SFML_Window"
for non-Unicode builds.
 2014-06-21 00:06:39 +02:00
Mario Liebisch
1bd62b4d14 [Android] Fixed the app crashing on rotation 
Rotating the screen will restart the app with the new window/orientation.
 2014-06-21 00:04:45 +02:00