Xele02
|
de960cb8c9
|
Correct audio crash when close
|
2013-02-01 02:13:32 +01:00 |
|
Henrik Rydgård
|
40a66eeb96
|
Merge pull request #40 from xsacha/master
Small adjustments for Blackberry/Symbian
|
2013-01-30 23:52:03 -08:00 |
|
Sacha
|
a8e30185f2
|
Small adjustments for Blackberry/Symbian
|
2013-01-29 07:35:39 +10:00 |
|
Henrik Rydgård
|
39ca6ba991
|
Merge pull request #39 from GeeckoDev/master
Fix cityhash build
|
2013-01-27 05:54:31 -08:00 |
|
Clément G
|
5e54aea274
|
fix city.cpp build when SSE_4_2 is defined
|
2013-01-27 12:00:43 +01:00 |
|
Henrik Rydgård
|
4497f1c5ce
|
Default touch ui scale to 1.0.
|
2013-01-26 17:47:02 +01:00 |
|
Henrik Rydgard
|
c21e1ee2cc
|
Add scaling of touch buttons
|
2013-01-26 17:25:24 +01:00 |
|
Henrik Rydgård
|
2f06061f36
|
Merge pull request #38 from KentuckyCompass/tab_turbo
tab key for turbo mode
|
2013-01-26 02:02:39 -08:00 |
|
KentuckyCompass
|
0d8bcfe9ae
|
tab key for turbo mode
|
2013-01-25 17:24:50 -08:00 |
|
Henrik Rydgård
|
54a57dc9a8
|
Merge pull request #37 from Summeli/master
routing logs though qDebug in Symbian
|
2013-01-25 08:45:01 -08:00 |
|
Summeli
|
9493e56b2c
|
Routing loggings in Symbian though qDebug to the console
|
2013-01-25 17:00:07 +02:00 |
|
Henrik Rydgard
|
f315424c42
|
Add dither to state. Allow choosing FBO color depth. Disable VBO for draw_buffer but keep code.
|
2013-01-23 23:02:32 +01:00 |
|
Henrik Rydgård
|
f000d322ae
|
Merge pull request #36 from xsacha/master
Build fix for Symbian, Blackberry10, Harmattan, Pandora
|
2013-01-23 00:37:31 -08:00 |
|
Sacha
|
d783975258
|
Fix cityhash for non-glibc systems where byteswap isn't defined. Define it manually instead. Also, fix harmattan building of Qt frontend.
|
2013-01-23 11:31:19 +10:00 |
|
Henrik Rydgård
|
5c88d619bd
|
Merge pull request #35 from Summeli/master
byteswap functions added for Symbian & Blackberry
|
2013-01-22 13:28:21 -08:00 |
|
Summeli
|
0f7f38a5ff
|
Added byteswap functions for Symbian & BlackBerry
|
2013-01-22 23:20:17 +02:00 |
|
Henrik Rydgård
|
464240f703
|
Merge pull request #34 from Xele02/master
Linux build broke correction
|
2013-01-20 16:36:58 -08:00 |
|
Xele02
|
c02c9e6bdd
|
Remove typedef redefined which break linux build
|
2013-01-21 01:22:00 +01:00 |
|
Henrik Rydgard
|
b5037341aa
|
Add cityhash, a good and fast hash.
|
2013-01-19 12:11:41 +01:00 |
|
Henrik Rydgård
|
200d2cc927
|
Merge pull request #33 from xsacha/master
Qt code refactor [Stage 1]
|
2013-01-15 09:08:57 -08:00 |
|
Sacha
|
00acbd2f74
|
Revert some temporary changes for Stage 1 refactor of Qt.
|
2013-01-16 02:19:22 +10:00 |
|
Henrik Rydgård
|
f07254e211
|
Merge pull request #32 from xsacha/master
Fix Qt audio on all platforms
|
2013-01-15 02:51:08 -08:00 |
|
Sacha
|
ef75aee0a2
|
Fix Qt audio for all platforms.
|
2013-01-15 20:45:26 +10:00 |
|
Henrik Rydgard
|
f5e775a9a1
|
Always specify all buffers for clearing. Missing one hurts, one extra doesn't.
|
2013-01-14 19:25:44 +01:00 |
|
Henrik Rydgård
|
6d67ba94a0
|
Merge pull request #31 from xsacha/master
Pandora buildfix and joystick support
|
2013-01-14 04:07:27 -08:00 |
|
Sacha
|
0578607c84
|
Pandora buildfix and joystick support.
|
2013-01-14 21:32:39 +10:00 |
|
Henrik Rydgård
|
0639d8fb37
|
Merge pull request #30 from xsacha/master
Qt revert + minimal changes
|
2013-01-14 02:47:01 -08:00 |
|
Sacha
|
02307d8226
|
Fix Qt native file and remove redundancies.
|
2013-01-14 19:20:28 +10:00 |
|
Sacha
|
063087abba
|
Revert "Merge pull request #29 from Xele02/qtwindow"
This reverts commit 170a45ef4f, reversing
changes made to 657f5d32f4.
|
2013-01-14 19:10:51 +10:00 |
|
Henrik Rydgård
|
170a45ef4f
|
Merge pull request #29 from Xele02/qtwindow
Update native for Qt Window
|
2013-01-13 15:06:38 -08:00 |
|
Xele02
|
597be2bb04
|
Update native for Qt Window
Add mutex lock. Wait cond didn't work without it.
|
2013-01-13 23:27:49 +01:00 |
|
Henrik Rydgård
|
657f5d32f4
|
Zero nextScreen_ on screenmanager shutdown.
|
2013-01-13 14:55:19 +01:00 |
|
Henrik Rydgård
|
7225f4667c
|
Merge pull request #26 from xsacha/master
Qt/Blackberry
|
2013-01-12 15:23:34 -08:00 |
|
Sacha
|
4b8c56330a
|
Many platforms don't have GLchar defined, just check if it is instead.
|
2013-01-13 03:09:22 +10:00 |
|
Sacha
|
44e9e946a9
|
Add names to the magic numbers of left joystick input (Qt/Blackberry).
|
2013-01-13 02:29:37 +10:00 |
|
Henrik Rydgard
|
de36ea9f34
|
Add state caching for stencil test.
|
2013-01-12 17:19:01 +01:00 |
|
Henrik Rydgård
|
9df584067e
|
Merge pull request #28 from xsacha/pandora-port
Port to Pandora.
|
2013-01-12 08:14:55 -08:00 |
|
Sacha
|
7c0f9617b0
|
Port to Pandora. Thanks to ptitSeb.
|
2013-01-13 01:45:01 +10:00 |
|
Henrik Rydgard
|
c60bda83b6
|
Don't try to register/unregister too early.
|
2013-01-11 23:46:38 +01:00 |
|
Henrik Rydgard
|
dcc9785357
|
Bugfix LoggingDeadline
|
2013-01-11 23:46:37 +01:00 |
|
Henrik Rydgård
|
b6e86a1e18
|
Merge pull request #27 from Orphis/viewportfix
Properly restore all the OpenGL states properly and added a sanity check
|
2013-01-11 10:19:38 -08:00 |
|
Florent Castelli
|
7b9daa28c4
|
Properly restore all the OpenGL states properly and added a sanity check.
Also set the proper viewport value at startup.
|
2013-01-11 19:02:56 +01:00 |
|
Henrik Rydgard
|
af5142d32a
|
Add missing printf parameter
|
2013-01-11 00:29:26 +01:00 |
|
Henrik Rydgard
|
7ceecd22b4
|
Check for EXT_discard_framebuffer
|
2013-01-10 23:48:28 +01:00 |
|
Henrik Rydgard
|
135ae4faf5
|
Add LoggingDeadline, sprinkle this to track what takes time
|
2013-01-10 23:47:50 +01:00 |
|
Henrik Rydgård
|
c63061ddfd
|
Merge pull request #25 from xsacha/master
Qt and Blackberry port
|
2013-01-10 02:29:18 -08:00 |
|
Sacha
|
1d82b785df
|
Fix joystick keys
|
2013-01-10 20:25:10 +10:00 |
|
Henrik Rydgård
|
11a1e35783
|
Disable poor frame limiter in PCMain.cpp (SDL) for now, rely on vsync instead.
|
2013-01-10 11:11:32 +01:00 |
|
Henrik Rydgård
|
20c37d8d0e
|
Use VBO to draw UI, just because that's how it's supposed to be done.
|
2013-01-10 10:14:39 +01:00 |
|
Henrik Rydgård
|
54fdd6ea00
|
Retab drawbuffer before changing it
|
2013-01-10 09:42:02 +01:00 |
|