Commit graph

211 commits

Author SHA1 Message Date
Vinyl Darkscratch
397a15cdf7 Disable Chroma API stuff on non-Windows platforms 2018-02-26 21:09:12 -08:00
Vinyl Darkscratch
d4121948cd Merge remote-tracking branch 'elizagamedev/master' 2018-02-26 20:12:20 -08:00
tdixon
11f3c25ede use the new API dll 2018-01-19 00:13:05 -04:00
tdixon
aacbdb359a Simple chroma effect 2017-10-12 02:32:30 -03:00
tdixon
695d2af03a Merge branch 'localization' into chroma-intergration 2017-10-10 21:39:58 -03:00
Vinyl Darkscratch
cb1e33fa8c Fix doubled variable declaration 2017-07-31 18:29:49 -07:00
Vinyl Darkscratch
5e29b2ba66 Merge remote-tracking branch 'mathewv/master' 2017-07-31 15:19:08 -07:00
tdixon
d4645c694c basic integration of chroma sdk 2017-07-09 14:39:29 -03:00
Vinyl Darkscratch
6c772cfdd2 Merge remote-tracking branch 'mathewv/master' into oneshot-fop 2017-07-08 02:52:09 -07:00
tdixon
9f8b1dd1fd Localization for keybinding menu 2017-06-29 13:22:36 -03:00
tdixon
5ff6d6e86b journal localization 2017-05-17 23:20:39 -03:00
Vinyl Darkscratch
c9d821e878 Remove accidental bindings 2017-05-14 15:50:59 -07:00
Vinyl Darkscratch
0fe0b7d755 Revert new feature additions
This reverts commit 61ce6cd8ea.

# Conflicts:
# 	binding-mri/oneshot-binding.cpp
2017-04-06 17:47:05 -07:00
Vinyl Darkscratch
7274072a2d Add window fade-out on exit 2017-04-04 02:31:08 -07:00
Vinyl Darkscratch
6b5eff715b Add text input function (broken, read description)
Note: using this function breaks the graphics rendering at the moment,
due to code inconsistencies (utilizing SDL renderers when the rest of
the program uses GL ones, mainly), working on fixes for it!
2017-04-04 00:43:53 -07:00
Vinyl Darkscratch
3913a3ef74 Add window position setter and getter 2017-04-03 04:58:41 -07:00
jonathan de jong
545f1f4d41 Merge branches 'master' and 'master' of https://github.com/vinyldarkscratch/mkxp-oneshot 2017-04-03 12:33:45 +02:00
jonathan de jong
979b1f1415 stuffz 2017-04-03 12:33:38 +02:00
Vinyl Darkscratch
04da5ad447 Update oneshot-binding.cpp 2017-04-03 03:06:20 -07:00
jonathan de jong
77021e0abc **x.x** 2017-04-03 11:51:07 +02:00
jonathan de jong
ad92ab9b21 x.x 2017-04-03 11:49:11 +02:00
jonathan de jong
61ce6cd8ea i hope this works.... 2017-04-03 11:47:37 +02:00
Vinyl Darkscratch
2119b1919d Merge remote-tracking branch 'mathewv/master' 2017-01-11 00:54:30 -08:00
root
29fd891550 Adding backend changes for settings menu
Committer: mshirt <mshirt@ualberta.ca>
2017-01-01 04:48:40 -06:00
Vinyl Darkscratch
d16959f0e8 Merge remote-tracking branch 'mathewv/master' 2016-12-17 22:53:21 -08:00
Mathew Velasquez
ecd0d92d30 Reverting some marshal stuff 2016-12-17 15:59:41 -05:00
Vinyl Darkscratch
b0b024a01a Merge remote-tracking branch 'mathewv/master' 2016-12-15 13:37:16 -08:00
Mathew Velasquez
d47a2241ee Messagebox fix 2016-12-15 05:39:51 -05:00
Vinyl Darkscratch
f8c3862c2e Accommodate for @mathewv's "smooth" implementation 2016-12-14 21:14:42 -08:00
Vinyl Darkscratch
582b750c2b Merge remote-tracking branch 'mathewv/master' 2016-12-14 21:10:23 -08:00
Vinyl Darkscratch
3224d65988 Made paths in script cross-platform friendly
An ending that made me very, VERY teary-eyed, interrupted by an access
denied error…argh, code bugs, why!  >~<  Basically, the path to “My
Games” and the name of the journal’s executable are now defined by
oneshot.cpp and loaded into the Ruby script, so the ending isn’t
interrupted.  Now all that’s left is to compile the journal!
2016-12-14 21:09:33 -08:00
Mathew Velasquez
99d0c2888a Marshal tweaks 2016-12-14 22:05:53 -05:00
Mathew Velasquez
a0ba40916d Smooth scaling Graphics option 2016-12-14 22:05:53 -05:00
Vinyl Darkscratch
0a1d9c570f Add "smooth" property to graphics module
This is just a simple bind and addition of a “smooth” property in the
graphics module, to fix fatal issue #2
2016-12-14 16:06:40 -08:00
Vinyl Darkscratch
0b7fdbf8e1 Updates for a future Mac build 2016-12-12 22:59:07 -08:00
Mathew Velasquez
aa7818847c Lots of stuff 2016-12-06 23:49:37 -05:00
Mathew Velasquez
1f35ab104f Various last-minute beta fixes 2016-11-04 05:29:22 -04:00
Mathew Velasquez
693f045ff8 More line ending fixes, ___ 2016-11-04 00:05:49 -04:00
Mathew Velasquez
6312ce865c Added active? function, fixed CRLF line endings 2016-11-04 00:04:27 -04:00
Mathew Velasquez
78c4c3b9bf Niko/Journal for windows 2016-11-03 18:37:14 -04:00
Mathew Velasquez
50d64ea060 Window shaking 2016-10-29 22:22:22 -04:00
Mathew Velasquez
99c9a27f2a Wallpaper functionality restored for windows 2016-10-13 20:26:01 -04:00
Mathew Velasquez
0dc872bcea Journal screen stuff 2016-10-13 20:26:01 -04:00
Mathew Velasquez
302ec6dd02 I stopped making commits for a good while. Here's the latest junk. 2016-09-19 13:54:38 -04:00
Mathew Velasquez
82493cd0a0 Added footprints and src_rect to Plane class 2016-04-11 21:33:54 -04:00
Mathew Velasquez
d53ad4b124 Improved internationalization support 2016-04-06 13:45:36 -04:00
Mathew Velasquez
737f0759e7 Added cheap hack for sprite lighting occlusion 2016-03-11 02:28:26 -05:00
Mathew Velasquez
1fd808d0af Gutted more unused features 2016-02-29 15:40:10 -05:00
Mathew Velasquez
546f29f42e Preliminary i18n improvements 2016-02-29 01:41:37 -05:00
Mathew Velasquez
a4de9d9f10 integrated steamshim 2016-02-29 01:22:55 -05:00