305 Commits

Author SHA1 Message Date
Tyler Kennedy
08e33ccbaf Merging in style changes, minor fixes, unused imports, pymclevel update. 0.1.1 2012-04-15 13:03:39 -04:00
Tyler Kennedy
18778d2f2b Merge branch 'master' of https://github.com/jedediah/mcedit 2012-04-15 12:41:57 -04:00
Jedediah Smith
634b263a42 remove a spurious apostrophe that confuses emacs 2012-04-13 06:43:32 -04:00
Jedediah Smith
c9604d768a fix mouse jump after regaining focus (without touching albow) 2012-04-13 06:40:55 -04:00
Jedediah Smith
4e604d5a5d revert changes to external library albow 2012-04-13 06:08:06 -04:00
Jedediah Smith
61754f3e16 fix mouse-look jumping after losing and regaining focus (probably only on Mac) 2012-04-10 03:09:39 -04:00
Tyler Kennedy
c2747e1734 Updated pymclevel 2012-04-10 02:32:03 -04:00
Tyler Kennedy
6db82ab8d9 Merge pull request #72 from FlukyPhoenix/99c5ed6a53008e2a9ad04f3661882b64b41a447a
Update terrain.png and pymclevel.
2012-04-01 19:35:46 -07:00
Tyler Kennedy
4ee68aa817 Merge pull request #71 from SpikeMeister/history-ctd
Fix a CTD from the mcedit main menu
2012-04-01 19:35:13 -07:00
FlukyPhoenix
99c5ed6a53 Updated pymclevel
Signed-off-by: FlukyPhoenix <git@flukyphoenix.com>
2012-04-02 02:10:03 +01:00
FlukyPhoenix
e775482a3c Update Terrain.png from 1.2.5 .
Signed-off-by: FlukyPhoenix <git@flukyphoenix.com>
2012-04-02 02:04:59 +01:00
Andrew Hughson
6ed7161b99 Change the 'Recent changes' button to open the history page on the wiki. 2012-04-02 10:40:30 +12:00
Andrew Hughson
50f6c93a5c Fix the 'Recent Changes' menu option to show the contents of 'history.txt' (currently does not exist) and not CTD if 'Show history.txt' is selected from the alert message. 2012-04-01 17:09:40 +12:00
Tyler Kennedy
d22791ff1d And that's what I get for rushing. 2012-03-28 11:30:28 -04:00
Tyler Kennedy
7043486d61 Missing deepcopy import 2012-03-26 21:25:50 -04:00
Tyler Kennedy
592e2121a4 Kludge around auto_update to prevent crashing without an internet connection. 2012-03-26 21:12:14 -04:00
Tyler Kennedy
e5ffd49808 Seperate stream + file logging (mcedit.log) 2012-03-26 21:07:09 -04:00
Tyler Kennedy
f3d7495dcd Updated pymclevel 2012-03-26 20:39:56 -04:00
David Sowder
343a9e4c70 Merge with git@github.com:zothar/mcedit.git 'master' 2012-03-21 17:41:57 -05:00
David Sowder
b366a331bd frustrum.py: GL.newaxis should be numpy.newaxis, so make it so 2012-03-21 17:39:23 -05:00
David Sowder
b11bbee6df shuffle module import style for OpenGL to import the module instead of the package in a few files 2012-03-21 17:39:22 -05:00
David Sowder
37ab31b777 Fix bad search/replace error for blockMaterials.clip() identified by codewarrior0 2012-03-21 17:37:28 -05:00
David Sowder
e6902af034 pull from pyflakes branch: unravel/mangle imports 2012-03-21 17:37:27 -05:00
David Sowder
8a87e19e21 Merge branch 'master' of https://github.com/mcedit/mcedit 2012-03-20 21:37:22 -05:00
David Sowder
6eed08c8f5 frustrum.py: GL.newaxis should be numpy.newaxis, so make it so 2012-03-20 21:28:56 -05:00
David Sowder
8b1d869c33 shuffle module import style for OpenGL to import the module instead of the package in a few files 2012-03-16 08:30:51 -05:00
David Sowder
e043aa4b7a Fix bad search/replace error for blockMaterials.clip() identified by codewarrior0 2012-03-14 19:41:38 -05:00
Tyler Kennedy
d4972276bf Fixes title issues. 2012-03-13 09:45:36 -04:00
Tyler Kennedy
bcf7ea8cb0 Small windows build fix. Filter and schematic fix. 2012-03-13 07:11:32 -04:00
Tyler Kennedy
a0894380b3 Added OS X app icon. 2012-03-13 06:14:32 -04:00
Tyler Kennedy
f3efb83d43 Extremely basic auto updating. 2012-03-13 06:03:19 -04:00
Tyler Kennedy
bf2b842e4b Changed match pattern 2012-03-13 05:49:09 -04:00
Tyler Kennedy
0eb42afb61 Updating pymclevel head 2012-03-13 04:19:01 -04:00
Tyler Kennedy
aa4616f006 Don't display tile ticks by default, confusing to novice users and generates an annoying number of complaints. 2012-03-13 03:53:33 -04:00
Tyler Kennedy
ef91839844 Removed more unneeded prints, converted others to logging. 2012-03-13 03:49:08 -04:00
Tyler Kennedy
0041b8c23a Replaced stray print in settings 2012-03-13 03:40:35 -04:00
Tyler Kennedy
f840fb4786 Fixed missing methods. release.py reads RELEASE-VERSION.py 2012-03-13 03:38:00 -04:00
Tyler Kennedy
1032d1492a Added auto-versioning to setup.py, if git is available. As part of this process, building on Windows requires git in your PATH to get a valid version (otherwise your build will be labeled unknown.) 2012-03-13 03:20:12 -04:00
Tyler Kennedy
19bb2f6b2f Updating pymclevel head 0.1.0 2012-03-13 02:53:10 -04:00
David Vierra
6b11355182 Merge pull request #57 from jedediah/master
Use pure Python PNG loader instead of pygame.load
2012-03-11 18:33:57 -07:00
David Sowder
fead577efd pull from pyflakes branch: unravel/mangle imports 2012-03-11 16:05:50 -05:00
Jedediah Smith
ac79f0610d Merge branch 'master' of https://github.com/mcedit/mcedit 2012-03-07 09:22:07 -05:00
Jedediah Smith
60bdbbe75d use pure python PNG loader instead of pygame.load (which was broken for me anyway) 2012-03-07 09:19:56 -05:00
Jedediah Smith
75b226d658 remove reference to non-existant history.txt in setup.py 2012-03-07 09:18:52 -05:00
Tyler Kennedy
a8ad2a5186 Merge pull request #54 from Cralex/patch-1
Changed wording on line 48 of readme.
2012-03-06 13:09:10 -08:00
Cralex
58247820ba Changed wording on line 48. 2012-03-05 15:01:46 -07:00
Tyler Kennedy
2a4e6dc57f Merge pull request #53 from zothar/master
tempfile import fixes
2012-03-05 13:10:29 -08:00
David Sowder
7e921a4229 More import related fixes similar to those in pull request/issue #53 2012-03-04 21:08:55 -06:00
David Sowder
f4cc898145 import tempfile locally rather than relying on it being available through our import of pymclevel 2012-03-04 19:14:21 -06:00
Tyler Kennedy
61b90b3ac6 Merge branch 'master' of github.com:mcedit/mcedit 2012-03-04 19:23:19 -05:00