Commit graph

29 commits

Author SHA1 Message Date
Vinyl Darkscratch
7428595adb Add CompleteBundle.cmake file 2017-10-12 01:02:43 -07:00
Vinyl Darkscratch
6c772cfdd2 Merge remote-tracking branch 'mathewv/master' into oneshot-fop 2017-07-08 02:52:09 -07:00
mshirt
0a5b36438d Forcing encoding of player's default name
It can cause a crash later if it's the wrong encoding, and this seems to
fix said crash.
2017-06-07 23:59:07 -07:00
mshirt
7b0b8e0a9c Item icons no longer overlap item name text 2017-05-30 22:42:15 -07:00
mshirt
66ceab32d8 Adding functions for language QA testing 2017-05-17 22:04:21 -07:00
Vinyl Darkscratch
4965867df9 Merge remote-tracking branch 'mathewv/master' into oneshot-fop 2017-05-14 15:53:25 -07:00
mshirt
b41106ee7d adding another ignored file 2017-05-11 22:45:17 -07: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
Vinyl Darkscratch
640ecd46f9 Include OneShot_template.app 2017-04-04 01:45:25 -07:00
Vinyl Darkscratch
f59bc1d76a Add automated macOS compile script and remove unneeded CMakeLists 2017-03-30 17:05:02 -07: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
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
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
0b7fdbf8e1 Updates for a future Mac build 2016-12-12 22:59:07 -08:00
Mathew Velasquez
90eb18a8ac Adjusted save file name; fixed .gitignore 2016-11-04 17:58:37 -04:00
Mathew Velasquez
78c4c3b9bf Niko/Journal for windows 2016-11-03 18:37:14 -04:00
Michael Shirt
33d6f38f96 No one needs this bat file but me
So I will just tell git to ignore it
2016-09-20 20:53:20 -06:00
Mathew Velasquez
a4de9d9f10 integrated steamshim 2016-02-29 01:22:55 -05:00
Mathew Velasquez
48b8838ff0 Removed personal rules from .gitignore 2016-01-05 14:50:18 -05:00
Mathew Velasquez
d3aab843b9 Added additional rule to gitignore 2016-01-05 14:50:18 -05:00
Mathew Velasquez
3d2d1a9150 Manually rebased over latest mkxp commit. Some features, such as lighting, are not reimplemented yet. 2016-01-05 14:50:17 -05:00
Jonas Kulla
013437074b gitignore: Add codeblocks files 2014-06-08 06:55:37 +02:00
Edward Rudd
b1a2569dff add CMake project for easier building 2013-12-31 16:24:14 -05:00
Jonas Kulla
88c1489554 Include vertex shader xxd's 2013-09-23 07:14:53 +02:00
Jonas Kulla
80d0b33dda Add 'Makefile' / xxd+ binary to gitignore 2013-09-10 04:17:23 +02:00
Jonas Kulla
ff25887f41 Initial commit 2013-09-01 16:27:21 +02:00