Vinyl Darkscratch
4965867df9
Merge remote-tracking branch 'mathewv/master' into oneshot-fop
2017-05-14 15:53:25 -07:00
Vinyl Darkscratch
c9d821e878
Remove accidental bindings
2017-05-14 15:50:59 -07:00
mshirt
b41106ee7d
adding another ignored file
2017-05-11 22:45:17 -07:00
Jonas Kulla
bd694f9f99
Graphics: Remove superfluous TEXFBOs while reusing existing ones
...
While the PingPong buffers were always texture-backed, currentScene
and transBuffer used to be backed by renderbuffers, which might have
been more optimized as render targets on older hardware; but since
all buffers in Graphics got switched to being texture backed to allow
blitting via rendering (when hardware blitting isn't available or broken,
eg. on mobile platforms), their reason to exist vanished.
For transBuffer, we can reuse the backbuffer of the PingPong structure,
while currentScene might have been useless from the start.
2017-05-11 12:37:15 +02:00
Jonas Kulla
cab453ac3a
Graphics: Use proper resizing function for TEXFBOs
...
Manually resizing the contained TEX objects skips updating the
width/height TEXFBO properties, which GLMeta::blit relies on.
2017-05-11 12:32:56 +02:00
Vinyl Darkscratch
a091b53f69
Merge branch 'master' into master
2017-05-07 21:49:38 -07:00
mshirt
4c61892e2e
Fixing mklang file problems on windows and adding some errors to catch in SaveLoad
2017-05-07 15:18:35 -07:00
GIRakaCHEEZER
8105180d01
Merge pull request #7 from taedixon/localization
...
Localization
2017-05-07 15:10:02 -07:00
tdixon
7fc5346bae
Strip escaped newlines from edtext dialogues
2017-05-07 18:57:41 -03:00
Vinyl Darkscratch
483cfddeb3
Update dependencies list (Qt is always required)
2017-05-06 14:39:26 -07:00
tdixon
96f1c43ac1
Add spanish to language options
...
Make MapText not crash when trying to create negative-width bitmaps
Add special rules to mklang
2017-05-04 22:01:00 -03:00
Vinyl Darkscratch
a0e78e0e56
Merge remote-tracking branch 'mathewv/master'
2017-04-27 21:01:26 -07:00
tdixon
cff99c2dd9
Merge branch 'master' into localization
2017-04-27 03:09:57 -03:00
Jonas Kulla
006f701fec
Config: Add "enableBlitting" entry to toggle GL_EXT_framebuffer_blit
2017-04-23 14:32:11 +02:00
Jonas Kulla
1478e1e0f9
Config: Add "maxTextureSize" entry to artificially limit texture sizes
2017-04-23 14:10:54 +02:00
mshirt
84b0314e4d
Changing niko sprites to en sprites if on "..." replay
2017-04-22 10:26:33 -07:00
Vinyl Darkscratch
3cd9e58ba5
Merge remote-tracking branch 'mathewv/master'
2017-04-13 20:13:54 -07:00
tdixon
d5822423e9
Merge branch 'master' into localization
2017-04-11 03:01:53 -03:00
tdixon
92e88d7182
Prevent crashing from disposed bitmaps
2017-04-11 03:01:37 -03:00
mshirt
e48fb2660e
press x to delete chars added
2017-04-09 12:26:30 -07:00
Jonas Kulla
06feafe9ef
Add missing include
2017-04-08 20:06:12 +02:00
Jonas Kulla
e4079d5738
Fix build on OSX after 60e967e3b7
2017-04-08 19:13:31 +02:00
Jonas Kulla
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
Jonas Kulla
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
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
tdixon
1f594e4268
Merge branch 'master' into localization
2017-04-03 19:11:08 -03: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
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
