Commit Graph

1071 Commits

Author SHA1 Message Date
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
mshirt fa03511289 More things for the new languages, mainly the pwd files and the wallpaper 2017-07-16 23:27:52 -07:00
mshirt 765cf99e1d Making safe puzzle work with all languages now 2017-07-16 21:01:58 -07:00
mshirt 745e5b71dd Adding new font for japanese 2017-07-16 17:57:12 -07:00
GIRakaCHEEZER 8b755ed27e Merge pull request #9 from taedixon/localization
Localize keybindings
2017-07-16 16:54:25 -07:00
Vinyl Darkscratch 6c772cfdd2 Merge remote-tracking branch 'mathewv/master' into oneshot-fop 2017-07-08 02:52:09 -07:00
tdixon 4af06340de remove unused import 2017-06-29 13:38:50 -03:00
tdixon 9f8b1dd1fd Localization for keybinding menu 2017-06-29 13:22:36 -03:00
mshirt 7ae0b4e977 Translating the "Upper" and "Lower" case strings for the name input screen 2017-06-11 16:35:41 -07:00
mshirt 0a5b36438d Forcing encoding of player's default name
It can cause a crash later if it's the wrong encoding, and this seems to
fix said crash.
2017-06-07 23:59:07 -07:00
mshirt 7b0b8e0a9c Item icons no longer overlap item name text 2017-05-30 22:42:15 -07:00
mshirt 66ceab32d8 Adding functions for language QA testing 2017-05-17 22:04:21 -07:00
GIRakaCHEEZER c7389d84ff Merge pull request #8 from taedixon/localization
Localization - Journal
2017-05-17 19:40:52 -07:00
tdixon 13257b5b16 Merge branch 'master' into localization 2017-05-17 23:21:30 -03:00
tdixon 5ff6d6e86b journal localization 2017-05-17 23:20:39 -03:00
tdixon 3762004b86 Change width of settings to accommodate languages 2017-05-17 23:19:11 -03:00
tdixon fc1eda07e9 Fix facepic parser failing on newlines 2017-05-17 23:18:15 -03:00
Vinyl Darkscratch 4965867df9 Merge remote-tracking branch 'mathewv/master' into oneshot-fop 2017-05-14 15:53:25 -07:00
Vinyl Darkscratch c9d821e878 Remove accidental bindings 2017-05-14 15:50:59 -07:00
mshirt b41106ee7d adding another ignored file 2017-05-11 22:45:17 -07:00
Vinyl Darkscratch a091b53f69 Merge branch 'master' into master 2017-05-07 21:49:38 -07:00
mshirt 4c61892e2e Fixing mklang file problems on windows and adding some errors to catch in SaveLoad 2017-05-07 15:18:35 -07:00
GIRakaCHEEZER 8105180d01 Merge pull request #7 from taedixon/localization
Localization
2017-05-07 15:10:02 -07:00
tdixon 7fc5346bae Strip escaped newlines from edtext dialogues 2017-05-07 18:57:41 -03:00
Vinyl Darkscratch 483cfddeb3 Update dependencies list (Qt is always required) 2017-05-06 14:39:26 -07:00
tdixon 96f1c43ac1 Add spanish to language options
Make MapText not crash when trying to create negative-width bitmaps

Add special rules to mklang
2017-05-04 22:01:00 -03:00
Vinyl Darkscratch a0e78e0e56 Merge remote-tracking branch 'mathewv/master' 2017-04-27 21:01:26 -07:00
tdixon cff99c2dd9 Merge branch 'master' into localization 2017-04-27 03:09:57 -03:00
mshirt 84b0314e4d Changing niko sprites to en sprites if on "..." replay 2017-04-22 10:26:33 -07:00
Vinyl Darkscratch 3cd9e58ba5 Merge remote-tracking branch 'mathewv/master' 2017-04-13 20:13:54 -07:00
tdixon d5822423e9 Merge branch 'master' into localization 2017-04-11 03:01:53 -03:00
tdixon 92e88d7182 Prevent crashing from disposed bitmaps 2017-04-11 03:01:37 -03:00
mshirt e48fb2660e press x to delete chars added 2017-04-09 12:26:30 -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 851ee5ae15 Comment accidental script changes 2017-04-06 17:19:05 -07:00
Vinyl Darkscratch 49d647b0e1 Swap the use of LTexture with Font class 2017-04-04 16:31:04 -07:00
Vinyl Darkscratch cac9b3c17d Update make files
Ignore if removing nonexistant files, allow for easy configuration of
thread count, and remove commented configuration removal in QMake file
2017-04-04 15:54:22 -07:00
Vinyl Darkscratch d4a22f2b81 Update make script
Add progress messages and allow for user config of Steam game directory
2017-04-04 15:46:49 -07:00
Vinyl Darkscratch 55f6a4318c Add fadeout on title screen exit as well 2017-04-04 02:35:46 -07:00
Vinyl Darkscratch 7274072a2d Add window fade-out on exit 2017-04-04 02:31:08 -07:00
Vinyl Darkscratch 640ecd46f9 Include OneShot_template.app 2017-04-04 01:45:25 -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
tdixon 1f594e4268 Merge branch 'master' into localization 2017-04-03 19:11:08 -03: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