Commit Graph

397 Commits

Author SHA1 Message Date
Martin Haye
a6876e8d39 Fix rendering bug when switching 3D map to 3D map. Fix keyboard teleport when switching maps. Fix redisplay of map name when changing section. 2015-06-30 09:27:10 -07:00
Martin Haye
03e0117537 Fixed bug with center scroll eventually overflowing. 2015-06-29 08:47:42 -07:00
Martin Haye
cf55e06347 Fixed fake character text; added support for control codes in packer. 2015-06-28 10:07:50 -07:00
Martin Haye
0c4aac3da9 Added aux mem check, and fixed bug in CROSS_WEST. 2015-06-28 09:26:52 -07:00
Martin Haye
6ddc105fd8 Made progress on garbage collection. 2015-06-23 18:33:58 -07:00
Martin Haye
f4e7586c13 Fix for null category, and new font from Seth. 2015-06-19 12:40:41 -07:00
Martin Haye
9e2c0fc3fe New font from Seth, and fixed a few font engine bugs that I introduced. 2015-06-11 11:02:02 -07:00
Martin Haye
f586bc6066 Seth's first tweak of the font. 2015-06-11 05:31:13 -07:00
Martin Haye
81a34f9a61 Checking in Andrew's original font. 2015-06-11 05:30:56 -07:00
Martin Haye
9e64a6df38 Andrew's shiny new proportional font engine is working! 2015-06-08 08:11:39 -07:00
Martin Haye
edc1e7d410 Andrew's shiny new font engine is working! 2015-06-08 08:07:37 -07:00
Martin Haye
0077d9ea05 Working on code to set font window boundaries. Also ported Andrew's word-break parser. 2015-06-07 15:50:06 -07:00
Martin Haye
9991cc1dc4 Displayed first chars from new font engine\! 2015-06-07 13:40:04 -07:00
Martin Haye
edf0433f07 Minor fixes. 2015-06-06 15:19:23 -07:00
Martin Haye
05a6f5390f Proportional font engine now assembles. 2015-06-06 14:57:42 -07:00
Martin Haye
e70280df73 Merge branch 'master' into pfont 2015-06-06 14:23:08 -07:00
Martin Haye
a92f2e1da9 Sped up decompression to aux mem, and sped up fixups, since memory manager now doesn't have to jump through hoops to get to aux mem. 2015-06-06 09:37:04 -07:00
Martin Haye
9d19b46cb1 Memory manager now working fully in LC ram. 2015-06-06 09:32:42 -07:00
Martin Haye
bd1274448d Moving memory manager up into Language Card RAM. 2015-06-06 09:25:04 -07:00
Martin Haye
cd68312dc6 Finished rearranging debug code. 2015-06-06 07:48:21 -07:00
Martin Haye
5b8f75ecd1 Refactored debug macro support to be always present, and provided by the memory manager. 2015-06-05 07:54:09 -07:00
Martin Haye
16509b9942 Fixed bug: need to repair line table in raycaster after using ProDOS, because ProDOS now uses aux ZP. 2015-06-04 10:21:04 -07:00
Martin Haye
a8e501c51b Now can actually make use of the RAM freed by moving ProDOS. 2015-06-04 10:11:38 -07:00
Martin Haye
53b956eccc Relocated ProDOS to aux bank. 2015-06-04 09:17:39 -07:00
Martin Haye
4a1a5b3fd5 Added original code of font and hi-res addr tbl for font engine. 2015-06-04 07:26:08 -07:00
Martin Haye
95c98b631e Converting pfont to ACME. 2015-06-04 07:03:58 -07:00
Martin Haye
de5fce5414 Fix problem with clearing the fake character data. 2015-06-03 09:12:15 -07:00
Martin Haye
960d61e422 Started porting Andrew's proportional font engine. 2015-06-03 09:10:22 -07:00
Martin Haye
5fa973ea7c Added a 'get any key' block. 2015-06-03 07:56:19 -07:00
Martin Haye
331918eb8b Fixed bug that chopped off long texts. Added some faked-up player character stats. 2015-06-01 10:38:22 -07:00
Martin Haye
6b51dff8b9 Added move_backward blockly block. 2015-05-31 19:03:38 -07:00
Martin Haye
26e7e1b119 More compact aux to main string-copy routine. 2015-05-31 11:35:01 -07:00
Martin Haye
57462b7638 Moved scenario script strings to aux mem. 2015-05-31 11:19:03 -07:00
Martin Haye
cccb136726 Raycaster needs to reserve memory for its tables. Also, fixed to properly display mem mgr debug info when loading fixups and modules into aux mem. 2015-05-31 08:45:23 -07:00
Martin Haye
fa266e6367 Fixed so portraits work right in 3D maps. 2015-05-28 09:05:24 -07:00
Martin Haye
f1dfcccff3 Added Blockly blocks for showing portraits. 2015-05-28 08:14:01 -07:00
Martin Haye
e7308b9ab6 Merge branch 'master' of https://github.com/badvision/lawless-legends 2015-05-27 08:13:18 -07:00
Martin Haye
a2454c1212 Fixes for map name display, sky/ground colors, and portrait rendering. 2015-05-27 08:13:09 -07:00
BagoZonde
c32a533cc9 C64: 2d proof of concept demo 2015-05-24 11:23:31 +02:00
Martin Haye
2069140e31 Fixed for broken scripting after loading new map sections. 2015-05-21 07:19:22 -07:00
Martin Haye
907666c716 Now able to script transitions from 2D to 3D and back. 2015-05-20 09:47:35 -07:00
Martin Haye
0a85fb5f1d Fixed more bugs. Now 2D to 3D, and back, work. 2015-05-16 11:00:31 -07:00
Martin Haye
7be0112be4 Symmetric improvements to 2D API. 2015-05-16 08:48:29 -07:00
Martin Haye
80cf3ddb03 Got triggers working right on 3D map, including multiple triggers per location. 2015-05-15 08:19:18 -07:00
Martin Haye
375cac1459 Getting 3D back into shape. 2015-05-07 10:17:38 -07:00
Martin Haye
64870ea6a8 Working on 2D to 3D transition. 2015-05-07 09:12:52 -07:00
Martin Haye
d4a550f760 Corrected handling of obstruction and script flags on 2D map. 2015-05-07 06:54:43 -07:00
Martin Haye
329a7070ce Cleaned some debug stuff up. 2015-05-06 09:45:59 -07:00
Martin Haye
f22f4ed9db Teleportation mostly fixed. 2015-05-06 09:36:27 -07:00
Martin Haye
be7b8a0b70 Testing long-range teleport. 2015-05-03 09:25:57 -07:00
Martin Haye
4f093e405f Fixed bug when freeing and then reloading a module. 2015-04-28 08:14:19 -07:00
Martin Haye
eada6ad85d Progress on 2D scrolling. 2015-04-27 08:25:15 -07:00
Martin Haye
8d4264d5f2 More 2D teleportation. 2015-04-27 06:21:42 -07:00
Martin Haye
1f5a6cec29 Basics of 2D teleport kinda working. 2015-04-20 08:32:02 -07:00
Martin Haye
783c011b53 Implemented the rest of the render API for the tile engine. 2015-04-15 10:22:05 -07:00
Martin Haye
7142365ed7 Okay, I think I finally have teleport code that might work. 2015-04-14 07:45:02 -07:00
Martin Haye
9739fb34e9 Working on 2D teleportation. 2015-04-14 07:19:42 -07:00
Martin Haye
9e94928f0a More refactoring. 2015-04-09 10:31:36 -07:00
Martin Haye
efe2415098 More refactoring. 2015-04-05 09:52:38 -07:00
Martin Haye
4227042b11 More work refactoring API to rendering engines. 2015-03-31 12:02:48 -07:00
Martin Haye
58da79a805 Working on standardized API to 2d and 3d engines. 2015-03-25 11:51:29 -07:00
Martin Haye
a835321b5f Implemented printf for handy debugging, and now generating a map index for the 2D sections. 2015-03-25 07:40:46 -07:00
Martin Haye
56897dd67d Implementing printf-like family of functions. 2015-03-05 09:34:42 -08:00
Martin Haye
d0505a756b Merge branch 'master' of https://github.com/badvision/lawless-legends 2015-03-04 06:51:15 -08:00
David Schmenk
d6091a87a1 Fix in-line string off-by-one 2015-03-03 18:37:00 -08:00
Martin Haye
315c6b6936 More work on 2D script triggers. 2015-03-03 09:03:22 -08:00
Martin Haye
152fa2bd8b Merge branch 'master' of https://github.com/badvision/lawless-legends 2015-02-27 05:33:15 -08:00
Martin Haye
2b686a8629 More work on script triggers. 2015-02-27 05:33:11 -08:00
dschmenk
42bc9441a3 Add in-line strings 2015-02-26 13:07:08 -08:00
Martin Haye
5109fcf41a Now calculating avatar X and Y offsets within current map section. 2015-02-23 08:39:10 -08:00
Martin Haye
abd63d0481 Now loading scripts for 2D maps, and registering the new trigger table. 2015-02-23 08:01:47 -08:00
Martin Haye
3376930f85 Rearranged 2D map section checks to add a 'calculate' mode, which will be used to check flags under the avatar. 2015-02-20 08:17:35 -08:00
Martin Haye
430ee9ce65 Now packing scripts for 2D map sections. 2015-02-19 10:44:17 -08:00
Martin Haye
2d06dc337a Merge branch 'master' of https://github.com/badvision/lawless-legends 2015-02-16 16:18:04 -08:00
Martin Haye
792b8854ac More 2d work: tileset division, show avatar in center, fix load bug. 2015-02-16 16:18:00 -08:00
dschmenk
bc93460bd6 Oops, forgot to add this in (old stdlib.plh) 2015-02-13 16:50:25 -08:00
dschmenk
d9614dfbb9 Force \r to 0x0A 2015-02-13 16:49:12 -08:00
dschmenk
b8affbb871 Merge branch 'master' of http://github.com/badvision/lawless-legends 2015-02-13 16:47:51 -08:00
dschmenk
da0c23e35a Minor fix for initial break_tag in repeat statement. Loadable module
return value fixes.
2015-02-03 22:04:11 -08:00
Martin Haye
cc23a96a09 Full map scrolling now works. 2015-02-03 09:16:24 -08:00
Martin Haye
ea10bfcdae Jump over debug support code, to avoid accidental problems when adding debugging. 2015-02-03 09:16:12 -08:00
Martin Haye
6ee15e1d9a Needed ability to free same block more than once. 2015-02-03 09:15:38 -08:00
dschmenk
508a2c84fb Fix VM bug in BRNE/BREQ, parse lvalue bug, and rename stdlib to cmdsys 2015-01-28 12:56:14 -08:00
Martin Haye
a71d652f30 Merge branch 'master' of https://github.com/badvision/lawless-legends 2015-01-27 10:08:23 -08:00
Martin Haye
3549f8635f Fixed exploding bug. 2015-01-27 08:47:07 -08:00
Martin Haye
b9a4caba1f Fixed tile address calculation and tileset numbering. 2015-01-27 08:36:05 -08:00
Martin Haye
dc194d44f7 Simplified section math. 2015-01-18 08:59:56 -08:00
Martin Haye
aa1c662d04 Simplified section math. 2015-01-18 08:49:45 -08:00
Martin Haye
4dec52a4d2 Got some tiles to display\! 2015-01-17 16:38:52 -08:00
Martin Haye
09583ce1ce Now loading the initial 4 map sections in the tile engine. 2015-01-10 13:17:56 -08:00
Martin Haye
4e4892381f Now splitting maps up into sections. Refactored game loop to make room for 2D variant. 2015-01-07 14:48:04 -08:00
David Schmenk
7d6860b1d5 Bring PLASMA up-to-date 2015-01-02 17:29:02 -08:00
Martin Haye
bc73588a20 Merge branch 'master' of https://github.com/badvision/lawless-legends 2014-12-21 08:17:26 -08:00
Martin Haye
14193fb73d Working on splitting 2D maps into sections. 2014-12-21 08:17:21 -08:00
David Schmenk
dee30787b4 Add structures to PLASMA 2014-12-07 20:59:24 -08:00
David Schmenk
700b85280d Don't output module dependencies if not a module 2014-11-18 12:55:38 -08:00
David Schmenk
f2debb1b4d Add syntax sugar for array define and improve enter/leave sequence 2014-11-17 17:57:07 -08:00
Martin Haye
c43f381296 Much better error and warning pinpointing during pack process. 2014-09-11 08:54:37 -07:00
Martin Haye
a480dc8c96 Merge branch 'master' of https://github.com/badvision/lawless-legends 2014-09-11 06:48:04 -07:00
Martin Haye
c1f0cdab58 Added partial code to pack 126x128 images. 2014-09-11 06:48:01 -07:00
Brendan Robert
bcd2e6c83e Started adding tile engine support to the build/pack -- still have to pack maps and tilesets and create a test stub for the tile engine 2014-09-05 09:44:14 -05:00
Martin Haye
e82f75009d Updated comment style for new PLASMA. 2014-08-21 08:17:50 -07:00
David Schmenk
d62f499c31 Update comment and multiple statements
Update comment symbol to "//" and allow multiple statements per line with ";"
2014-08-14 20:01:52 -07:00
David Schmenk
fb3f6722cf Convert comment symbol to '//' and allow multiple statements per line
with ';'
2014-08-14 19:28:31 -07:00
Brendan Robert
a6ebac6b5e Added logic to set tileset memory location prior to drawing 2014-08-13 01:01:15 -05:00
Brendan Robert
5c9c04f794 Added logic to load tilesets when moving across map 2014-08-13 00:59:05 -05:00
Brendan Robert
de57fc238d Got the compile kinks out of the tile code but it is still untested 2014-08-12 23:10:35 -05:00
Brendan Robert
bc47e0bc04 Finished outer drawing loop, now to get the code working... :-) 2014-08-11 22:47:42 -05:00
Martin Haye
f1f00fff4b Merge branch 'master' of https://github.com/badvision/lawless-legends 2014-08-10 17:23:50 -07:00
Brendan Robert
8f49e482c5 Closer to having a workable first draft of tile rendering but not done yet 2014-08-08 01:24:55 -05:00
Brendan Robert
9dbe9a9656 Inching my way towards a full drawing routine 2014-08-07 11:00:35 -05:00
Martin Haye
c7c969d2d0 Fixed bug where println wasn't recognized. 2014-07-25 18:33:44 -05:00
Martin Haye
d66d6acf97 Fixed horrible bug in the memory manager. 2014-07-25 17:05:34 -05:00
Martin Haye
d6d6dbf718 Was fooling around with scrolling. 2014-07-25 13:23:27 -05:00
Martin Haye
f7655e6c79 Fixed scrolling. 2014-07-23 15:39:43 -05:00
Martin Haye
760cccbb80 Fixed mem coalesce bug, and made return to wilderness resume the old position. 2014-07-23 14:50:16 -05:00
Martin Haye
e849051afd Implemented loading screen, fixed a bunch of bugs. 2014-07-21 18:28:39 -07:00
Martin Haye
45c0ccf6c3 Splitting strings into words. 2014-07-20 15:52:51 -07:00
Martin Haye
02116fad3c Merge branch 'master' of https://github.com/badvision/lawless-legends 2014-07-20 14:44:02 -07:00
Martin Haye
a2830e9828 More work on init scripts, and proper redrawing after teleport. 2014-07-20 14:43:48 -07:00
Brendan Robert
542d0b2589 Clarifications in the comments 2014-07-20 11:23:32 -05:00
Martin Haye
c4e5e84461 Scripted transitions between maps work now. 2014-07-20 07:01:21 -07:00
Martin Haye
1e04d813a8 Merge branch 'master' of https://github.com/badvision/lawless-legends 2014-07-20 06:02:15 -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
Brendan Robert
1a2f49a117 Indicate which section is drawn with draw_section pointer now 2014-07-20 01:56:59 -05:00
Brendan Robert
04fff67eea Updated thoughts on what the upper 3 bits should be for (visible obstructions indicated in high-bit)
Updated main geometry calculation macro for the drawing routine (should be mostly ok now)
Allocated variables for main loop drawing routine
Conjured up use of memory holes for tracking drawing (clever?) with address calculation notes
2014-07-20 01:52:57 -05:00
Martin Haye
ebe228d15f Now processing IF statements with GETYN triggers, and SETMAP events. 2014-07-19 15:55:27 -07:00
Martin Haye
69026ed705 Now scripts have a flag of their own on the map, for speedy detection. 2014-07-19 14:22:31 -07:00
Martin Haye
f4342b12c1 Now scripts have a flag of their own on the map, for speedy detection. 2014-07-19 14:17:40 -07:00
Martin Haye
d6815eab05 Fixes for lots of scripts, and for empty script blocks. 2014-07-19 13:54:41 -07:00
Martin Haye
6084d6764e Added loading code, and fixed a typo in CROSS_SOUTH. 2014-07-17 09:34:34 -07:00
Brendan Robert
7901dba5f3 Removed extra lazy fetch stuff because it would complicate things down the line a lot (it can be added back to reduce/defer loads later if desired.) Started on the drawing routine, just trying to sort out all the geometry to feed in to the main loop. 2014-07-17 00:34:05 -05:00
Brendan Robert
50b64ab2a5 Removed extra, unnecessary label 2014-07-15 23:21:50 -05:00
Brendan Robert
2fe992370d Changed move_zp_word to move_word and got rid of indirect/jsr stuff (it saved a byte per call but was much slower, not worth it.) 2014-07-15 23:17:23 -05:00
Brendan Robert
68d9767947 Started on 2D tile routines, starting with the loading and boundary crossing logic 2014-07-15 23:11:28 -05:00
Martin Haye
278d769ade Now packing tilesets, but not yet segmenting 2D maps. 2014-07-15 13:09:36 -07:00
Martin Haye
3bbcc7ed92 Rearranged things a bit in preparation for segmented 2D map packing. 2014-07-15 09:52:58 -07:00
Martin Haye
df246c40c6 Merge branch 'master' of https://github.com/badvision/lawless-legends 2014-07-08 19:11:11 -07:00
Martin Haye
e56ad5e7da Really running scripts on the map now. 2014-07-08 19:11:03 -07:00
David Schmenk
695fef7a15 Merge branch 'master' of https://github.com/badvision/lawless-legends 2014-07-08 17:55:56 -07:00
David Schmenk
63da278ce3 Turn off DblHRes 2014-07-08 17:55:22 -07:00
Martin Haye
d06884c0e9 Kinda loading scripts module, but it appears to be trashing memory. 2014-07-08 16:02:10 -07:00
Martin Haye
8a8204ec77 Now packing very simple game scripts. 2014-07-08 15:43:12 -07:00
Martin Haye
a330b395fe Working on text functions and scripting in Outlaw. 2014-07-08 09:39:31 -07:00
Martin Haye
7961be3272 Merge branch 'master' of https://github.com/badvision/lawless-legends 2014-07-08 09:34:07 -07:00
Martin Haye
15c118fe62 Hi-bit/lo-bit fix. 2014-07-08 09:34:02 -07:00
David Schmenk
3ebf9f11dd Use new when/is/otherwise with break 2014-07-07 22:18:42 -07:00
Martin Haye
3af48520a1 Implemented blocker sprites the right way. 2014-07-06 18:22:31 -07:00
Martin Haye
02cccb1270 Working on blocker sprites. 2014-07-06 17:25:48 -07:00
Martin Haye
af0c26944f Can now cycle through sky and ground colors. 2014-07-06 17:04:26 -07:00