Apple-2-SW/lawless-legends
1
0
Fork 0
mirror of https://github.com/badvision/lawless-legends.git synced 2024-11-04 22:08:44 +00:00
Code Issues Projects Releases Wiki Activity
1,270 Commits 3 Branches 1 Tag 52 MiB
131bcddcc4
Commit Graph

656 Commits

Author SHA1 Message Date
Martin Haye
d034b0530d Really reload game when player dies. Also, they can now be killed by a script. 2016-07-18 16:47:49 -07:00
David Schmenk
ae119a1240 Equipped items all get a '*' 2016-07-18 10:02:46 -07:00
David Schmenk
e9c79ab589 Fists do 1d4+hand2hand skill damage 2016-07-18 09:51:14 -07:00
David Schmenk
4506c27bc4 Disable weapn change during combat and fix initialization needed when we do 2016-07-17 14:28:36 -07:00
David Schmenk
aab1a74698 Group Gold now just Gold 2016-07-17 12:17:00 -07:00
David Schmenk
1ba785cc0d Implement Change weapon during combat 2016-07-17 12:13:41 -07:00
David Schmenk
f4598db758 party health status sometimes shows up in wrong windows using displayf2 2016-07-17 06:56:07 -07:00
David Schmenk
da809614bb Show player health/max health and weapon damage in stats 2016-07-16 21:34:31 -07:00
David Schmenk
5e1e6a9173 Add item cheat and fix multiple inventory panes 2016-07-16 15:00:50 -07:00
David Schmenk
ff6a4ef59d Fix godmode cmds when switching maps 2016-07-16 10:46:41 -07:00
David Schmenk
0e4b8ca8f8 Add godmode setting. 2016-07-16 10:27:28 -07:00
Martin Haye
25901b9f01 Redisplay party summary if gold or health changes. 2016-07-16 05:39:22 -07:00
Martin Haye
7b103202d1 Merge branch 'master' of https://github.com/badvision/lawless-legends 2016-07-16 05:09:24 -07:00
David Schmenk
8433dab3b7 Clean up more strings during Drop 2016-07-15 15:19:54 -07:00
David Schmenk
ba71bb7fb3 Put some code to check list removal. Clean up local strings in inventory 2016-07-15 15:04:02 -07:00
David Schmenk
e43e042b2a Change player stats to show weapon in 2D and gold in 3D 2016-07-15 14:29:32 -07:00
Martin Haye
39d152720f Merge branch 'master' of https://github.com/badvision/lawless-legends 2016-07-15 07:43:24 -07:00
Martin Haye
a980919cf5 Took out a couple debug stmts. 2016-07-15 07:43:21 -07:00
David Schmenk
1f328ce1d8 Speed up inventory display 2016-07-15 07:09:05 -07:00
David Schmenk
9f3e880c37 Filter selection based on command 2016-07-14 22:24:09 -07:00
David Schmenk
3ec8b61811 Unequip already equipped weapons 2016-07-14 18:42:33 -07:00
Martin Haye
df02ca2367 Making avatar even more persistent, by placing it in the global state. 2016-07-14 14:01:54 -07:00
Martin Haye
66df00309a Merge branch 'master' of https://github.com/badvision/lawless-legends 2016-07-14 13:52:27 -07:00
Martin Haye
d4525a9571 Fix clearEncounterZones and setAvatar to be (more) persistent. 2016-07-14 13:52:23 -07:00
Dave Schmenk
dfc5f974db Get size of map window to adjust number of items displayed 2016-07-13 20:23:01 -07:00
Dave Schmenk
ad8d58f62e Inventory formatting updates 2016-07-12 22:23:38 -07:00
David Schmenk
c6edbeb703 Use health item 2016-07-12 15:51:05 -07:00
David Schmenk
abcc77d45f Add al skill modifiers 2016-07-12 09:56:54 -07:00
David Schmenk
c3052373dd Use strcmp for s_itemKind and clean up equip flag 2016-07-12 08:58:45 -07:00
David Schmenk
71b4900375 Inventory equip/use/drop 2016-07-12 08:09:55 -07:00
Martin Haye
504ad63907 Removed support for ESC in inputString - it was for Andrew Hogan's demo, not for Lawless Legends. 2016-07-10 17:37:55 -07:00
Martin Haye
4d5f073afa Adjusted window sizes to avoid overwriting borders. Fixed bug in playerHasItem that was a crasher. 2016-07-10 17:33:48 -07:00
Martin Haye
be40d8f4f4 Added ability to clear all encounter zones, and to set the avatar tile. 2016-07-10 17:18:03 -07:00
Martin Haye
31bf216f6e Fix bug with Korak combat: strings still a bit too long. 2016-07-08 17:50:45 -07:00
Martin Haye
fd0b547e7e Sprinkled in some SEI/CLI to help with future interrupt probs. Fixed yet another problem with the memory accessor patch to PLASMA. 2016-07-08 17:19:59 -07:00
Martin Haye
d773465455 Fix for real Apple hardware: enabling language card requires reads, not writes. 2016-07-07 19:01:56 -07:00
Martin Haye
0837f4a360 Fleshed out new blocks for get/increase/decrease stats. 2016-07-07 17:02:44 -07:00
Martin Haye
df446bc38b Added support for arbitrary game flags, and most of stat increase/decrease. 2016-07-07 16:15:31 -07:00
Martin Haye
2eff48233f Adding global stat names to save space. Adjusted indenting of asm code in gameloop so Sublime Text correctly figures out the default tab size. 2016-07-07 14:22:48 -07:00
Martin Haye
57c65f1c69 Added item-related Blocks. 2016-07-07 13:59:07 -07:00
Martin Haye
333603c064 Added memory clearing and disabling of IIc keyboard buffer, to aid in getting more consistent results on real hardware. 2016-07-06 07:46:17 -07:00
David Schmenk
e9012275d5 Prepare for scripted event handling 2016-07-04 12:59:24 -07:00
David Schmenk
4a0ab503a2 Slight rearrangement of main player stats 2016-07-04 10:56:55 -07:00
David Schmenk
44d51ebf82 Show Group Gold in inventory, cheat health +10 2016-07-04 10:10:19 -07:00
David Schmenk
0df15626d0 Merge gold 
Merge branch 'master' of https://github.com/badvision/lawless-legends
 2016-07-04 09:33:43 -07:00
David Schmenk
287ecc6702 Add gold to global state and collect loot after combat. 2016-07-04 09:31:33 -07:00
Martin Haye
f2fe6a1989 Fixed bug with hitting 'M' on New/Load screen. 2016-07-04 09:00:37 -07:00
Martin Haye
f88b9bf298 Fix bug where hitting enter on New/Load screen hid the text. 2016-07-04 08:55:29 -07:00
Martin Haye
bd44d405d4 Need to set partition when reloading 3D textures. 2016-07-04 08:46:11 -07:00
Martin Haye
bf666a0f07 Merge branch 'master' of https://github.com/badvision/lawless-legends 2016-07-03 18:20:11 -07:00
Martin Haye
ac680b47d2 Always beep when blocked, whether blocked by an obstacle or the edge of the map. 2016-07-03 18:20:07 -07:00
David Schmenk
9dd02c2236 Just had to fix the PLASMA bug 2016-07-03 15:57:34 -07:00
Martin Haye
f15dc1a648 Forgot to check in globalDefs.plh 2016-07-03 15:29:14 -07:00
Martin Haye
0fe5ef28ca Refactored to get rid of lib vectors, thanks to Dave. 2016-07-03 13:39:00 -07:00
Martin Haye
29f6df5913 Making good progress on external symbol resolving. 2016-07-03 12:01:35 -07:00
Martin Haye
ea5800155f Got basics of new fixup mechanism working. 2016-07-03 07:33:12 -07:00
Martin Haye
bb0a9339fe Can now define a Help global function in Outlaw, and it'll get called when '?' is hit in the gme. 2016-07-01 17:19:12 -07:00
Martin Haye
30a9f15ae2 Added generation for generic items like amulets. 2016-07-01 16:57:24 -07:00
Martin Haye
d89d9dfbad Fixed so some enemies get a crack at you when you're fleeing. 2016-07-01 16:32:57 -07:00
Martin Haye
dab8bd2908 Now fully supports multi-disk mode. 2016-07-01 15:58:05 -07:00
Martin Haye
437471451b Now handles scripted combat on 2D maps as well, and handles fleeing correctly. 2016-06-30 09:31:29 -07:00
Martin Haye
02bbbf5ac7 Clean up what happens at the end of a combat script. 2016-06-30 08:47:30 -07:00
Martin Haye
f1fbd7bd8c Working on getting script to resume after combat. 2016-06-30 08:36:46 -07:00
Martin Haye
cf0c3d3ac1 Fix memory and screen glitches when switching between scripted portrait moments, combat, and 3D display. 2016-06-29 07:42:58 -07:00
Martin Haye
8ebbc16da8 Fixed streqi logic for matching encounter zone codes. Added a Blockly for starting an encounter. 2016-06-28 07:40:09 -07:00
Martin Haye
30f3e92d37 Tiny script to extract text from the XML files, for spell and grammar checking. 2016-06-28 06:59:28 -07:00
Martin Haye
de0135b3c6 Fix to not ask about loading unless an initial save game is present. Avoid double-locking the heap area. 2016-06-24 08:46:40 -07:00
Martin Haye
cfc84188c6 Fixed bug with game load. 2016-06-24 07:16:08 -07:00
Martin Haye
0e94a6fbb0 Load working better. 2016-06-24 06:12:45 -07:00
Martin Haye
45ab9bafe2 Implementing new game / load game screen. 2016-06-24 05:58:30 -07:00
Martin Haye
b05e138400 Switched base 2mg image to be 800k, to save bandwidth when we send disks around to each other. 2016-06-21 07:42:36 -07:00
Martin Haye
6c49bb2025 Fix crash when traveling on 2D map. 2016-06-21 07:20:55 -07:00
Martin Haye
5f945863c8 Fix bug with game load. 2016-06-20 09:10:41 -07:00
Martin Haye
ec26b8276a Basics of load/save working. 2016-06-20 08:49:01 -07:00
Martin Haye
87ab8b6031 Allow control chars in command table; basic framework for game load/save established. 2016-06-19 08:38:40 -07:00
Martin Haye
dcea57cc7c It was silly to have strcmpi when all we needed was streqi. 2016-06-19 08:15:51 -07:00
Martin Haye
caa05f16f6 Refactored to save space in the main gameloop module. 2016-06-19 08:04:43 -07:00
Martin Haye
c352a867a2 Refactored code to save space when running standalone modules like combat and player-info. 2016-06-19 07:42:11 -07:00
Martin Haye
db95a87e69 Merge branch 'master' of https://github.com/badvision/lawless-legends 2016-06-18 16:31:53 -07:00
Martin Haye
6c33299a77 Split game assets into two partitions, to pave the way for multi-floppy distribution. 2016-06-18 16:31:21 -07:00
David Schmenk
afd05c4bec Prepare for inventory command processing 2016-06-18 12:59:38 -07:00
David Schmenk
e1c2c9c4d5 Fix skills display to not scroll on last line 2016-06-18 12:00:46 -07:00
Martin Haye
b8b2541715 Generalized ammo to just 'stuff' so we can have other countable things. 2016-06-17 07:39:52 -07:00
Martin Haye
d5f1663267 Added ammo generation. 2016-06-17 07:26:53 -07:00
Martin Haye
fd989c0d32 Got rid of old hard-coded globalScripts.pla 2016-06-16 17:48:58 -07:00
Martin Haye
3862931a55 Minor updates to party display for new player attributes scheme. 2016-06-16 17:44:54 -07:00
Martin Haye
3427d01768 Merge branch 'master' of https://github.com/badvision/lawless-legends 2016-06-16 17:42:24 -07:00
Martin Haye
7e758be30e Added player generation. 2016-06-16 17:42:18 -07:00
Martin Haye
c9300a20c9 Fix crash bug in old global scripts. 2016-06-16 07:13:39 -07:00
David Schmenk
a351b9c772 Add real values to Inventory/Stats 2016-06-15 12:15:10 -07:00
Martin Haye
646d48d206 Now packing weapons spreadsheet. 2016-06-13 08:15:14 -07:00
Martin Haye
4366daef8f Wasn't recording goldLoot for in enemies before. 2016-06-12 13:38:14 -07:00
Martin Haye
944935c4a2 Lots of refactoring of armor, weapons, character stats, etc. 2016-06-12 13:12:14 -07:00
Martin Haye
1122108e75 Refactoring to auto-generate weapon table from spreadsheet in XML file. 2016-06-12 08:52:24 -07:00
Martin Haye
de33ab3b21 Generating stubs for all item types (weapons, armor, ammo, and items). 2016-06-11 10:58:33 -07:00
Martin Haye
a4eaeb5cf1 Fix map name display when returning from combat. 2016-06-09 07:39:09 -07:00
David Schmenk
4810c72423 ProceI can update ame source 2016-06-05 18:01:11 -07:00
Brendan Robert
9b5508a88c Ignore build messages from commit history 2016-06-05 13:11:22 -05:00
Martin Haye
c4b973fabf Changed disk activity indicator to blue per Seth's preference. 2016-06-03 09:42:28 -07:00
Martin Haye
64fa3c0ebb Made disk activity icon. 2016-06-03 09:18:25 -07:00
Martin Haye
170c98508f Moved player info display to separate module, party.pla. Added a few descriptive comments to help Dave get started. 2016-06-01 09:03:14 -07:00
Martin Haye
3df106d6eb Unified build system, with new readme. 2016-05-31 07:45:49 -07:00
Martin Haye
f1aab8572c Fix problems with cursor flash when inputting a string. 2016-05-26 09:09:25 -07:00
Martin Haye
a1dad110dd Fix for 64-map chunk bug. 2016-05-26 07:41:44 -07:00
Martin Haye
334c7e6d71 Fix for missing hi-bits in text windows making characters look like they were cut off. 2016-05-19 09:31:28 +02:00
Martin Haye
6ed1518520 String management: break up long strings into plasma-size chunks; clear string pool after each. 2016-05-10 07:13:22 +02:00
Martin Haye
0f2f2fa4ab Animations now run during combat pauses. 2016-04-28 08:20:28 -07:00
Martin Haye
17772096f5 Merge branch 'master' of https://github.com/peterferrie/lawless-legends into peterferrie-master 2016-04-28 07:44:38 -07:00
Peter Ferrie
2822e6c184 fix more typos 2016-04-26 09:46:25 -07:00
Martin Haye
6745f5c556 Merge branch 'master' of https://github.com/peterferrie/lawless-legends into peterferrie-master 2016-04-26 06:40:11 -07:00
Martin Haye
9cdc68b0ee Improved messaging for errors. 2016-04-26 06:39:44 -07:00
Peter Ferrie
e5cd2ce964 fix typo 2016-04-19 14:22:41 -07:00
Peter Ferrie
d8e235d753 minor size optimisations 
note that fontengine.s!Wp_CFnt has a bad compare
 2016-04-12 16:54:00 -07:00
Martin Haye
312ee3a8a3 Fixed problem clearing portrait after teleport. 2016-04-07 07:35:28 -07:00
Martin Haye
ccc43368d4 Encounter zones working now. 2016-03-31 10:01:04 -07:00
Martin Haye
453d44b11a Speed things up a little. 2016-03-29 15:22:31 -07:00
Martin Haye
d17ef502e3 Good progress on implementing encounter zones. 2016-03-29 15:17:42 -07:00
Martin Haye
44ef8798e7 Now packing global scripts from the Outlaw file. In particular, now requires a 'New game' script to be present, that it used to set map coordinates now (and much more later). 2016-03-24 09:45:07 -07:00
Martin Haye
99f5879993 String response gathering and checking now working. 2016-03-22 08:22:26 -07:00
Martin Haye
7d6393d9c8 PackPartitions now grabs code files as resources from the Jar file if they're not present locally. 2016-02-15 16:25:24 -08:00
Martin Haye
e05a9691f9 Further work on just-in-time copy to build dir. 2016-02-15 14:43:25 -08:00
Martin Haye
e12555531a Pure-PLASMA scripts from Outlaw now working. 2016-02-09 08:23:25 -08:00
Martin Haye
2851e6ca24 Cleaned up texture divvy code. 2016-01-24 13:11:35 -08:00
Martin Haye
c445c9808f Integrated disk image generation into PackPartitions. 2016-01-24 12:37:11 -08:00
Martin Haye
f239bd4ac2 PackPartitions now does everything itself: compile, assemble, pack. 2016-01-18 19:55:36 -08:00
Martin Haye
d1558d67cf PackPartitions now calls ACME to assemble sources. 2016-01-18 19:28:59 -08:00
Martin Haye
9883d292fc Start with first portrait for test mode. 2016-01-07 11:29:31 -08:00
Martin Haye
a93db4ea66 Took out some useless main/aux switching in decomp routine. 2016-01-07 11:28:03 -08:00
Martin Haye
59106ae953 Fixed nasty decompression bug having to do with match len multiple of 256. 2016-01-07 11:23:46 -08:00
Martin Haye
ecc9cc2016 Fixed portrait confusion, and moved enemy selection code to combat module. 2016-01-01 10:18:33 -08:00
Martin Haye
7e9bcabcc1 Now generating enemies from table instead of hand coding them. 2016-01-01 07:53:57 -08:00
Martin Haye
8c6c658ecf Making translating enemy table to code. 2016-01-01 06:04:42 -08:00
Martin Haye
55cd9892e3 More efficient way to call global scripts. 2015-12-31 09:56:50 -08:00
Martin Haye
9a1a1d0a0e Refactored global scripts into their own module. 2015-12-29 11:22:14 -08:00
Martin Haye
c4e46238cd Centralized all shared function vectors for efficiency; made mem debug printout fit on screen; use better notation for pointer-to-pointer; fixed bug causing combat to fail on 3D map. 2015-12-29 08:59:13 -08:00
Martin Haye
12a1427af6 Removed some gamelib functions that are better being only in the main module. 2015-12-28 10:52:57 -08:00
Martin Haye
c4e88d3873 Added texture control, so we can swap out textures in 3D mode to make room for a portrait. 2015-12-28 10:20:28 -08:00
Martin Haye
d5d30639d6 Save map state to global vars. 2015-12-28 09:13:18 -08:00
Martin Haye
5fc03b6f55 Better debug for out-of-memory. 2015-12-23 15:59:11 -08:00
Martin Haye
df901ee94f Fixed some bugs introduced by refactoring, and also the portrait preview facility. 2015-12-23 15:42:37 -08:00
Martin Haye
604857a4d2 Animations working in-engine for the first time. 2015-12-17 09:19:49 -08:00
Martin Haye
a1b60a490c Comment fix for min/max, thanks Dave. 2015-12-17 06:48:30 -08:00
Martin Haye
70174a3342 Forgot to check in some files from the combat refactor. 2015-12-11 06:48:00 -08:00
Martin Haye
54bdfdd47e Finished moving combat code to a module. 2015-12-10 09:43:21 -08:00
Martin Haye
a48e3cc9d8 Making some progress splitting the combat code into a separate module. 2015-12-09 10:16:05 -08:00
Martin Haye
be7ba4a3ed Added partial support for NPC party members; packer now produces headers for the PLASMA code so we don't have to hard-code image numbers. 2015-12-09 07:35:02 -08:00
Martin Haye
059f77aba1 Starting in on data generation. 2015-12-06 12:02:18 -08:00
Martin Haye
299b5aed2f Enemies fight back\! 2015-12-05 15:01:44 -08:00
Martin Haye
d6c321b11a Finally happy with combat pacing and spacing. 2015-12-05 11:40:27 -08:00
Martin Haye
c4a7e4fe6a Cleaning up display of combat. 2015-12-05 11:13:35 -08:00
Martin Haye
98d9631a90 More combat. 2015-11-30 08:49:46 -08:00
Martin Haye
f342bb55c0 Fixed scrolling in combat window. 2015-11-30 08:02:32 -08:00
Martin Haye
305e79977d Took out more debugging text. 2015-11-30 07:48:36 -08:00
Martin Haye
20576c9986 Turn off memory debugging when not needed. 2015-11-30 07:46:25 -08:00
Martin Haye
010570bca7 Added more combat mechanics; fixed totally-wrong structure numbers. 2015-11-30 07:46:05 -08:00
Martin Haye
da7356450c Combat order determination implemented. 2015-11-29 09:21:03 -08:00
Martin Haye
4eafd97388 Added a few more messages at the start of combat. 2015-11-29 07:50:29 -08:00
Martin Haye
6b38c49ffd Added fight/run logic. 2015-11-19 08:36:35 -08:00
Martin Haye
87cd0c3fd0 Handle singular/plural and singular(s) forms in display strings. 2015-11-19 08:27:04 -08:00
Martin Haye
ddaca82733 Now displaying start of combat. 2015-11-11 08:55:16 -08:00
Martin Haye
6b3b0372fd Now showing Hue's real data. 2015-11-05 09:09:45 -08:00
Martin Haye
c1bcb8d187 A few minor fixes to game logic. 2015-11-05 07:18:17 -08:00
Martin Haye
6e2187087f Added enemy grouping. 2015-10-01 10:04:01 -07:00
Martin Haye
679a9ae6fb Fleshed out first prototype player, Hue Hauser, along with his chaps and handgun. 2015-10-01 08:34:49 -07:00
Martin Haye
9ff4aeb793 Forgot to commit this. 2015-09-19 13:51:08 -07:00
Martin Haye
6ee122f942 Cleaner initialization of test string table. 2015-09-19 13:46:36 -07:00
Martin Haye
efe6525167 Tested and fixed heap intern of strings. 2015-09-19 13:44:41 -07:00
Martin Haye
2f67d1c72f Reworked GC algorithm to share code better. Passes heap test again. 2015-09-19 13:27:57 -07:00
Martin Haye
bd0426e622 Forgot to check in the actual player types. 2015-09-19 08:30:52 -07:00
Martin Haye
698ce413cc Added string interning to heap. Working on type system for players, items, combat. 2015-09-17 10:03:02 -07:00
Martin Haye
a4e87954a3 All code under Apache 1.1 license as we agreed on this morning. We always intended to do this, now actually getting around to it. 2015-09-10 09:22:07 -07:00
Martin Haye
4934a84128 Correct spelling error in build file. 2015-09-10 08:01:14 -07:00
Martin Haye
24bf2c9519 Archived heap test code in a separate place. Ready to actually use the heap, instead of test it. 2015-09-09 07:52:10 -07:00
Martin Haye
f88866085f Heap test now runs for a long, long time. I think the heap code is solid. 2015-09-09 07:31:30 -07:00
Martin Haye
cc9b77f7e6 Heap test runs for a long time now without failing. It does eventually fail, but it's a long time. 2015-09-08 08:46:45 -07:00
Martin Haye
074befaca3 More heap testing and bug fixes. 2015-09-08 08:18:17 -07:00
Martin Haye
da6073fefa More generic linked list support. 2015-09-07 08:46:17 -07:00
Martin Haye
6d61a0073f First time free-and-collect works right. 2015-09-06 11:06:01 -07:00
Martin Haye
1f324ea547 Lots of heap debugging and fixes. 2015-09-05 11:01:45 -07:00
Martin Haye
b5eb726b25 Heap testing going well. 2015-09-02 10:16:39 -07:00
Martin Haye
7aee4a37f7 Now allocating players and items; starting GC debugging. 2015-09-02 09:55:21 -07:00
Martin Haye
95c549984c Hacked into PLASMA's memory accessors to give VM code transparent read/write access to main language card $E000.FFFF, and aux bank 1 language card $D000.DFFF. 2015-09-02 07:54:41 -07:00
Martin Haye
868837d040 More work on small-object heap testing. 2015-08-28 14:24:16 -07:00
Martin Haye
159f956bf7 More heap testing. 2015-08-28 14:04:08 -07:00
Martin Haye
ec6368a10b Fixed memory manager init that didn't properly copy heap code. 2015-08-28 08:24:21 -07:00
Martin Haye
f3b8b7b48d Increment random seed in my keyboard loop. 2015-08-21 09:40:53 -07:00
Martin Haye
9eb99c4dc5 Increment random seed in my keyboard loop. 2015-08-21 09:28:57 -07:00
Martin Haye
50a7123381 Added random number generator. 2015-08-21 08:57:15 -07:00
Martin Haye
6cfbe817c2 More cleanup. 2015-08-21 08:03:08 -07:00
Martin Haye
d2e1c28575 Cleanup. 2015-08-21 07:59:03 -07:00
Martin Haye
a8a4fdefed Working on implementing heap API. 2015-08-19 08:45:02 -07:00
Martin Haye
a8ec4fd42c Cleaned up some inefficient memory manager code. 2015-08-19 07:53:08 -07:00
Martin Haye
2e4a992c75 Simplified calling sequence for memory manager. 2015-08-19 07:22:20 -07:00
Martin Haye
39c37c2517 Made API for garbage collector (now called heap system) 2015-08-18 09:39:05 -07:00
Martin Haye
a6c2b46a92 Merged in GC code. 2015-08-18 07:11:59 -07:00
Martin Haye
56163b41d6 More work on GC code; moved init down to be one-time only (saves mem); minor mem mgr fixes. 2015-08-18 06:58:13 -07:00
Martin Haye
d347093dee Added moveFast mode for demos. 2015-08-06 08:43:41 -07:00
Martin Haye
fef4595e9a Using new font engine HTAB code now. 2015-07-11 08:58:00 -07:00
Martin Haye
5c95954cee Fix bug where text prompt on 3D maps was displayed on non-visible page. 2015-07-11 07:39:57 -07:00
Martin Haye
45c993d610 Modified for new XSD place for script names. Also, added new Tab code from Andrew. 2015-07-06 17:09:15 -07:00
Martin Haye
195decd122 Added support for println and clearWindow blocks. Added support for defaults in keyboard teleport. Fixed nasty page-boundary bug for strings in scripts. 2015-07-04 10:02:49 -07:00
Martin Haye
1becc7d61b Added clamping on 2d map, so player never sees the black area outside the map. 2015-07-01 10:04:19 -07:00
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
a2454c1212 Fixes for map name display, sky/ground colors, and portrait rendering. 2015-05-27 08:13:09 -07: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