Tony Wasserka
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
Ryan Houdek
4483b64bcb
Merge pull request #463 from degasus/vertex_format_cache
...
VideoCommon: Cache native vertex formats
2014-07-06 05:26:42 -05:00
Lioncash
ab84110a6d
Merge pull request #567 from degasus/master
...
ConfigManager: fix alignment
2014-07-06 05:08:59 -04:00
degasus
e72b01caa1
ConfigManager: fix alignment
2014-07-06 11:05:16 +02:00
Lioncash
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
Lioncash
09eb1acc5e
Common: Using size_t in PointerWrap's DoContainer apparently causes crashes. Fixes this.
2014-07-06 03:05:27 -04:00
Dolphin Bot
a96f185bb8
Merge pull request #565 from RachelBryk/size-column
...
Fix hiding size column in game list.
2014-07-06 08:15:35 +02:00
Rachel Bryk
5558aa08c2
Fix hiding size column in game list.
2014-07-06 01:59:38 -04:00
Dolphin Bot
4117b5ec12
Merge pull request #563 from lioncash/pointerwrap
...
Common: Make DoContainer within PointerWrap private.
2014-07-06 07:57:22 +02:00
Dolphin Bot
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
Dolphin Bot
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
Lioncash
48ff45b8a8
VideoCommon: Remove some unused constants from VertexShaderGen.h.
2014-07-05 23:46:07 -04:00
Lioncash
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
Lioncash
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
Rachel Bryk
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
Pierre Bourdon
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
Lioncash
5c7ed205a9
Android: Remove an unnecessary getString call from EmulationActivity
2014-07-05 18:02:30 -04:00
Rachel Bryk
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
degasus
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
Tony Wasserka
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
Justin Chadwick
43dcbe0a73
Change the comments to be more detailed.
2014-07-04 08:00:49 -04:00
Pierre Bourdon
7035e5e4fb
Merge pull request #555 from JMC47/pinned_memory
...
Place pinned memory as top priority.
2014-07-04 13:56:45 +02:00
Lioncash
32e45e6abe
Merge pull request #556 from Tilka/fix_warnings
...
Fix warnings
2014-07-03 22:16:07 -04:00
Tillmann Karras
20dc0e7819
Remove unused variables
2014-07-04 03:56:58 +02:00
Tillmann Karras
d3fa8a6167
Reorder class initializer lists
2014-07-04 03:53:22 +02:00
Justin Chadwick
30f93ab418
Place pinned memory as top priority
2014-07-03 20:35:13 -04:00
Tony Wasserka
be1fe80bb6
Merge pull request #549 from lioncash/fps
...
FPS counter cleanup
2014-07-03 09:52:29 +02:00
Lioncash
71d727ebeb
Merge pull request #552 from lioncash/warning
...
Fix a type-conversion warning in Movie.cpp
2014-07-03 02:14:11 -04:00
Lioncash
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
Lioncash
ab6434f616
Merge pull request #551 from lioncash/movie
...
Clean up string handling in Movie.cpp
2014-07-02 22:57:01 -04:00
Lioncash
d649027ec8
Clean up string handling in Movie.cpp
2014-07-02 22:45:50 -04:00
Lioncash
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
Rachel Bryk
de3f587b32
Add support for 2 memory cards for movies.
2014-07-02 22:26:29 -04:00
Lioncash
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
Matthew Brennan Jones
124210c50f
Changed lingering header include guards to pragma once.
...
Some headers where using #ifndef to guard being including multiple times. But most were using pragma once. So for consistency I changed them all to use pragma once.
2014-07-01 22:17:33 -07:00
Lioncash
aec4cc7e29
Merge pull request #532 from zhuowei/master
...
Add Change Disc option to the right-click menu in the game list.
2014-06-30 15:09:28 -04:00
Zhuowei Zhang
25bd5e237b
Add Change Disc option to the right-click menu in the game list. For issue 7411.
2014-06-30 12:06:45 -07:00
Lioncash
fb18b8b689
Merge pull request #541 from lioncash/sdio
...
Get rid of a few delete[] calls in WII_IPC_HLE_Device_sdio_slot0.cpp
2014-06-29 23:23:19 -04:00
Lioncash
8ada47876a
Get rid of a few delete[] calls in sdio_slot0.cpp
2014-06-29 22:55:47 -04:00
Lioncash
ada3e97715
Merge pull request #538 from lioncash/savestate-dragdrop
...
Fix dragging and dropping savestates in the render window
2014-06-29 21:47:51 -04:00
Lioncash
0332d4d76f
Merge pull request #539 from jordan-woyak/fix-extract-directory
...
Fix ISO Directory extraction.
2014-06-29 21:35:46 -04:00
Lioncash
d720e3ed0b
Merge pull request #452 from degasus/stats
...
Video statistics update
2014-06-29 16:41:54 -04:00
Lioncash
933358a28c
Merge pull request #540 from lioncash/banner
...
Centralize some common banner loader class members.
2014-06-29 16:37:19 -04:00
Lioncash
f78b94077e
DiscIO: Centralize the banner pointer and validity boolean into IBannerLoader
...
These are both used within the banner loaders, and IsValid is exactly the
same. So this makes sense.
2014-06-29 15:40:18 -04:00
Lioncash
d800b5fb74
DiscIO: Fix extra tabs in the banner loader headers
2014-06-29 15:31:44 -04:00
Jordan Woyak
3805c4967f
Fix ISO Directory extraction.
2014-06-29 14:22:06 -05:00
Lioncash
3df00cd3f5
Fix dragging and dropping savestates in the render window
2014-06-28 16:55:15 -04:00
Lioncash
91da031220
Merge pull request #522 from lioncash/fix-dragdrop-crash
...
Fix crashes when dragging and dropping files outside of the gamelist
2014-06-28 16:53:10 -04:00
Ryan Houdek
aae1630949
Merge pull request #533 from Anti-Ultimate/master
...
Fix OpenGL VSync
2014-06-28 11:06:57 -05:00
Lioncash
e0bedc3ed6
Merge pull request #537 from Armada651/master
...
RenderFrame: Set the background to black.
2014-06-28 12:02:27 -04:00