Commit Graph

650 Commits

Author SHA1 Message Date
Blake Grotewold 0f243637a1 Merge pull request #435 from TwistedAkai/master
Made fur gambling return fur.
2015-09-20 16:36:40 -04:00
Akai Alonkai 95057c9704 Made fur gambling return fur.
Function was paying out in wood, not fur, contrary to notification text.
2015-09-20 16:32:54 -04:00
Andrea Rendine 239735f487 Merge pull request #18 from doublespeakgames/master
Update 2015-09-20
2015-09-20 14:41:47 +02:00
Michael Townsend b533f86d2a Merge pull request #433 from ngosang/spanish_translation
Update Spanish translation
2015-09-18 09:54:43 -04:00
ngosang b700c4b9f5 Update Spanish translation 2015-09-17 23:57:38 +02:00
Michael Townsend 6670a9ce09 Merge pull request #431 from ngosang/test2
Update all strings.js
2015-09-17 16:52:52 -04:00
ngosang b5db2b558d Update all strings.js 2015-09-03 10:03:31 +02:00
Michael Townsend 94fea5a3a8 Merge pull request #429 from bdorer/master
de: updated German language files
2015-08-18 22:13:32 -04:00
Michael Townsend 4626961286 Merge pull request #428 from JeanAraujo/master
Update PT-BR Translation
2015-08-18 22:13:11 -04:00
bdorer1 5aa5748ddd de: updated German language files 2015-08-19 00:08:22 +02:00
Jean Araujo 066a34b125 Update strings.js 2015-08-12 14:29:20 -03:00
Jean Araujo 75324a5240 Update strings.po 2015-08-12 14:28:18 -03:00
Continuities a0b343246c Code style 2015-08-02 11:40:27 -04:00
Michael Townsend 64f6797c3e Merge pull request #425 from Sebring/master
Showing total in stores tooltip - Issue #170
2015-08-02 11:36:57 -04:00
Sebring 1e37f45530 Display time delay on total row in tooltip 2015-07-29 20:08:09 +02:00
Sebring 100ff277ff Styles for total in tooltip 2015-07-29 16:59:16 +02:00
Sebring fea54cd97f Add total to tooltip 2015-07-29 16:57:26 +02:00
Blake Grotewold 95cf44c2f2 Fix removeBranch function definition 2015-07-25 20:23:35 -04:00
Blake Grotewold 3cbb049a7e Update Russian and French translation .js files 2015-07-24 22:18:32 -04:00
Ricky Chandra e504e79cd0 Add Indonesian translation 2015-07-24 22:10:34 -04:00
Yuki Usagi 075ac8934e Add Traditional Chinese
Consolidation of 97bb59e f177db4 35eff47 51197a3

Closes #421
2015-07-24 22:05:45 -04:00
Blake Grotewold 4159febc77 Merge pull request #422 from TeddyBear06/patch-1
Update strings.po
2015-07-24 21:38:11 -04:00
Blake Grotewold e23550c1a0 Merge pull request #419 from Anwinz/patch-2
Update strings.po
2015-07-24 21:36:49 -04:00
Ludovic 98682e1b24 Update strings.po
Fix some typos mistakes.
2015-07-22 17:34:57 +02:00
Anwinz 62ad16e4b8 Update strings.po 2015-07-07 21:49:53 +03:00
Andrea Rendine 65d7cfd784 Hyper-proof cooldown state
Kept the distinction between "argument" time and script time. I called the latter "time" instead of "milliseconds" because, well, it's just tenth of seconds.
Residual timeout is always stored in "nominal" time, not adjusted by hyper. I.e. if a button has a nominal timeout of 60 seconds and half cooldown had expired on reload, residual is stored as 300. In cooldown, Engine.setInterval makes the time flow with double speed
2015-06-29 12:49:57 -04:00
Andrea Rendine e95cb5235e Merge pull request #17 from doublespeakgames/master
Update 2015-06-29
2015-06-29 16:29:08 +02:00
ekgr a923c1c0bd Added a Greek translation 2015-06-28 18:05:56 -04:00
Masaki KOBAYASHI ed837f3aec fix typo 2015-06-28 14:56:31 -04:00
Andrea Rendine 03fae08ff2 Compass relocation
This commit carries some changes.
* the compass is now a "special" item, not "good". It allows a different placing
* Store block is now divided into 2 parts. All the script is adapted to make room for it, including empty block check and insert animation for the new #store children divs
** Above: stackable storable items (resources), whose tooltip shows updated income/consumption rates
** Below: special storable items. As of now, it only contains the compass. Special block has a special style, with some distance from resources block if that one exists.
* Compass row has an empty tooltip which is filled in by World
2015-06-28 14:27:37 -04:00
Andrea Rendine 128f1341a0 Merge pull request #16 from doublespeakgames/master
Massive update 2015-06-27
2015-06-27 18:19:09 +02:00
Andrea Rendine 7208b845b1 Take all, take everything, leave if possible
Multiple fixes:
1. take all of a kind
2. take everything
3. if possible, leave
4. drop menu on hover
5. Same item not shown as drop option
2015-06-27 02:13:14 -04:00
Andrea Rendine da0d39b579 Check for delayed events
This triggers onload for all those events whose (possible) reward is registered with a time delay.
2015-06-27 01:43:09 -04:00
Andrea Rendine cb717b41d0 function for fire hut event and more
Effect of hut fire is associated with new Outside method .destroyHuts().
2015-06-27 00:44:26 -04:00
Blake Grotewold 09c070adfa Make tooltips in Lights off not so black 2015-06-27 00:42:23 -04:00
Andrea Rendine 358fe5fbcc Restore navigation property
Instead of a timed method to restore lx/rx navigation, a property will be set to true. In that case, the keyup method will not be executed, but it will restore navigation for further use.
2015-06-27 00:26:41 -04:00
wmassingham f94cfe2590 disable tab navigation during events (fixes #403) depends on @AndySky21's branch world-to-path 2015-06-27 00:26:40 -04:00
Andrea Rendine 08bd1c7caf Single letter representations for enemies
R wild animals (beast, birds, lizards, rats)
T mutated creatures (includes giant lizards)
E human enemies (old men, scavengers, thugs and squatters)
D armed human enemies (includes vigilantes, soldiers, snipers, commandos, veterans and chiefs)
2015-06-27 00:26:40 -04:00
SVS 1d2f95b561 Change the enemy labels 2015-06-27 00:26:40 -04:00
Andrea Rendine daf5de3973 Property for tab navigation
Added Engine.tabNavigation property. When true, it enables keyboard navigation to/from tabs. It is disabled on world and enabled some milliseconds after Path.onArrival(), so that when player returns s/he finds him/herself on Path tab instead of navigating.
2015-06-27 00:26:40 -04:00
Andrea Rendine 64a02c162c Modified command destination for save
Export dialog replaces selection dialog, rather than overlapping it.
Closing it exits the panel and returns to current game.
Aborting Import dialog returns the player to the selection screen, so that s/he can save before trying to load.
2015-06-26 23:49:30 -04:00
Andrea Rendine c4535c029a Alphabetical order for workers
I had missed this completely. Workers are listed in alphabetical order in English. Now they are ordered in other languages too.

Alphabetical order for outfit
2015-06-26 23:42:11 -04:00
Blake Grotewold 7babe5d102 Clean up Available Lanaguges
In my never ending fight against the readme. This is my next iteration
2015-06-26 23:30:46 -04:00
Andrea Rendine 92f7cf683e Unified legend
Legends on boxes and lists are currently added via CSS and as stylesheets cannot be localised, translated strings rely upon an additional inline CSS.
This commit inserts localised legends as "data-legend" attributes on proper elements, and then this attribute is shown by stylesheet rule content: attr(data-legend). No need of localisation script and more compact CSS rules.
2015-06-26 22:10:02 -04:00
Andrea Rendine 93649307f6 Non-overlapping up/down buttons
Fixed dimensions and margins for up/down arrows.
2015-06-26 21:54:41 -04:00
Andrea Rendine 8306f155f1 Notifications for outside events
As said in #363, there are almost no notifications for outside events.
I took a little liberty to suggest new sentences. Inspired by the game atmosphere and the double notification for Hut Fire, wrote lines for events and possible outcomes.
they're associated to buttons where there are no outcome scenes.
2015-06-26 21:31:20 -04:00
Blake Grotewold 4fed30380f Merge pull request #414 from ekgr/master
Changed size of languages menu (issue#413)
2015-06-21 13:44:14 -04:00
ekgr 4724aaf6e3 Changed size of languages menu
The Portuguese (brazil) option was too long and wrapping around to the next line, appearing right over the next language in the menu. Increased the width to accommodate in one line. Also increased the max height as the last language option wasn't visible. The menu can take one more language before needing to increase the height.
2015-06-21 17:25:47 +02:00
Blake Grotewold d5bbca90a4 Merge pull request #412 from JMRedford/patch-1
Change Plague events to take half of population.
2015-06-14 22:44:15 -04:00
John Redford ee591ca218 Update outside.js
Changed sickness event to kill up to half of the villagers instead of up to 20.
2015-06-14 00:47:08 -05:00