MapleShrine/mkxp
1
0
Fork 0
Code Issues 32 Pull requests 11 Projects Releases Wiki Activity
303 commits 16 branches 0 tags 112 MiB
Commit graph

303 commits

This branch
This branch
All branches
Author SHA1 Message Date
Edward Rudd
f72ce6de33 write screenshots to desktop directory OR home directory. 2014-01-03 20:25:03 -05:00
Edward Rudd
cf38a9a334 fix screen grab crash when in fullscreen 
- read the FBO size NOT the screen size.
 2014-01-03 20:25:03 -05:00
Jonas Kulla
3daf805350 Table: Serialize actual table dimensions instead of '3' 
This allows savegames created with mkxp to be read with RMXP.
 2014-01-02 03:39:22 +01:00
Jonas Kulla
5f16eef273 EventThread: Properly allocate SDL user event codes 2014-01-02 02:22:10 +01:00
Jonas Kulla
0a336ea315 Spacing 2014-01-02 00:17:31 +01:00
Jonas Kulla
a0a27889a3 Merge #8 2014-01-02 00:11:57 +01:00
Edward Rudd
5b4f0b239c add config option to set the window icon 2014-01-01 16:52:07 -05:00
Edward Rudd
a740f7754c add option to choose whether left alt or both alts toggle's fullscreen 2014-01-01 15:56:38 -05:00
Edward Rudd
05668f792a small tweaks to cmake for linux 2014-01-01 14:54:19 -05:00
Edward Rudd
5c0295e972 use correct macros in ruby code so code compiles in 32bit and 64bit mode 2014-01-01 11:20:42 -05:00
Edward Rudd
1ce4970d62 setup source groups in the cmake to make IDEs more organized 2014-01-01 11:19:31 -05:00
Edward Rudd
c6bd61d2de code style fixes 2014-01-01 11:01:05 -05:00
Edward Rudd
835ea686c8 make indents consistent in cake.. also put a glaring note that the MRUBY support needs to be finished. 2014-01-01 10:46:33 -05:00
Jonas Kulla
1bacceddf0 Spacing 2014-01-01 12:59:40 +01:00
Jonas Kulla
7a1dd2588d Bring sample conf up to date with boost changes 2014-01-01 07:14:40 +01:00
Jonas Kulla
ce7bf97dd4 FileSystem: Make path caching optional via config 
Because Windows has case insensitive paths, this should
be turned on (which it is by default) for maximum
compatibility. Can be turned off as an optimization
(this will speed up startup a little depending on the
number of game assets).
 2014-01-01 07:13:35 +01:00
Jonas Kulla
f163c51eed Try for more consistent indenting 2014-01-01 07:04:41 +01:00
Edward Rudd
a18497ca7b change to exe dir on startup and add some extra guards around boost program option parsing. 2013-12-31 21:03:53 -05:00
Jonas Kulla
3f08b6b3db Remove dead code 2014-01-01 02:13:02 +01:00
Edward Rudd
e87bdb8a95 cleaner approach to handling the viewport bug 2013-12-31 19:56:20 -05:00
Edward Rudd
f42539e02b accept any alt for fullscreen switch 2013-12-31 19:31:29 -05:00
Edward Rudd
1120c60cae fix viewport resizing on screen resize. 2013-12-31 19:31:14 -05:00
Edward Rudd
f8e8d704b5 use copy construction to pass the config along so the main constructor gets run once. 2013-12-31 17:23:15 -05:00
Edward Rudd
f2bb0b2e79 initialize gameFolder to be SDL_GetBasePath() 2013-12-31 17:19:05 -05:00
Edward Rudd
f106e31c6f add missed force32 option 2013-12-31 16:36:00 -05:00
Edward Rudd
7aa07630e4 can't sizeof an iVar in a static function 2013-12-31 16:32:12 -05:00
Edward Rudd
02738be4c5 CMake's GLEW finds parent dir.. not GL subdir. 2013-12-31 16:31:58 -05:00
Edward Rudd
af70e8c1ff correct ScanRow forward declares 2013-12-31 16:31:24 -05:00
Edward Rudd
eacc143ea0 update extension usage.. 
nearly all of the previous required extensions are CORE in OpenGL 2.0
the remaining ones need to have fallback checks for ARB vs EXT vs APPLE 
variants..
 2013-12-31 16:31:03 -05:00
Edward Rudd
27ae261d0e don't use base name it's destructive to the incoming string which you shouldn't modify as c_str() is const. 2013-12-31 16:27:28 -05:00
Edward Rudd
a3c9f53335 GLSL 100 doesn't do automatic type conversions.. (int to float) 2013-12-31 16:26:49 -05:00
Edward Rudd
4a817f45e5 wrap not check in parenthesis so the check is done correctly. 2013-12-31 16:26:10 -05:00
Edward Rudd
2572a05e8b safely print errors by explicitly specifying a format string 2013-12-31 16:25:38 -05:00
Edward Rudd
adfbc5bb64 pull in missing include 2013-12-31 16:25:13 -05:00
Edward Rudd
5b4e512dc6 ulong isn't defined anywhere (maybe on linux it is.. but not standard on OS X) 2013-12-31 16:24:56 -05:00
Edward Rudd
b1a2569dff add CMake project for easier building 2013-12-31 16:24:14 -05:00
Jonas Kulla
82fb2f6b25 Remove outdated ruby patch 2013-12-30 08:31:56 +01:00
Jonas Kulla
f2d2a1886f Shader: Throw on compile/link error, and print info logs 
Also let go of the startup debug prints when compiling.
The engine will now tell us properly which shader fails
at which part.
 2013-12-30 01:38:47 +01:00
Jonas Kulla
680e407a38 SharedState: Throw exception on errors (and handle them) 
First up: throw if chdir(gameFolder) fails.
 2013-12-30 01:37:55 +01:00
Jonas Kulla
9759e52b3c Exception: Constructor now takes printf style arguments 2013-12-29 18:05:11 +01:00
Jonas Kulla
5b736bcfd6 mkxp.pro: Shorten keyword lenght to choose binding 
'BINDING=BINDING_MRI' => 'BINDING=MRI'

Also error out if multiple bindings are chosen.
 2013-12-29 18:01:57 +01:00
Jonas Kulla
7f4e58fd6e MRI-Binding: Don't memcpy script data before deflating 
I think the reason this was originally done was some
issue with ruby's GC where it would wrongfully sweep
the script array variable on the C stack.

This change should speed up startup a little.
 2013-12-29 14:55:49 +01:00
Jonas Kulla
d8e22a8b3c Remove unused definition 2013-12-29 14:36:32 +01:00
Jonas Kulla
2adf8ab265 Transition from QtCore to stdc++ / STL / boost 
This looks like a pretty major change, but in reality,
80% of it is just renames of types and corresponding
methods.

The config parsing code has been completely replaced
with a boost::program_options based version. This
means that the config file format slightly changed
(checkout the updated README).

I still expect there to be bugs / unforseen events.
Those should be fixed in follow up commits.

Also, finally reverted back to using pkg-config to
locate and link libruby. Yay for less hacks!
 2013-12-29 13:59:26 +01:00
Jonas Kulla
01529c5741 Audio: Fix stream not being unlocked on exception 2013-12-28 23:10:43 +01:00
Jonas Kulla
99866fb84c Replace QStack with std::stack 2013-12-27 20:10:01 +01:00
Jonas Kulla
922a16a013 TexPool: Fix wrong total memory consumption calculation 
The byte count of textures released into the pool was
erroneously added twice to the total byte count.
 2013-12-27 18:46:04 +01:00
Jonas Kulla
fbf02cf2ce Remove Qt style forloop 2013-12-27 06:19:30 +01:00
Jonas Kulla
f3def32461 Constify 2013-12-27 06:11:18 +01:00
Jonas Kulla
bd63bc9cd2 MRuby-Binding: Make code compile with latest mruby master 2013-12-27 04:36:24 +01:00