Commit graph

1013 commits

Author SHA1 Message Date
Vinyl Darkscratch
2d03bebd61 Upscale icon resolution and add journal icon 2017-03-30 17:03:42 -07: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
Vinyl Darkscratch
0249ecd50c Merge remote-tracking branch 'mathewv/master'
# Conflicts:
#	scripts/SaveLoad.rb
2017-03-02 22:38:38 -08: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
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
38865d1a09 Re-add .app ignore 2016-12-14 17:42:31 -08:00
Vinyl Darkscratch
896f773be0 Ensure .app removal 2016-12-14 17:42:07 -08:00
Vinyl Darkscratch
83b44a8cef Exclude .app from Git 2016-12-14 17:40:44 -08: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
544fd78753 Merge remote-tracking branch 'mathewv/master' 2016-12-14 12:57:06 -08:00
Vinyl Darkscratch
271c86bb27 Compile with Ruby 2.3, not 2.1 (to fix saves)
I found out what the actual issue was with saves — it wasn’t that
xScripts needed to be recompiled (although it helped load previous
saves from the Windows build on Steam), it was that Ruby 2.1 doesn’t
seem to work with the saves, @mathewv might have determined this when
selecting 2.2 as the minimum.  I have Ruby 2.3 on my system, installed
through Homebrew, so that is what I selected for my particular build.
2016-12-14 12:56:53 -08:00
mshirt
9c03d0da02 Adding in combinations for all 10 photos 2016-12-14 03:53:34 -06:00
mshirt
7b34518580 Fixing balcony event
Would trigger twice if you were at the top of the railing during a
cutscene.
2016-12-14 02:17:25 -06:00
mshirt
aeff9a856c Adding in checkpoint save functionality 2016-12-14 02:16:57 -06:00
Vinyl Darkscratch
85da9ff7e8 Reorganizing Mac and Linux blocks and commence on retina support 2016-12-13 21:16:33 -08:00
Vinyl Darkscratch
b3e3bdba30 Ignore *.lproj files
Qmake creates an “empty.lproj” file every time we make an app bundle (I
like to go the app bundle route when making MKXP-1S), but we don’t use
those, so why worry about their changes?
2016-12-13 13:33:58 -08:00
Vinyl Darkscratch
bdda60e907 Merge remote-tracking branch 'mathewv/master' 2016-12-13 12:44:04 -08:00
Vinyl Darkscratch
33bf09f845 Create "rpgscript.sh" 2016-12-13 12:40:56 -08:00