Commit graph

981 commits

Author SHA1 Message Date
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
mshirt
d76c700de0 Fixing "hack" in ed-text
Apparently there was already a function for reseting the frame wait,
used commonly after loading files.  So we don't have to use the hacky
method of making the game wait for X number of frames anymore.
2016-12-13 04:45:25 -06:00
mshirt
4fec45be25 Fixed softlock when opening menu
If you opened the fast travel or the item menu right before touching a
touch-run event, it would soft-lock you if the event changed niko's
move-route, since niko was unable to move due to his update function
being unreached.
2016-12-13 04:42:45 -06:00
Vinyl Darkscratch
a5b454128d Add OneShot .app
The .app happens to be a tweaked version of the one provided when
grabbing a copy of the game from Steam, as I am unfamiliar with the
process of collecting frameworks into an app bundle, at least with
cmake/qmake.  All you need to do is replace the .app in
~/Library/Application Support/Steam/SteamApps/OneShot/ to play on Mac!
2016-12-13 00:26:35 -08:00
Vinyl Darkscratch
1da5418a3a Remove value in EXTERNAL_LIB_PATH from previous commit 2016-12-12 23:26:45 -08:00
Vinyl Darkscratch
0b7fdbf8e1 Updates for a future Mac build 2016-12-12 22:59:07 -08:00
mshirt
f9a43eff45 Reordering the trigger on custom message boxes
With frame perfect inputs, you could close these on the same frame as
they open, which in some cases leads to a soft lock of the game.
2016-12-12 17:44:48 -06:00
mshirt
ae846e0976 Fixing a bug with the music fade-in script
Used to crash if these commands were hit during a music fade-in command.
2016-12-12 14:00:02 -06:00
mshirt
a2caa4d626 Script to check if the countdown is over 2016-12-12 13:59:30 -06:00
mshirt
941b611ba0 minor changes to sun room fix 2016-12-10 02:27:01 -06:00
mshirt
91e25907eb Adding a quickfix for the sunroom bug 2016-12-10 01:20:21 -06:00
mshirt
ee0c895a1e increasing delay for graphics update to catch up 2016-12-08 02:19:46 -06:00
mshirt
2c5cc374cd Making game defullscreen during prompts 2016-12-07 23:06:40 -06:00
mshirt
c51dfe842a Added more checks for names 2016-12-07 23:06:23 -06:00
Mathew Velasquez
aa7818847c Lots of stuff 2016-12-06 23:49:37 -05:00
mshirt
cce13d8d01 Added a switch for red docs 2016-12-06 16:43:11 -06:00
mshirt
691bbc0f67 Making the computer username default
Even for steam
2016-12-06 15:28:36 -06:00
mshirt
9b91a3d5e3 Adding a fast travel for a new map in the Glen 2016-12-04 16:53:07 -06:00
mshirt
ae8e161504 Changed hitbox on smallpool 2016-12-01 18:09:20 -06:00
mshirt
7c97b71824 Added in \l and \r to credits
For left-justified and right-justified text
2016-11-27 21:04:50 -06:00
mshirt
88d9690737 A switch to disable fullscreen toggling 2016-11-27 21:04:15 -06:00
mshirt
ce147a44a5 Added fullscreen toggle (F8) 2016-11-26 12:55:05 -06:00
mshirt
a229d8862f Putting in combinations for trying to smash the sun 2016-11-26 12:54:49 -06:00
mshirt
5178abd891 Put in countdown script
also adjusted green_ambient
2016-11-25 21:42:30 -06:00
mshirt
824cd3af3b Putting in the post-game version of the safe document 2016-11-25 21:39:23 -06:00
mshirt
7794381828 Updating this bat file for my new laptop 2016-11-25 21:39:02 -06:00
Michael Shirt
42d9b25f3c Fixing choices
Because the last commit I did just broke it
2016-11-19 05:07:08 -07:00
Michael Shirt
bca00b4197 Making choices filter out \p 2016-11-18 01:54:10 -07:00
Michael Shirt
1762362044 Added permaflag/variable functionality 2016-11-18 01:53:52 -07:00
Michael Shirt
bc2133b01f Adding scripts for plight's bruteforcing at elevator deck and for losing all items at beginning of tower 2016-11-18 01:51:49 -07:00
Michael Shirt
a6df4ea3d2 Adjusting text colors to add contrast 2016-11-17 22:27:56 -07:00
Michael Shirt
83d6e46421 Added water pill combination 2016-11-17 13:02:44 -07:00
Michael Shirt
79ba9fc44a game_oneshot was misspelled
Mat did you even test this before you committed it?
2016-11-15 21:28:32 -07:00