Skip to content

Hd v2 #488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 96 commits into from
Sep 5, 2021
Merged

Hd v2 #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
b9b307e
Resolution option in the Graphics options
lpenguin Jul 8, 2020
1164dc0
Merge pull request #258 from lpenguin/hd_v2-resolution
stalkerg Jul 8, 2020
7483c3d
Merge branch 'master' into hd_v2
stalkerg Jul 8, 2020
b582644
layout() function
lpenguin Jul 27, 2020
b049361
Adapted aButton, fncMenu, CounterPanel, InfoPanel to layout()
lpenguin Jul 30, 2020
27687cd
Adapting invMatrix to layout()
lpenguin Jul 30, 2020
aedff9a
Adapting bmlObject to layout()
lpenguin Jul 30, 2020
372d999
ibsObject multiple backgrounds support
lpenguin Jul 30, 2020
f4658f2
Cropped inventory matrix
lpenguin Jul 30, 2020
a9835ad
Merge pull request #284 from lpenguin/hd_v2-responsive-ui
stalkerg Jul 30, 2020
7759971
Merge branch 'master' into hd_v2
stalkerg Aug 1, 2020
171c277
Initializing ibsObjects backgrounds in actIntDispatcher::init function
lpenguin Aug 8, 2020
bd37991
Fullscreen game map
lpenguin Aug 8, 2020
07e189a
xgraph: Added surface for 2D rendering, lock fixes
lpenguin Aug 14, 2020
14640a1
GUI rendering into separate surface
lpenguin Aug 14, 2020
eeac780
Merge pull request #299 from lpenguin/hd_v2-big-vmap
stalkerg Aug 15, 2020
4918a5f
Removed unnecessary SDL_UnlockSurface call when creating surfaces
lpenguin Aug 15, 2020
84708ca
XGR_Screen public functions for locking/unlocking current surface
lpenguin Aug 15, 2020
6faffb8
Wrapping iscreen put_map with lock/unlock surface calls
lpenguin Aug 15, 2020
8d40984
Merge pull request #305 from lpenguin/hd_v2-lock-fix
stalkerg Aug 15, 2020
0398d03
Camera offset for info and inventory mode
lpenguin Aug 18, 2020
6a5df2a
Merge pull request #313 from lpenguin/hd_v2-cam-offset-308
stalkerg Aug 26, 2020
4277565
Clearing 2D surface on GameQuantRTO::Finit
lpenguin Aug 26, 2020
c2fb3cc
Merge pull request #306 from lpenguin/hd_v2-clear-2d
stalkerg Aug 26, 2020
0b4fb67
Fixed item drop mechanics
lpenguin Aug 26, 2020
152d101
global_to_screen function
lpenguin Aug 28, 2020
585d380
Fixed compass offset and incorrect behavior in turn/slope mode
lpenguin Sep 3, 2020
a0bcd2f
Fixed oxygen bar offset
lpenguin Sep 3, 2020
4035566
Merge pull request #318 from lpenguin/lp-fix-item-drop-312
stalkerg Sep 4, 2020
927fe47
Merge pull request #319 from lpenguin/lp-fix-compass-offset-309
stalkerg Sep 4, 2020
fd27611
Merge pull request #320 from lpenguin/fix-oxygen-offset-310
stalkerg Sep 4, 2020
041cf65
G2LQ fix
lpenguin Aug 28, 2020
8edcd3d
Switched water particles to G2LQ
lpenguin Sep 12, 2020
91a1ff4
Removed global_to_local function, switched to fixed G2LQ
lpenguin Sep 12, 2020
03986c8
Merge pull request #337 from lpenguin/fix-particles-311
stalkerg Sep 12, 2020
e71b43b
Merge branch 'master' into hd_v2
stalkerg Sep 12, 2020
1fdb3fe
miss file during merge
stalkerg Sep 12, 2020
c37e062
XGraph: added clear_2d_surface method
lpenguin Sep 12, 2020
7c03812
Replaced cleaing boilerplate with clear_2d_surface call
lpenguin Sep 12, 2020
269fcf3
Clearing 2d surface on fullscreen change events
lpenguin Sep 13, 2020
68bbb26
Fixed minimap transparent black color
lpenguin Sep 13, 2020
5275bbf
Merge pull request #339 from lpenguin/hd_v2-fix-full-screen
stalkerg Sep 13, 2020
40aae57
Merge pull request #341 from lpenguin/hd_v2-fix-map-color-340
stalkerg Sep 13, 2020
a690762
Camera zoom is screen size independent
lpenguin Sep 14, 2020
aa8ff06
Merge pull request #347 from lpenguin/hd_v2-fix-zoom-338
stalkerg Sep 15, 2020
0d9fe44
Stretched escaves and menus
lpenguin Oct 5, 2020
f0acea9
Fixed crashes in escave dialogs
lpenguin Oct 5, 2020
6fe80c7
Merge pull request #368 from lpenguin/lp-stretch-escave-253
stalkerg Oct 10, 2020
4ba744f
Merge pull request #370 from lpenguin/lp-fix-escave-dialogs
stalkerg Oct 10, 2020
ee80d8e
Merge branch 'master' into hd_v2_merge_master
lpenguin Oct 12, 2020
1607307
Merge pull request #379 from lpenguin/hd_v2_merge_master
stalkerg Oct 12, 2020
3f9ef43
Minimap transparent color fix
lpenguin Sep 14, 2020
51baea3
Merge pull request #348 from lpenguin/hd_v2_fix-minimap
stalkerg Oct 24, 2020
2da46c4
Merge branch 'master' into hd_v2
stalkerg Oct 24, 2020
889c99d
GCC 4.4 compat: structure initailization
lpenguin Oct 24, 2020
ddf580d
GCC 4.4 compat: moved class member initialization from declaration to…
lpenguin Oct 24, 2020
0c8ad50
Merge pull request #386 from lpenguin/hd_v2-gcc-compat
stalkerg Oct 24, 2020
0fb4b39
Merge remote-tracking branch 'upstream/master' into hd_v2
lpenguin Mar 4, 2021
aeca69a
Merge pull request #450 from lpenguin/hd_v2-merge_master
stalkerg Mar 12, 2021
65e2ca0
Replace offscreen SDL_Surface with uint8_t*
caiiiycuk Mar 23, 2021
bfc3dd7
Refactoring: move SDL internals to private scope
caiiiycuk Mar 24, 2021
7cc491b
Refactoring: move ScreenBuff to private scope
caiiiycuk Mar 24, 2021
21c25b1
coding style fix
caiiiycuk Mar 24, 2021
a1d7b15
centered endings' text
XiadaOku Mar 24, 2021
b19261f
centered pause menu
XiadaOku Mar 24, 2021
71103f0
centered chat in menu
XiadaOku Mar 24, 2021
0cd2814
Render mouse cursor in 2d render buffer
caiiiycuk Mar 25, 2021
e3be668
centered camera
XiadaOku Mar 25, 2021
c3f85f8
fixed #142
XiadaOku Mar 25, 2021
9f5a7be
Fix #126, #155: New map requests algorithm
caiiiycuk Mar 26, 2021
138acfa
#126, #155, #408: Fix possible segfaults
caiiiycuk Mar 26, 2021
bf129f8
refactor MAX_MAP_POWER_IN_MEMORY, generalize code with surmap
caiiiycuk Mar 26, 2021
6c34fd2
Merge pull request #463 from caiiiycuk/hd_2_patch
stalkerg Mar 27, 2021
61d18ed
Merge pull request #464 from XiadaOku/patch-4
stalkerg Mar 27, 2021
77788a4
Merge pull request #466 from caiiiycuk/hd2_segfaults_fix
stalkerg Mar 27, 2021
0120cc9
fixed #467
XiadaOku Mar 28, 2021
bfdea1e
Merge pull request #468 from XiadaOku/patch-4
stalkerg Mar 29, 2021
8bd0323
Fix #395: Inventory comments
caiiiycuk Mar 29, 2021
e3d846c
Fix #120, #122: remove camera X offset
caiiiycuk Mar 30, 2021
f58d823
Fix #120, #122: use fullscreen map only for HD
caiiiycuk Mar 30, 2021
1ac4769
Fix #120, #122: refactoring
caiiiycuk Mar 30, 2021
c608bc7
Fix #120, #122: Compas borders
caiiiycuk Mar 30, 2021
aa919fe
Merge pull request #469 from caiiiycuk/hd_v2
stalkerg Apr 8, 2021
7b3c8a2
fix(src): check a pointer for `NULL` before use one
Fenex Apr 23, 2021
9533aa4
Merge pull request #474 from Fenex/fix/segfault-2
stalkerg Apr 25, 2021
2fd2ccc
Merge branch 'master' into hd_v2
stalkerg Apr 25, 2021
321f03b
not needed after refactoring
stalkerg Apr 25, 2021
b5d0949
Incorrect size of vmap memory
caiiiycuk May 12, 2021
304a6f3
Merge pull request #475 from caiiiycuk/patch-7
stalkerg May 27, 2021
b0b8bc1
Merge branch 'master' into hd_v2
stalkerg Jun 21, 2021
dde4f6d
HD inventory backgound
caiiiycuk Jun 24, 2021
b05ec84
Merge pull request #479 from caiiiycuk/hd_v2_inventory_bg
stalkerg Jun 24, 2021
4e534dd
Merge branch 'master' into hd_v2
stalkerg Jun 30, 2021
077fa2f
add side images for hd; remove xgraph dependency from vangers_server;…
caiiiycuk Jun 25, 2021
e361c53
Merge pull request #482 from caiiiycuk/hd_v2
stalkerg Jul 23, 2021
51ac1a7
Merge branch 'master' into hd_v2
stalkerg Sep 5, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ data/*
!data/iscreen
!data/actint
!data/data
!data/resource/actint/hd

# CMake files
CMakeFiles/
Expand Down
15 changes: 13 additions & 2 deletions data/actint/actint.inc
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,16 @@ mode_key $VK_F1
#define BG2 2
#define BG3 3

#define BG_INF_TOP_LEFT 11
#define BG_INF_TOP_RIGHT 12
#define BG_INF_BOTTOM_LEFT 13
#define BG_INF_BOTTOM_RIGHT 14

#define BG_INV_TOP_LEFT 21
#define BG_INV_TOP_RIGHT 22
#define BG_INV_BOTTOM_LEFT 23
#define BG_INV_BOTTOM_RIGHT 24

// aIndData::CornerNum values...
#define IND_NONE 0
#define IND_UP_LEFT 1
Expand Down Expand Up @@ -720,8 +730,9 @@ mode_key $VK_F1
#define MATRIX_LOWRES x 360 \
y 60

#define MATRIX_HIRES x 456 \
y 76
#define MATRIX_HIRES x 55 \
y 76 \
anchor_right

#define iMATRIX_HIRES x 476 \
y 70
Expand Down
Loading