a0e78e0e56
Merge remote-tracking branch 'mathewv/master'
2017-04-27 21:01:26 -07:00
cff99c2dd9
Merge branch 'master' into localization
2017-04-27 03:09:57 -03:00
006f701fec
Config: Add "enableBlitting" entry to toggle GL_EXT_framebuffer_blit
2017-04-23 14:32:11 +02:00
1478e1e0f9
Config: Add "maxTextureSize" entry to artificially limit texture sizes
2017-04-23 14:10:54 +02:00
84b0314e4d
Changing niko sprites to en sprites if on "..." replay
2017-04-22 10:26:33 -07:00
3cd9e58ba5
Merge remote-tracking branch 'mathewv/master'
2017-04-13 20:13:54 -07:00
d5822423e9
Merge branch 'master' into localization
2017-04-11 03:01:53 -03:00
92e88d7182
Prevent crashing from disposed bitmaps
2017-04-11 03:01:37 -03:00
e48fb2660e
press x to delete chars added
2017-04-09 12:26:30 -07:00
06feafe9ef
Add missing include
2017-04-08 20:06:12 +02:00
e4079d5738
Fix build on OSX after 60e967e3b7
2017-04-08 19:13:31 +02:00
0481f920b0
Input: Remove ugly [-20,-20] mouse position hack
...
This was supposed to disappear shortly after To the Moon's release,
but it unfortunately survived a bit longer :)
The status of the mouse cursor being inside / outside the game window
is now properly exposed (in MRI) via MKXP.mouse_in_window.
2017-04-08 18:45:24 +02:00
3ea24bd757
EventThread: Make system cursor visible over black aspect ratio bars
...
Should be less confusing for the player.
2017-04-08 18:45:24 +02:00
0fe0b7d755
Revert new feature additions
...
This reverts commit 61ce6cd8ea
2017-04-06 17:47:05 -07:00
851ee5ae15
Comment accidental script changes
2017-04-06 17:19:05 -07:00
49d647b0e1
Swap the use of LTexture with Font class
2017-04-04 16:31:04 -07:00
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
d4a22f2b81
Update make script
...
Add progress messages and allow for user config of Steam game directory
2017-04-04 15:46:49 -07:00
55f6a4318c
Add fadeout on title screen exit as well
2017-04-04 02:35:46 -07:00
7274072a2d
Add window fade-out on exit
2017-04-04 02:31:08 -07:00
640ecd46f9
Include OneShot_template.app
2017-04-04 01:45:25 -07:00
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
1f594e4268
Merge branch 'master' into localization
2017-04-03 19:11:08 -03:00
3913a3ef74
Add window position setter and getter
2017-04-03 04:58:41 -07:00
545f1f4d41
Merge branches 'master' and 'master' of https://github.com/vinyldarkscratch/mkxp-oneshot
2017-04-03 12:33:45 +02:00
979b1f1415
stuffz
2017-04-03 12:33:38 +02:00
04da5ad447
Update oneshot-binding.cpp
2017-04-03 03:06:20 -07:00
77021e0abc
**x.x**
2017-04-03 11:51:07 +02:00
ad92ab9b21
x.x
2017-04-03 11:49:11 +02:00
61ce6cd8ea
i hope this works....
2017-04-03 11:47:37 +02:00
fc7463d7e7
Expand localization to Pictures and other message types
2017-03-31 12:46:03 -03:00
e645f3dd0e
Merge remote-tracking branch 'mathewv/master'
2017-03-30 17:05:09 -07:00
f59bc1d76a
Add automated macOS compile script and remove unneeded CMakeLists
2017-03-30 17:05:02 -07:00
cb77de041b
Replace macOS journal implementation with the reimplementation
2017-03-30 17:04:37 -07:00
2d03bebd61
Upscale icon resolution and add journal icon
2017-03-30 17:03:42 -07:00
2eb67bfaaa
Added cleaned-up language scripts
2017-03-30 18:46:55 -04:00
e3f572d6fe
hidpi fix
2017-03-30 18:46:55 -04:00
08b90de8d1
Add journal reimplementation, update for Solstice update
2017-03-30 02:22:48 -07:00
c1f3e9889d
Add resources from https://github.com/hunternet93/OneShot-Journal
2017-03-30 00:11:14 -07:00
94535d2d80
Merge remote-tracking branch 'mathewv/master'
2017-03-28 13:33:06 -07:00
4cc5dec036
Merge pull request #5 from mathewv/Solstice
...
all the solstice changes
2017-03-28 00:01:00 -05:00
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
60e967e3b7
Add icon and resource files for windows
...
Signed-off-by: Marty Plummer <ntzrmtthihu777@gmail.com>
2017-03-09 08:24:13 +01:00
0f9b5f274a
Filesystem: Search for "Fonts/" with case-insensitivity
2017-03-08 16:30:07 +01:00
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
cfd30bbca6
Enable localization of game text
2017-03-03 16:53:16 -04:00
c4dd3ffaf6
Config: Use set for preloadScripts
...
Would probably make sense for all other string vectors too.
2017-03-03 19:37:19 +01:00
0249ecd50c
Merge remote-tracking branch 'mathewv/master'
...
# Conflicts:
# scripts/SaveLoad.rb
2017-03-02 22:38:38 -08:00
55cec53911
Sprite: Clamp src_rect to bitmap bounds
2017-02-17 19:29:38 +01:00
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
tdixon
Jonas Kulla
mshirt
jonathan de jong
Mathew Velasquez
GIRakaCHEEZER
Marty Plummer