Commit graph

1339 commits

Author SHA1 Message Date
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
tdixon
fc7463d7e7 Expand localization to Pictures and other message types 2017-03-31 12:46:03 -03:00
Vinyl Darkscratch
e645f3dd0e Merge remote-tracking branch 'mathewv/master' 2017-03-30 17:05:09 -07:00
Vinyl Darkscratch
f59bc1d76a Add automated macOS compile script and remove unneeded CMakeLists 2017-03-30 17:05:02 -07:00
Vinyl Darkscratch
cb77de041b Replace macOS journal implementation with the reimplementation 2017-03-30 17:04:37 -07:00
Vinyl Darkscratch
2d03bebd61 Upscale icon resolution and add journal icon 2017-03-30 17:03:42 -07:00
Mathew Velasquez
2eb67bfaaa Added cleaned-up language scripts 2017-03-30 18:46:55 -04:00
Mathew Velasquez
e3f572d6fe hidpi fix 2017-03-30 18:46:55 -04:00
Vinyl Darkscratch
08b90de8d1 Add journal reimplementation, update for Solstice update 2017-03-30 02:22:48 -07:00
Vinyl Darkscratch
c1f3e9889d Add resources from https://github.com/hunternet93/OneShot-Journal 2017-03-30 00:11:14 -07:00
Vinyl Darkscratch
94535d2d80 Merge remote-tracking branch 'mathewv/master' 2017-03-28 13:33:06 -07:00
GIRakaCHEEZER
4cc5dec036 Merge pull request #5 from mathewv/Solstice
all the solstice changes
2017-03-28 00:01:00 -05:00
mshirt
d8002dabca all the solstice changes
i'm lazy sorry and forgot to keep the repo up to date

but here's all the solstice scripts
2017-03-27 14:52:10 -05:00
Marty Plummer
60e967e3b7 Add icon and resource files for windows
Signed-off-by: Marty Plummer <ntzrmtthihu777@gmail.com>
2017-03-09 08:24:13 +01:00
Jonas Kulla
0f9b5f274a Filesystem: Search for "Fonts/" with case-insensitivity 2017-03-08 16:30:07 +01:00
Jonas Kulla
6349146e01 main: Only set window icon on Linux
OSX carries high-resolution icons in its bundles, and windows uses
windres to embed .ico files, so don't interfere with those.
2017-03-04 11:04:02 +01:00
tdixon
cfd30bbca6 Enable localization of game text 2017-03-03 16:53:16 -04:00
Jonas Kulla
c4dd3ffaf6 Config: Use set for preloadScripts
Would probably make sense for all other string vectors too.
2017-03-03 19:37:19 +01:00
Vinyl Darkscratch
0249ecd50c Merge remote-tracking branch 'mathewv/master'
# Conflicts:
#	scripts/SaveLoad.rb
2017-03-02 22:38:38 -08:00
Jonas Kulla
55cec53911 Sprite: Clamp src_rect to bitmap bounds 2017-02-17 19:29:38 +01:00
mshirt
0f3217d16d Added save backup system to the game
To better deal with the random savefile corruptions that occur for some
users.  This should help?  I tested it with each file in the chain
corrupted to make sure it was falling back onto the backups properly,
and made it delete the base file if all backups were corrupt, which is a
very unlikely scenario but might as well put a case to handle it.
2017-02-04 19:17:47 -06:00
Vinyl Darkscratch
2119b1919d Merge remote-tracking branch 'mathewv/master' 2017-01-11 00:54:30 -08:00
root
9fb6ca4d89 Committer: gir
Changes to be committed:
modified:   src/audio.cpp
2017-01-03 19:57:29 -06:00
mshirt
4a459cb330 Fixing text being corrupted when fullscreening
Mainly by increasing delay when fullscreening.
2017-01-03 02:23:03 -06:00
mshirt
546edc33b8 Preventing saving if intro variable isn't set
This is to prevent the "[Niko feels uneasy.]" infinite loop that can
occur if you somehow save in the INIT room.
2017-01-02 17:33:33 -06:00
mshirt
505f4214c1 Fixing EACCES error
That occurs when trying to copy the ______.exe when you already have it
running in the destination folder.
2017-01-01 18:25:11 -06:00
mshirt
102e0aea6c Game now saves settings to file
So the user doesn't have to customize their settings everytime they
launch.
2017-01-01 16:16:43 -06:00
mshirt
b1b907a6e6 Settings menu script additions
Settings menu now fully works, but will need to add more changes in a
bit to make it save a settings file (so user won't have to change
settings every relaunch)
2017-01-01 05:04:32 -06:00
mshirt
79e70e8821 Fixed being able to open both menus at once
You could open both inventory and menu at once if you were walking.  But
now you can't.
2017-01-01 05:04:32 -06:00
root
03f4610e20 Forgot to change volume when starting to play bgm, me, and bgs
Committer: gir <girakacheezer@gmail.com>
2017-01-01 04:56:41 -06:00
root
29fd891550 Adding backend changes for settings menu
Committer: mshirt <mshirt@ualberta.ca>
2017-01-01 04:48:40 -06:00
Vinyl Darkscratch
641851db65 Merge remote-tracking branch 'mathewv/master' 2016-12-29 13:56:20 -08:00
Mathew Velasquez
d41e36c751 Fix minimize crash by sacrificing an unnecessary feature 2016-12-26 20:57:51 -05:00
Vinyl Darkscratch
e97d42f132 Merge remote-tracking branch 'mathewv/master' 2016-12-20 13:09:17 -08:00
mshirt
6f7091db62 Making these colors brighter
Because people complained about the document text being "hard to read"
2016-12-18 16:39:56 -06:00
Vinyl Darkscratch
d16959f0e8 Merge remote-tracking branch 'mathewv/master' 2016-12-17 22:53:21 -08:00
mshirt
3bdb5b6ea5 Revert "More anti-lag changes"
This reverts commit 07f2d5d6fa.
2016-12-17 20:10:23 -06:00
mshirt
07f2d5d6fa More anti-lag changes 2016-12-17 16:44:30 -06:00
mshirt
355b2d8528 Moving the Cancel higher
This change prevents the player from opening the fast travel menu and
the inventory from the Menu at the same time.
2016-12-17 16:44:30 -06:00
Mathew Velasquez
ecd0d92d30 Reverting some marshal stuff 2016-12-17 15:59:41 -05:00
Vinyl Darkscratch
2733b5ad06 Remove doubled Smooth attribute 2016-12-16 13:15:32 -08:00
Vinyl Darkscratch
4662417dbe Merge remote-tracking branch 'mathewv/master' 2016-12-16 13:15:03 -08:00
mshirt
f4aace6a27 Fixing observation deck + fast travel bug 2016-12-16 00:21:43 -06:00
Vinyl Darkscratch
b0b024a01a Merge remote-tracking branch 'mathewv/master' 2016-12-15 13:37:16 -08:00