ff6fa68b71
Merge pull request #583 from lioncash/dat-legacy-code
...
DolphinWX: Remove a wx 2.9.0 and 2.8.0 version check in GameListCtrl
2014-07-08 20:49:03 +02:00
2eb12dee55
DolphinWX: Remove a wx 2.9.0 and 2.8.0 version check in GameListCtrl
2014-07-08 14:42:10 -04:00
3bde3988eb
Merge pull request #576 from lioncash/shader-string
...
D3D: Use std::strings for Compile[x]Shader and CompileAndCreate[x]Shader
2014-07-08 12:10:14 +02:00
a523a6d1bf
D3D: Use std::strings for Compile[x]Shader and CompileAndCreate[x]Shader
...
With strings, we don't need to care about passing in a length, since it internally stores it. So now, we don't even need a length parameter for these functions anymore as well.
This also kills off some sprintf_s calls.
2014-07-07 19:32:03 -04:00
59c938d3a7
Merge pull request #574 from dolphin-emu/revert-328-enum_cpubackend
...
Revert "Don't add segfault handler in interpreter mode"
2014-07-07 05:32:44 +02:00
b0b70381f7
Revert "Don't add segfault handler in interpreter mode"
2014-07-07 05:30:06 +02:00
038111b262
Merge pull request #410 from lioncash/coding-style
...
Introduce the revised coding style.
2014-07-06 19:37:42 -04:00
7b57d64962
Introduce the revised coding style.
2014-07-06 18:20:17 -04:00
80811cb9a1
Merge pull request #571 from lioncash/snprintf
...
VideoCommon: Get rid of an snprintf call in VideoConfig.cpp
2014-07-06 17:55:33 -04:00
ec1e52de53
VideoCommon: Get rid of an snprintf call in VideoConfig.cpp
2014-07-06 15:33:08 -04:00
cc3dda5b22
Merge pull request #362 from Tilka/ffmpeg_libav_new
...
AVIDump: use new ffmpeg/libav API
2014-07-06 19:33:27 +02:00
4ec8c3714d
Merge pull request #328 from Tilka/enum_cpubackend
...
Don't add segfault handler in interpreter mode
2014-07-06 19:28:10 +02:00
db4e32a124
Merge pull request #547 from lioncash/cleanups
...
Clean up the DSP disassembler a little.
2014-07-06 19:20:07 +02:00
a798548c30
Merge pull request #546 from workhorsy/header_guard_to_pragma_once
...
Changed lingering header include guards to pragma once.
2014-07-06 14:19:32 +02:00
4483b64bcb
Merge pull request #463 from degasus/vertex_format_cache
...
VideoCommon: Cache native vertex formats
2014-07-06 05:26:42 -05:00
ab84110a6d
Merge pull request #567 from degasus/master
...
ConfigManager: fix alignment
2014-07-06 05:08:59 -04:00
e72b01caa1
ConfigManager: fix alignment
2014-07-06 11:05:16 +02:00
9d79a57755
Merge pull request #566 from lioncash/fix-crash
...
Common: Using size_t in PointerWrap's DoContainer apparently causes crashes
2014-07-06 03:06:26 -04:00
09eb1acc5e
Common: Using size_t in PointerWrap's DoContainer apparently causes crashes. Fixes this.
2014-07-06 03:05:27 -04:00
a96f185bb8
Merge pull request #565 from RachelBryk/size-column
...
Fix hiding size column in game list.
2014-07-06 08:15:35 +02:00
5558aa08c2
Fix hiding size column in game list.
2014-07-06 01:59:38 -04:00
4117b5ec12
Merge pull request #563 from lioncash/pointerwrap
...
Common: Make DoContainer within PointerWrap private.
2014-07-06 07:57:22 +02:00
8da2bc63cf
Merge pull request #559 from RachelBryk/gci-folder-state
...
Merge pull request #559 from RachelBryk/gci-folder-state
Keep device type EXIDEVICE_MEMORYCARDFOLDER for gci folder.
2014-07-06 07:34:55 +02:00
e9a4a54f89
Merge pull request #564 from lioncash/constants
...
Merge pull request #564 from lioncash/constants
VideoCommon: Remove some unused constants from VertexShaderGen.h.
2014-07-06 07:24:32 +02:00
48ff45b8a8
VideoCommon: Remove some unused constants from VertexShaderGen.h.
2014-07-05 23:46:07 -04:00
b97d2853a7
Common: Make DoContainer within PointerWrap private.
...
This shouldn't really be exposed as a public function and should only be called through other Do class functions that take a container type as a parameter.
2014-07-05 23:03:43 -04:00
0ede10e38d
Merge pull request #562 from RachelBryk/load-input-fixes
...
End movie play back immediately if g_currentByte > g_totalBytes.
2014-07-05 20:03:17 -04:00
86ccf13c09
End movie play back immediately if g_currentByte > g_totalBytes.
...
Also uncomment a PanicAlert in the case of g_currentByte > totalSavedBytes, and add comment explaining how it can happen.
2014-07-05 19:48:44 -04:00
0b74ad1b20
Merge pull request #560 from lioncash/android-misc
...
Android: Remove an unnecessary getString call from EmulationActivity
2014-07-06 00:06:23 +02:00
5c7ed205a9
Android: Remove an unnecessary getString call from EmulationActivity
2014-07-05 18:02:30 -04:00
ad2aaedd8b
Don't install segfault handler in interpreter mode
2014-07-05 11:02:41 +02:00
311e9e655a
CoreParameter: add enum CPUBackend
2014-07-05 11:02:41 +02:00
20a16beabd
enum CPUState: rename CPU_* to STATE_*
2014-07-05 11:01:49 +02:00
e02f680861
Keep device type EXIDEVICE_MEMORYCARDFOLDER for gci folder.
...
This fixes loading save states when type mismatches.
2014-07-05 00:22:42 -04:00
bb2fc8ecbb
VideoCommon: Cache native vertex formats
...
We are used to have a 1:1 mapping of GX vertex formats and the native (OGL + D3D) ones, but there are by far more GX ones.
This new cache maps them directly so that we don't flush on GX vertex format changes as long as the native one doesn't change.
The idea is stolen from galop1n.
2014-07-04 14:39:27 +02:00
ee100cf827
Merge pull request #557 from JMC47/pinned_memory
...
Change comment on Pinned Memory to be less ambiguous
2014-07-04 14:10:00 +02:00
43dcbe0a73
Change the comments to be more detailed.
2014-07-04 08:00:49 -04:00
7035e5e4fb
Merge pull request #555 from JMC47/pinned_memory
...
Place pinned memory as top priority.
2014-07-04 13:56:45 +02:00
32e45e6abe
Merge pull request #556 from Tilka/fix_warnings
...
Fix warnings
2014-07-03 22:16:07 -04:00
20dc0e7819
Remove unused variables
2014-07-04 03:56:58 +02:00
d3fa8a6167
Reorder class initializer lists
2014-07-04 03:53:22 +02:00
30f93ab418
Place pinned memory as top priority
2014-07-03 20:35:13 -04:00
be1fe80bb6
Merge pull request #549 from lioncash/fps
...
FPS counter cleanup
2014-07-03 09:52:29 +02:00
71d727ebeb
Merge pull request #552 from lioncash/warning
...
Fix a type-conversion warning in Movie.cpp
2014-07-03 02:14:11 -04:00
9c764eff3a
Fix a type-conversion warning in Movie.cpp
...
Fixes a C4800 warning. 'int' : forcing value to bool 'true' or 'false'
(performance warning)
2014-07-03 02:07:29 -04:00
ab6434f616
Merge pull request #551 from lioncash/movie
...
Clean up string handling in Movie.cpp
2014-07-02 22:57:01 -04:00
d649027ec8
Clean up string handling in Movie.cpp
2014-07-02 22:45:50 -04:00
a2b0525042
Merge pull request #550 from RachelBryk/movie-mc2
...
Add support for 2 memory cards for movies.
2014-07-02 22:35:32 -04:00
de3f587b32
Add support for 2 memory cards for movies.
2014-07-02 22:26:29 -04:00
00efaedb02
FPS counter cleanup
...
- Isolate it into it's own namespace
- Shorten function names, the namespace self-documents.
- Just use the std I/O, we can just write directly to the stream for
logging.
2014-07-02 20:23:09 -04:00
Pierre Bourdon