1
1
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2025-02-20 23:47:16 -05:00

208 Commits

Author SHA1 Message Date
Tim Sarbin
935789dccf
Added more debugging to map test () 2020-02-02 02:57:23 -05:00
Tim Sarbin
6606774ece
Refectoring to reduce code warnings () 2020-02-01 21:51:49 -05:00
Alex Yatskov
ea4450f207
Move d2config to d2core, remove d2helper () 2020-02-01 21:06:22 -05:00
Alex Yatskov
b5c1f5222d
Move rendering stuff out of d2common into d2render ()
* Move rendering stuff out of d2common into d2render

* Remove d2interface
2020-02-01 20:39:28 -05:00
Alex Yatskov
8a547ebf0e
Moving files around to make more sense ()
* Prevent input fighting between terminal and other input listeners.

* Moving files around, removing exports

* Add missing line
2020-02-01 18:55:56 -05:00
Alex Yatskov
e878ebcbcd
Prevent input fighting between terminal and other input listeners. () 2020-02-01 14:35:55 -05:00
Tim Sarbin
2461142fbd
Minor changes to project layout ()
* Minor changes to reduce interdependencies on modules.
2020-01-31 23:18:11 -05:00
Tim Sarbin
6832a5a0db
merged d2shared into the core package () 2020-01-26 00:39:13 -05:00
Alex Yatskov
8de0cde818 Event-based input manager with priority system () 2020-01-25 23:28:21 -05:00
nicholas-eden
d6769975cd Initial inventory handling ()
Add struct to display inventory panel.
Add struct to handle inventory and merchant grids.

Hook up `i` key to toggle inventory panel.
2019-12-28 23:32:53 -05:00
Alex Yatskov
c01bedaedf Do not advance state in render ()
* Do not advance state in render

* Update advance logic for sprite and region
2019-12-28 23:32:24 -05:00
Alex Yatskov
49b9a190f2 Render to surface, not ebiten texture ()
* Render to surface, not ebiten texture

* Fix debug text
2019-12-28 16:46:08 -05:00
Ziemas
0c2b7cfd8d Advance hero animations on char select screen. () 2019-12-26 11:14:26 -05:00
Alex Yatskov
b7e50bf098 Add terminal, surface, assetmanager commands ()
* Add terminal, surface, assetmanager commands

* echo command

* add verbose logging

* more logging, word wrap

* add timescale command
2019-12-26 11:13:05 -05:00
Alex Yatskov
0ee937f01b Rename Paperdoll to Composite ()
Make AnimatedEntity use Composite
2019-12-24 01:48:45 -05:00
Alex Yatskov
1b03e691b9 High level resource caching; resource cleanup ()
* Work on resource loading

* Use new material flag name. ()

Update ebiten ref while at it

* Hopefully fix CI ()

* Don't try to copy config.json on travis ()

I doesn't exist anymore

* Update D2Shared references

* Fix character selection rect

Co-authored-by: Ziemas <ziemas@ziemas.se>
2019-12-21 20:53:18 -05:00
Alex Yatskov
4ebe199a8e Move save game location to ~/.config/OpenDiablo2/Save () 2019-12-17 23:20:06 -05:00
Alex Yatskov
d5a0038125 Configuration cleanup ()
* Cleanup config file loading, move defaults to code

* Default to fullscreen

* Cleanup

* Store configuration in UserConfigDir

* print config path on load and save
2019-12-17 21:32:37 -05:00
Alex Yatskov
cead000c3f Fix case sensitivity when loading MPQ files ()
* Fix case sensitivity when loading MPQ files

* remove print
2019-12-17 20:06:01 -05:00
Alex Yatskov
cc678ba747 Add asset manager ()
* Add asset manager

* Fix rebase

* Update asset manager to support mpq hash caching

* Update vendoring
2019-12-16 22:23:01 -05:00
nicholas-eden
d033c63e18 Initial in-game ui and keyboard controls ()
Move player movement out of `Game`, add arrow key movement.  Render bottom panel.
2019-12-16 11:04:39 -05:00
Alex Yatskov
a194913609 Engine and region reorganization in preperation for spatial partitioning ()
* Engine and region reorg
* Remove unnecessary file diff
* Remove extra render of debug mesh
2019-12-13 00:33:11 -05:00
Alex Yatskov
1262c80e6b Create viewport and camera types () 2019-12-08 22:18:42 -05:00
nicholas-eden
9a8e16c411 Pause npcs at each target location for a random time ()
Loop through neutral animation a random number of repetitions before moving on.  Only run the skill animation once, it is not designed for looping.
2019-12-06 23:58:36 -05:00
nicholas-eden
b5db51800c Setup NPCs to follow paths ()
Change location to contain canonical location, add field to get rounded location for tile rendering.
If NPC has path, loop through path.
2019-12-06 09:44:51 -05:00
j0y
c6235411b7 Add basic movement ()
* Add basic movement

* Calculate step length based on tick time between updates, teleport to target if within one step.

* Smooth camera, hero movement

removed float to int conversions in Render and IsoToScreen functions

* Render hero in the center of the screen (assuming 800x600 resolution)

* Revert changing Render() parameters type

* Render hero in the tile loop

hero will naturally render in front of the walls of the current tile but behind the walls of the tile below

* Smoother steps near target coordinates

remove jitter from trying to get one step away from target on both axis
2019-12-02 16:55:48 -05:00
Ziemas
51d78bfcbf Draw object layers in order and generally untangle the direction mess. ()
* Implement drawing COF Layers by priority

Hack it up by using always draw order for direction 0 until we get a
better handle on directions in the engine.

* Take directions in "cof directions"

Transform into dcc directions for loading frames.

* Set characters to dir 0 in char select.

Direction 0 is now facing down universally
2019-11-26 21:04:36 -05:00
nicholas-eden
19257abddb Extract sprite from dc6 from D2Shared ()
Remove processing of dc6 file type from sprite creation.  Use dc6 loader from D2Shared.
2019-11-24 17:58:23 -05:00
負弌
30c3bb7330 Fix CJK render problem partially ()
* Fixed CJK render problem
* Add partial support of loading CJK fonts
2019-11-21 21:40:12 -05:00
Ziemas
e70378d627 Increase draw distance up and down ()
* Scroll slowly in map test by holding shift
* Increase draw distance up and down
Avoid issues with long tiles popping in and out of view. (As long as
camera is reasonably within bounds)
2019-11-18 18:23:33 -05:00
Ziemas
9117616b0c Fix the tile coordinates shown in the top left () 2019-11-18 17:42:38 -05:00
Tim Sarbin
7f6e14c5d0
More map engine improvements. () 2019-11-17 16:06:02 -05:00
Averrin
5eafa9cc0b Create tiles cache on region loading ()
* tile choice algo
* cycle region files
* switcher limited by preset
* create tile caches befor rendering
* remove keyLocked
2019-11-17 08:09:54 -05:00
Tim Sarbin
4254b0f020
Finished orientation values. ()
* Finished directions for entity.
2019-11-17 02:54:22 -05:00
Tim Sarbin
297184376f
Phase 1 prep work for gameplay ()
* Updates
* More merge adjustments.
* Don't commit local changes...
2019-11-17 01:14:58 -05:00
Averrin
c3ba3f71e4 Switcher with presets & better tiles randomizing ()
* tile choice algo
* cycle region files
* switcher limited by preset
2019-11-17 00:52:13 -05:00
ndechiara
1c2b4869a1 Migrate out d2common d2helper d2data modules ()
* Switch items to dynamic load with a common struct, add misc.txt loading
* Update Ebiten Reference
* Switch references to point to D2Shared
* Migrate part 2
2019-11-17 00:16:33 -05:00
ndechiara
f13433f299 Switch items to dynamic load with a common struct, add misc.txt loading () 2019-11-15 22:31:10 -05:00
axx
c72c4d5768 Some corrections for credits ()
Related to issue 
2019-11-15 19:47:58 -05:00
Ziemas
0475a11512 Toggle tile display in map test with F7 ()
* Toggle tile display in map test with F7
* Sub-tile display
Cycle through tile display modes with F7
2019-11-15 09:04:27 -05:00
Myles
b9209541c8 Closes Issue#176 () 2019-11-14 23:55:51 -05:00
Tim Sarbin
b97bf6353d
Added inventory objects. () 2019-11-14 22:20:01 -05:00
Averrin
78a70c2d2b add map switcher () 2019-11-13 14:26:42 -05:00
TehGoat
055fcd72ed Idle animation and hover gets out of sync () 2019-11-13 12:56:54 -05:00
TehGoat
358fa1481c Modified hero animation speed () 2019-11-13 12:32:17 -05:00
Averrin
f83ab90d96 Add CONTRIBUTORS file content to credits screen () 2019-11-13 11:56:45 -05:00
Tim Sarbin
a8171145f9
Started work on gameplay scene. () 2019-11-13 00:31:52 -05:00
Tim Sarbin
4fa66988d4
Added the scrollbar. () 2019-11-12 23:44:04 -05:00
Robin Eklind
e1d9f676cf fix permissions on .OpenDiablo2 directory () 2019-11-12 08:15:50 -05:00
Tim Sarbin
a6a9434267
Added more functionality to character select screen. () 2019-11-11 23:48:55 -05:00