Vinyl Darkscratch
3cd9e58ba5
Merge remote-tracking branch 'mathewv/master'
2017-04-13 20:13:54 -07: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
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
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
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
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
