Apple-2-SW/lawless-legends
1
0
Fork 0
mirror of https://github.com/badvision/lawless-legends.git synced 2024-11-18 23:07:53 +00:00
Code Issues Projects Releases Wiki Activity
1,580 Commits 3 Branches 1 Tag 52 MiB
377d7c21f4
Commit Graph

230 Commits

Author SHA1 Message Date
Brendan Robert
006ed04ad0 Fixed NPE caused by unitalized Scripts object 2015-07-08 15:21:20 -05:00
Brendan Robert
ffb848f386 Added some patch code to restore lost script names from the recent data model change 2015-07-07 00:20:26 -05:00
Brendan Robert
d2f4766e51 Put "init" as the topmost item in the sort again 2015-07-05 22:59:28 -05:00
Brendan Robert
736ab81061 Custom user types are now working, and a few other cleanups in the code were made along the way to support this massive change. 2015-07-05 22:54:23 -05:00
Brendan Robert
bc0e0b1217 Global variables can be created and used in scripts now 2015-06-28 23:19:29 -05:00
Brendan Robert
314102bba7 Global and Local functions are now working! All underlying functionality for global/local variables is also in place but untested until variable UI is hooked up 2015-06-23 17:07:19 -05:00
Brendan Robert
050613781d Abstracted Map and Global to both be scopes and share common constructs. 2015-06-23 16:31:37 -05:00
Brendan Robert
e41e515014 Global functions now have proper return and non-return variant calls and full parameter support! 2015-06-23 01:37:39 -05:00
Brendan Robert
f94e2beeb7 Global functions now show up!! 2015-06-22 02:14:12 -05:00
Brendan Robert
2cb2135810 Big step forward in supporting user-defined types, global functions and global variables (still in progress). This has all the new XML/bean support and most of the Blockly glue to make things work. 2015-06-22 01:40:07 -05:00
Martin Haye
5fa973ea7c Added a 'get any key' block. 2015-06-03 07:56:19 -07:00
Brendan Robert
44be65de1a Added new graphics icons added to Blockly 2015-06-01 20:43:28 -05:00
Brendan Robert
126e35d201 Updated Blockly internals to latest from GitHub. Added prompt dialog handler so variable renaming and creation now work! Also added stubs for the next chunk of scripting soon to be added. 2015-06-01 20:43:27 -05:00
Martin Haye
234fadabe1 Merge branch 'master' of https://github.com/badvision/lawless-legends 2015-05-31 19:03:41 -07:00
Martin Haye
6b51dff8b9 Added move_backward blockly block. 2015-05-31 19:03:38 -07:00
Brendan Robert
671de1257c FIXED OLE-12 -- Map script deletion has been implemented with confirmation. Same confirmation propmpt has been added to global script deletion as well. 2015-05-30 16:28:10 -05:00
Martin Haye
994205c842 Merge branch 'master' of https://github.com/badvision/lawless-legends 2015-05-28 09:05:29 -07:00
Martin Haye
f1dfcccff3 Added Blockly blocks for showing portraits. 2015-05-28 08:14:01 -07:00
Brendan Robert
32a3180ebd FIXED OLE-7 
Global scripting is now somewhat available but needs some additional features to be really usable.
 2015-05-28 01:04:31 -05:00
Brendan Robert
5ef88e1268 OLE-7 Renamed controller/tab to reflect globals, not just global scripts 2015-05-28 01:03:37 -05:00
Brendan Robert
761c3247a2 OLE-7: Refactored script controller to use the same abstract pattern as other UI controllers 2015-05-27 23:48:53 -05:00
Brendan Robert
86a9edf5aa Added new revolver icon for Outlaw editor, but currently there's no packaging to take advantage of it yet. 2015-05-25 23:49:44 -05:00
Brendan Robert
240ea8aad8 Stubbed out the new global script editor UI, not hooked up to anything yet though. 2015-05-25 23:49:10 -05:00
Brendan Robert
93efce12eb Script name colors are now prevented from being too bright and also are bold to be more readable. 2015-05-23 15:50:58 -05:00
Brendan Robert
59b55105a5 Added cursor helper and cleaned up event model (a little) 2015-05-22 00:17:55 -05:00
Brendan Robert
c238eb3afd Added null checks for new maps 2015-05-22 00:17:21 -05:00
Brendan Robert
c24db71b78 Flipped eraser icon horizontally 2015-05-22 00:17:06 -05:00
Brendan Robert
13ac184d89 Object cloning now possible -- TransferHelper is the current holder of the functionality but it should probably be moved somewhere better 2015-05-21 00:14:30 -05:00
Brendan Robert
71f20dcf1b Sort scripts alphabetically now 2015-05-20 23:15:31 -05:00
Brendan Robert
7541cf4a52 Moved left arrow over so it doesn't overlap scripts pane 2015-05-20 23:15:15 -05:00
Brendan Robert
5d252cfc77 fixed incorrectly implemented debounce logic 2015-05-20 23:14:42 -05:00
Martin Haye
907666c716 Now able to script transitions from 2D to 3D and back. 2015-05-20 09:47:35 -07:00
Brendan Robert
b12d9cec7d Control Space hooked up as well as new eraser tool 2015-05-16 12:31:22 -05:00
Brendan Robert
bb913b0242 "Control Space" feature for quick tile selection 2015-05-16 12:29:22 -05:00
Brendan Robert
2049cb0756 Fixed annoying bug that would cause current tile to be disselected when editing name/category 2015-05-15 00:08:13 -05:00
Brendan Robert
1c7b1159be Tiles are now presented in category-based submenus and current tile is retained when switching maps 2015-05-15 00:07:51 -05:00
Brendan Robert
f4b45003bd Switched to JFX 1.8 packaging and added visibility controls for scripts (still a work in progress though) 2015-05-14 01:01:58 -05:00
Brendan Robert
c79f333d24 Adding new visiblity icons 2015-05-14 01:01:28 -05:00
Brendan Robert
8206fb28dd Updated project dependencies to be compatible with JDK8u40 2015-04-02 23:44:09 -05:00
Brendan Robert
e0d16ebd08 Fixed way that missing tiles are handled: WARNING this update requires JRE 8_40 or higher 2015-03-29 01:35:46 -05:00
Brendan Robert
fe2a00c46c Added zoom level display to image editor 2015-03-15 11:19:56 -05:00
Brendan Robert
547d0c72f4 Added state preservation logic to image editor to keep brush and fill pattern selections intact when switching images 2015-03-14 23:24:08 -05:00
Brendan Robert
5da472806d Minor semantic changes, nothing earth-shattering here 2015-03-12 00:14:36 -05:00
Brendan Robert
cfad4e4bdc Added category name to tile selection in map editor 2015-03-08 19:15:51 -05:00
Brendan Robert
6bc3b87329 Changed category to a single value and added auto-sort in the tile and image selectors 2015-03-08 18:58:31 -05:00
Brendan Robert
61bf08d0c4 Added PC/Hi/Lo variants of the B&W checkered patterns 2015-02-09 21:24:34 -06:00
Brendan Robert
17d8c6d082 Added whole-image paste support 2015-02-03 19:10:36 -06:00
Brendan Robert
f6b38066c7 Added logic to reset zoom of image editor when switching/creating images and also fixed blue rectangle showing in wrong place when drawing rectangles. 2014-12-16 22:06:27 -06:00
Brendan Robert
e7aa88ab65 Moved image editor fxml and fixed case issue that broke in many OSes (but worked in Mac, strangely enough). Also un-smushed image form fields 2014-12-16 21:07:29 -06:00
Brendan Robert
ef905a7457 Changed zoom/pan of image editor to use scrollPane, also other small code tweaks in a few places. 2014-12-15 20:59:38 -06:00
Brendan Robert
a5915592b9 Updated test expectations for red/blue hgr tests 2014-11-08 10:09:50 -06:00
Brendan Robert
929e285f00 Fixed image editor panning behavior (overlap issue is still present) 2014-11-08 09:25:33 -06:00
Brendan Robert
21e5495202 Added lo/hi variations for black and white. Also made incremental improvements for image editing (fixed slowness issues) 2014-11-08 08:32:00 -06:00
Brendan Robert
ca3f295d8d Added black/white tests back, lowered expectations for other test quality 2014-11-05 01:16:39 -06:00
Brendan Robert
0b77c5ea85 Additional tweaking of coefficients to eliminate blown-out images 2014-11-05 01:15:58 -06:00
Brendan Robert
1878960952 Slight cleanup of calculations, also faster array copy being used now 2014-11-04 23:31:12 -06:00
Brendan Robert
194b9783e4 Adjusted coefficients to avoid blown-out images 2014-11-04 23:30:33 -06:00
Brendan Robert
5b3518595b Knocked out a lot of testing issues, and now tests run in seconds (was setting dimensions way too large!) Will try to find better coefficients now that test harness is working. 2014-11-04 23:29:57 -06:00
Brendan Robert
9b5e27088f Added expanded error correction 2014-11-02 12:25:17 -06:00
Brendan Robert
559e20e645 Image conversion tests and tweaks to get image dithering looking correctly for HGR and DHGR again (finally!!) 2014-11-02 01:02:10 -05:00
Brendan Robert
b11da29c56 Added image adjustments and tweaked HGR conversion some more (and fixed another bug...) 2014-10-02 01:25:54 -05:00
Brendan Robert
489a05803e Pixel shift was a bad idea working around the boundary issues just fixed -- now HGR conversion is correct (AT LAST!) 2014-10-01 02:52:00 -05:00
Brendan Robert
6da62c0f44 The last of the error-propagation bugs in HGR have been killed now I think. 2014-10-01 02:19:58 -05:00
Brendan Robert
368d767cfb Update README.md 
Cleared up future-case statement about Java 8
 2014-09-30 15:58:41 -05:00
Brendan Robert
c1f33bb309 Update README.md 
Outlaw uses Java 8, updated doc to reflect that
 2014-09-30 15:57:49 -05:00
Brendan Robert
2524063953 Delete hs_err_pid3251.log 
Unnecessary core dump file
 2014-09-30 15:55:01 -05:00
Brendan Robert
82d37d43d2 Got most of the hires dithering bugs out now -- peoples' faces are looking good. It might actually be correct or very close to correct now. :-) 2014-09-30 09:46:39 -05:00
Brendan Robert
429c4418e4 Clean up of hires dithering routines and logic, removal of the vertical lines. HGR still looks like HGR though. :-/ 2014-09-30 02:03:05 -05:00
Brendan Robert
a5f4117d68 Renamed dither class because it now superceeds Floyd-Steinberg dithering 2014-09-28 12:47:12 -05:00
Brendan Robert
f5eda11edd Fixes from cyclone test with Seth 2014-09-28 12:15:08 -05:00
Brendan Robert
f43c642875 Quantum leap forward with a new image conversion wizard! 2014-09-28 01:54:49 -05:00
Martin Haye
3641958791 Changed paste to 1 pass at Seth's request. 2014-08-20 11:41:26 -07:00
Martin Haye
0dcf9d31e2 Fix rectangle drawing in zoomed image editor. 2014-08-11 10:38:37 -07:00
Martin Haye
f1f00fff4b Merge branch 'master' of https://github.com/badvision/lawless-legends 2014-08-10 17:23:50 -07:00
Martin Haye
ced78e2a58 Hacked in a somewhat functional zoom for the image editor. 2014-08-10 17:23:43 -07:00
Martin Haye
072a6c22c5 Updated link to jar file. 2014-08-04 17:32:14 -07:00
Martin Haye
97b942036f Added blocks for setting sky and ground colors, and teleporting the player. Added support for init scripts using Blockly. 2014-07-20 06:02:10 -07:00
Martin Haye
fdb36f9aab Account for scrolled view when assigning and unassigning scripts. 2014-07-17 08:27:18 -07:00
Brendan Robert
8648130b4b Corrected GetBoolean return value so it can be used with logic statements 2014-07-06 16:59:07 -05:00
Brendan Robert
5b6f50553b Fixed issue with apostrophes in the script data and changed script color allocation a little bit. 2014-07-06 16:49:13 -05:00
Martin Haye
8dd017de6e Added Blockly event for switching to different map. 2014-07-06 08:20:23 -07:00
Brendan Robert
dd423e73e4 Added "Clear Window" block 2014-07-06 10:09:06 -05:00
Brendan Robert
bfe626eada Added script erasing support and fixed bizarre bug with map editor 2014-07-06 00:52:58 -05:00
Brendan Robert
486ba70778 Removed unnecessary example fxml file 2014-07-06 00:52:17 -05:00
Brendan Robert
41265e8f59 Added script coloring in the scripts list -- makes it possible to tell what script is associated on the map (yay!) 2014-07-04 16:52:14 -05:00
Brendan Robert
6c1a1c18af Scripts assigned to the map are now visible. Still needs some UX to be fully useful but it's sufficient for basic stuff. 2014-06-23 22:54:06 -05:00
Martin Haye
e98b96cf57 Finished changes to add 'sprite' and 'blocker' fields to tiles. 2014-06-18 08:09:41 -07:00
Brendan Robert
4f6b1ebd99 MythosScript feature: Adding more drag/drop support for scripts and tile options for Martin 2014-06-18 10:00:10 -05:00
Martin Haye
d9a203c522 Sprite fixes, and workaround for Outlaw NPE. 2014-06-13 13:10:38 -07:00
Brendan Robert
3c4966bb77 Java 8 syntax overhaul for Map Editor 2014-06-08 10:14:00 -05:00
Brendan Robert
53ba7ac8d4 Added script location management features 2014-06-08 10:13:11 -05:00
Brendan Robert
4444380178 Changed location and interval triggers to be part of the script because it would make it easier to manage. 2014-06-07 13:28:15 -05:00
Brendan Robert
04b9a40a7b Offically requiring Java 8 now. (sorry!) 2014-06-07 13:27:00 -05:00
Brendan Robert
beee37122f Cleaned up map tab layout a little, added script info pane 2014-06-01 02:25:37 -05:00
Brendan Robert
ddf5ac1128 Total completion of refactoring, got all the bugs out of the refactored classes (finally!) :-) 2014-06-01 01:52:40 -05:00
Brendan Robert
4b8b18f865 No functional change, just cleaning up code format and removing unused imports 2014-05-25 00:29:58 -05:00
Brendan Robert
fecfb0a477 Major refactoring of code completed! This will make future UI expansion much easier. Also, fixed the redraw logic when switching platforms. Many bugs still remain but this is on-par (both features and bugs-wise) with the last revision checked in. 2014-05-25 00:22:26 -05:00
Brendan Robert
cf441192fc Moved Map Editor UI into its own FXML and controller class -- tracking down some regressions but it is mostly still working OK. 2014-05-11 02:08:49 -05:00
Brendan Robert
98f97094da Forgot to checkin the tile editor tab fxml! 2014-05-10 02:38:09 -05:00
Brendan Robert
a4ba117d60 Broke tile editor off to its own UI fxml and controller class 2014-05-10 02:37:42 -05:00
Brendan Robert
101ca8c87c Broke menu bar out into its own FXML and controller, just a trial for the next big step. 2014-05-10 00:20:23 -05:00
Brendan Robert
579fcf0c7e Changeing DragDropHelper to be a more general utility, TransferHelper, in anticipation of moving some copy/paste utility functions in there too. Started working on better image clipboard functionality 2014-05-08 22:01:49 -05:00
Brendan Robert
ac788bb2d3 Start of drag/drop script assignment functionality 2014-04-20 00:21:16 -05:00
Brendan Robert
a21a38bf4c Script editing is now completely hooked up to load/save 2014-04-13 00:19:50 -05:00
Brendan Robert
763507acf3 Direct hookup between the MythosEditor (java) and the Mythos (javascript) objects -- now the real blockly integration work can begin! 2014-04-12 22:36:25 -05:00
Brendan Robert
160821f077 Additional working fixes to blockly integration, the marshalling/unmarshalling of blockly script code is starting to function! 2014-04-03 23:19:59 -05:00
Brendan Robert
b9b12c9ead Added more blockly goodness, start of integration with rest of UI has begun. 2014-03-25 00:01:01 -05:00
Brendan Robert
ab704365b9 Updated schema to be more correctly-formed, backed by new unit tests for Mythos scripting support 2014-02-27 01:48:27 -06:00
Brendan Robert
6bc1526650 Added tests to sanity check new blockly scripting feature 2014-02-27 01:47:34 -06:00
Brendan Robert
ea92c3e795 MythosScript feature: Initial support for Blockly-generated XML data 2014-02-26 23:47:35 -06:00
Martin Haye
a512a48ff3 Finished fleshing out text for part 1. 2013-10-05 11:52:30 -07:00
Martin Haye
ae0a02f557 Fleshing out text for Big Blue part 1. 2013-10-05 11:18:06 -07:00
Brendan Robert
cc9bd8d2d8 Big changes to image editors to support resizing. Also fixed that annoying rectangle drawing bug! 2013-09-10 21:58:15 -05:00
Brendan Robert
ba891e380f Big changes to image editors to support resizing. Also fixed that annoying rectangle drawing bug! 2013-09-10 21:57:13 -05:00
Brendan Robert
be2ae30116 Added image export for single hi-res graphics (double hires will likely not work correctly yet) 2013-08-21 00:25:19 -05:00
Brendan Robert
a1e500872c Merge remote-tracking branch 'refs/remotes/lawless/master' 2013-08-20 18:19:19 -05:00
Brendan Robert
57b83cebd8 You can now paste maps into the image editor with no loss of quality! 2013-08-20 18:17:14 -05:00
Brendan Robert
36eb546518 Preparing to merge martin's fork 2013-08-18 20:50:55 -05:00
Brendan Robert
5d11ff7e80 Fixed dialog issue -- Application quit now works more like it should. 2013-08-18 10:45:40 -05:00
Brendan Robert
908d248af6 Hooked up delete buttons for Image, Map and Tile 2013-08-07 10:01:09 -05:00
Brendan Robert
452d72e8a7 Added small comment about how to open project 2013-08-05 23:18:44 -05:00
Brendan Robert
b2d0405732 Corrected information about starting the program and download link 2013-08-05 22:19:16 -05:00
Brendan Robert
1a2867d18c Another attempt to fix the packaging as the previous one was missing the javafx packager jar 2013-08-05 20:08:29 -05:00
Brendan Robert
8ed86d8e84 Fixing packaging bug found by R. Grecco. (Thanks!) 2013-08-05 19:44:55 -05:00
Brendan Robert
f3af416eea Adding application class to manifest so jar can be executable 2013-08-05 15:11:37 -05:00
Brendan Robert
8b7db062a7 Tweaking how image selector is handled to improve user experience. 2013-08-04 21:14:59 -05:00
Brendan Robert
2d755384c2 Switching platform now properly updates the image editor view 2013-08-04 20:49:38 -05:00
Brendan Robert
669cc42122 Corrected css issues that caused pan/zoom controls to disappear 2013-08-03 22:48:00 -05:00
Brendan Robert
1edb61df74 Added OutlawEditor readme 2013-08-03 00:48:12 -05:00
Brendan Robert
e17604383f Base alpha version with Apple HiRes and Apple Double HiRes support working. 2013-08-03 00:03:17 -05:00