oreolek
/
undum
mirror of https://github.com/Oreolek/undum.git
1
0
Fork 0
Code Issues Releases Wiki Activity
171 Commits 6 Branches 1 Tag 3.5 MiB
Commit Graph

171 Commits

Author SHA1 Message Date
Ian Millington 1cc7706aee Merge pull request #49 from JoshuaGrams/master 
Tutorial game typo fix.
 2016-08-06 04:21:59 +01:00
Josh Grams ebfccd7c18 Tutorial: the line is subtle, not separate/distinct. 2016-08-05 21:48:11 -04:00
Ian Millington c39a1f5df6 Merge pull request #45 from eykd/bug/bad-this-for-real 
Fix bad reference to this (for real)
 2015-10-23 09:24:15 +01:00
eykd f8557e0070 Fix bad reference to this 
So, my earlier fix was misunderstanding the situation. Inside a `filter()` lambda, `this` is bound to the current DOM object. In order to call `attr()` on it, we first need to wrap it in a jQuery object.
 2015-10-22 16:11:23 -07:00
Ian Millington f4b2014962 Merge pull request #44 from eykd/bug/bad-this 
Fix bad reference to `this` inside closure
 2015-10-21 02:24:58 +01:00
eykd 92fc4c5b67 Fix bad reference to `this` inside closure 2015-10-19 21:26:47 -07:00
Ian Millington 56c080c984 Merge pull request #40 from sequitur/quality-list-null 
Fixed 'null' in WordScaleQuality lists not behaving as you'd expect
 2015-03-01 14:27:37 +00:00
Bruno Dias e9431b2d98 Fixed 'null' in WordScaleQuality lists not behaving as you'd expect 2015-03-01 06:21:24 -03:00
Ian Millington 6f6741769a Merge pull request #36 from sequitur/writehelpers 
Add new variants of System.prototype.write()
 2015-02-22 15:10:12 +00:00
Bruno Dias dad361bd78 document previously added methods 2015-02-22 12:01:42 -03:00
Bruno Dias 8c9fc510ec add helper functions System.prototype.writeInto and System.prototype.replaceWith 2015-02-22 11:51:58 -03:00
Ian Millington c3a1266e47 Merge pull request #34 from TranquilMarmot/master 
Upgrade to jQuery 2.1.3
 2015-01-19 21:47:29 +00:00
TranquilMarmot 4b1870cc93 Upgrade to jQuery 2.1.3 2015-01-19 12:28:38 -08:00
Ian Millington 415be2e41c Merge pull request #33 from Grahack/french_trans 
Add French translation.
 2014-11-04 01:33:55 +00:00
Christophe Gragnic 3d70a6d766 Add French translation. 2014-11-03 23:18:48 +01:00
idmillington 2cae722275 Merge branch 'Oreolek-actionnaming' 2014-08-13 13:13:18 +01:00
idmillington 7c9f5f1bbf Merge branch 'actionnaming' of https://github.com/Oreolek/undum into Oreolek-actionnaming 
Conflicts:
	games/media/js/undum.js
 2014-08-13 13:12:54 +01:00
idmillington 78da72c9d2 Move Russian translation up to version 2. 2014-08-13 13:03:33 +01:00
Ian Millington 97f7fd1b4e Merge pull request #28 from Oreolek/master 
Russian tutorial
 2014-08-13 12:40:15 +01:00
Ian Millington 32733856ec Merge pull request #31 from Oreolek/enter 
Call SimpleSituation.enter before main content
 2014-08-13 12:38:04 +01:00
Ian Millington ecc44d2036 Merge pull request #32 from Oreolek/parameters 
Issue #27: alternate link syntax
 2014-08-13 12:36:29 +01:00
Alexander Yakovlev 2375eb49d0 Bugfixing 2014-08-03 14:35:34 +07:00
Alexander Yakovlev 03c8886a95 Transient links 2014-08-03 14:28:36 +07:00
Alexander Yakovlev a7ced16ab8 Alternate link syntax (issue #27) 2014-08-03 14:18:12 +07:00
Alexander Yakovlev 0369a3bec1 Call SimpleSituation.enter before main content 2014-08-03 13:51:02 +07:00
Alexander Yakovlev 23ccb50dc7 Allow underscores in action names 2014-08-03 13:45:16 +07:00
Alexander Yakovlev 7fcf4dc696 Russian tutorial 2014-08-03 13:08:23 +07:00
idmillington 2922c1f10e Resolve #25 
When setQuality is called on a quality that isn't defined,
the quality is set in the character (as the documentation says), but
Undum no longer crashes when trying to display the quality (it fails
silently). On the other hand, calling addQualityBlock for a quality
without a definition throws a more sensible error message than a
complaint about trying to access 'null'.
 2014-08-02 18:37:48 +01:00
idmillington d07e815e25 Add Nafanin to CREDITS. 2014-07-25 09:33:02 +01:00
idmillington 831dd79795 Correct CSS to center correctly on IE 9+ 2014-07-24 16:29:42 +01:00
idmillington f759d1d25e Correct issues highlighted by jshint, and remove extraneous vendor prefixes identified by autoprefixer. 2014-07-24 02:55:44 +01:00
idmillington 4b320023ba Restore the 'live' functionality where anywhere in an option block entry can be clicked to select that option. 2014-07-23 23:18:50 +01:00
idmillington d0ea3b7022 Add support for single-tag or single-id to be passed as a string to getSituationIdChoices. 2014-07-23 21:47:47 +01:00
Ian Millington 945ce92b5a Merge pull request #20 from Ntropy/master 
Minor correction of russian translation
 2014-07-22 15:20:28 +01:00
idmillington d944fd8f59 Add another new marbled paper texture, this time returning to the original design in the better colors. 2014-07-17 20:20:38 +01:00
idmillington 996e54b956 Correct unended emphasis tag in tutorial game. 2014-07-15 00:05:12 +01:00
idmillington 7cbf5344be Merge branch 'master' of https://github.com/idmillington/undum 2014-07-14 23:51:10 +01:00
idmillington 52beba51ee Change marbled paper image, old one had jpeg artifacts. 2014-07-14 23:50:33 +01:00
Ian Millington b3ed642307 Merge pull request #22 from michaelenger/master 
Update jQuery to version 1.11.0
 2014-04-09 22:37:51 +01:00
Michael Enger 18a003dc29 Update to latest version of jQuery 
By "latest" version I mean the latest older-browser-compatible version (v1.11.0)
and not the bleeding-edge version (v2.1.0).
 2014-03-29 00:06:32 +01:00
Michael Enger dae4b57e7b Compensate for missing "lang" attribute 
If the "lang" attribute is missing from the <html> element it breaks the engine.
Defaults to nothing in lieu of using "en" as default.
 2014-03-29 00:01:24 +01:00
Ntropy 55c856b9ce Minor correction of russian translation 2014-01-11 21:47:54 +04:00
idmillington 11aa2e05ad Added clarification to the README that the license covers everything. 2013-12-10 09:31:29 +00:00
idmillington 8727924b68 Clarified CREDITS ordering. 2013-12-10 09:28:36 +00:00
idmillington 52936cb2b5 Merged with remote master. 2013-12-10 09:24:43 +00:00
idmillington d61741f8cf Cleaned up licenses / copyright. Thanks to Oreolek for the advice. 2013-12-10 09:21:57 +00:00
Ian Millington 9e64c85d10 Change readme to reflect the new github page layout. 2013-11-18 18:58:44 +00:00
idmillington 99b78e1a27 Corrections from proofreading the new tutorial content. 2013-09-29 21:32:35 +01:00
idmillington c84a620247 Added new doc files to upload. 2013-09-29 19:51:19 +01:00
idmillington 6aa173bfb0 Reworked the Undum tutorial into sections. 2013-09-29 18:46:25 +01:00