Merge ptitSeb branch #7

ptitSeb · 2018-10-15T04:08:52Z

No description provided.

…d not fail to link)

…re disabled now)

DEVoytas · 2018-10-15T12:33:38Z

Thank for your PR, but it looks like it is "Merge branch 'master' into ptitSeb" and what I guess we actually want, is the other way around: merge ptitSeb branch (i.e. your changes) into master.

I prepared two PRs that achieve that:

rebase your changes on top of master: rebase ptitSeb branch on top of master #9
merge your changes into master: merge ptitSeb branch into master #8

Both of them will result in the exactly same code on the master branch:
https://github.com/DEVoytas/civctp2/compare/ptitSeb-merged..ptitSeb-rebased : "ptitSeb-merged and ptitSeb-rebased are identical."

In conflict resolution for REDME.md, I removed info about README file not being 100% accurate, because that is not going to be the case, when PR gets merged into master, and I also updated screenshot link, to point to the current repo instead of pointing to https://github.com/ptitSeb/ctp2

Diffs for README file:

against current @ptitSeb version: deada6b
against current master (please search for "README.md" if link does not get you there directly)

@ptitSeb could you please decide which PR you would prefer: merge or rebase?

ptitSeb · 2018-10-15T12:41:58Z

But it's stated it's into civctp2:master from ptitseb:ptitseb so It looks like ptitSeb branch (from my fork of civctp2) -> master branch (from main repo)?

DEVoytas · 2018-10-15T13:01:11Z

Hmm, you are right, but on the other hand the message in the last commit is:

Merge branch 'master' into ptitSeb

What I think might have happened, is that there may be two merges for your PR:

one made by you locally: you merged master into ptitSeb
then, when you create PR from ptitSeb branch (now containing changes from master, i.e one commit with README I added) to the master, it will be second merge, from: ptitSeb to master made by github.

ptitSeb · 2018-10-15T13:26:52Z

It's probably when I resolved the conflict on README.md (I used the Web Github GUI directly to resolve the conflict, but it's really not super featured in fact, and it's only usable for simple conflict).

civctp2 · 2018-10-15T14:15:04Z

Abandoning (as agreed with @ptitSeb ) in favour of #9 (already merged)

#0 0x0000000000c5bbf6 in CityData::SpecialistCount (this=0x0, type=POP_SCIENTIST) at CityData.cpp:8074 civctp2#1 0x000000000063d3ff in CityWindow::WorkerSpinnerCallback (control=0x2bc8950, action=1, data=0, cookie=0x2bc8950) at ui/interface/citywindow.cpp:1330 civctp2#2 0x00000000005784cd in ctp2_Spinner::ActionCallback (control=0x2bc8950, state=1, data=0, cookie=0x2bc8950) at ui/aui_ctp2/ctp2_spinner.cpp:84 civctp2#3 0x00000000004c1069 in aui_Ranger::RepositionThumb (this=0x2bc8950, callActionFunc=1) at ui/aui_common/aui_ranger.cpp:638 civctp2#4 0x00000000004c0789 in aui_Ranger::IncrementUpY (this=0x2bc8950) at ui/aui_common/aui_ranger.cpp:483 civctp2#5 0x00000000004c2be2 in aui_Ranger::ForceScroll (this=0x2bc8950, deltaX=0, deltaY=1) at ui/aui_common/aui_ranger.cpp:1147 civctp2#6 0x00000000004f5994 in HandleMouseWheel (delta=-1) at ui/aui_sdl/aui_sdlmouse.cpp:40 civctp2#7 0x00000000004f5c21 in aui_SDLMouse::GetInput (this=0x1fa6300) at ui/aui_sdl/aui_sdlmouse.cpp:91

…tes (sender civ == receiver civ)", causes "No such object": This reverts commit fe3b57c. Messagebox(GameObj.cpp Error): No such object Continue? (ctp2:385): Gtk-CRITICAL **: 18:45:55.493: IA__gtk_main_quit: assertion 'main_loops != NULL' failed (ctp2:385): Gtk-CRITICAL **: 18:45:55.495: IA__gtk_main_quit: assertion 'main_loops != NULL' failed (ctp2:385): Gtk-CRITICAL **: 18:45:55.496: IA__gtk_main_quit: assertion 'main_loops != NULL' failed (ctp2:385): Gtk-CRITICAL **: 18:45:55.498: IA__gtk_main_quit: assertion 'main_loops != NULL' failed (ctp2:385): Gtk-CRITICAL **: 18:45:55.506: IA__gtk_main_quit: assertion 'main_loops != NULL' failed Thread 1 "ctp2" received signal SIGSEGV, Segmentation fault. 0x00005555557902ba in UnitData::GetOwner() const () (gdb) bt #0 0x00005555557902ba in UnitData::GetOwner() const () civctp2#1 0x00005555560917d4 in Unit::GetOwner() const () civctp2#2 0x000055555608c8b0 in TradeRoute::RemoveAllReferences(CAUSE_KILL_TRADE_ROUTE) () civctp2#3 0x000055555608c658 in TradeRoute::KillRoute(CAUSE_KILL_TRADE_ROUTE) () civctp2#4 0x000055555578fe8e in TradeRoute::Kill(CAUSE_KILL_TRADE_ROUTE) () civctp2#5 0x000055555600931e in CityData::~CityData() () civctp2#6 0x0000555556009504 in CityData::~CityData() () civctp2#7 0x00005555560985b8 in UnitData::~UnitData() () civctp2#8 0x000055555609869c in UnitData::~UnitData() () civctp2#9 0x0000555556043a05 in GameObj_Delete(GameObj**, unsigned int) () civctp2#10 0x0000555556052891 in ObjPool::Del(ID const&) () civctp2#11 0x00005555560912ee in Unit::RemoveAllReferences(CAUSE_REMOVE_ARMY, int) () civctp2#12 0x0000555556090ae2 in Unit::KillUnit(CAUSE_REMOVE_ARMY, int) () civctp2#13 0x00005555558bcfd4 in Unit::Kill(CAUSE_REMOVE_ARMY, int) () civctp2#14 0x00005555560179fc in CityData::CityToPark(int) () civctp2#15 0x00005555560a0dd2 in UnitData::CityToPark(int) () civctp2#16 0x000055555609446f in Unit::CityToPark(int) () civctp2#17 0x00005555560c6171 in CreateParkEvent::GEVHookCallback(GAME_EVENT, GameEventArgList*) () civctp2#18 0x0000555555fc0500 in GameEventHook::Activate(GameEventArgList*, int, int&) const () civctp2#19 0x0000555555fbd9c4 in GameEventManager::ActivateHook(GAME_EVENT, GameEventArgList*, int, int&) () civctp2#20 0x0000555555fbff27 in GameEvent::Process() () civctp2#21 0x0000555555fbd6b4 in GameEventManager::ProcessHead() () civctp2#22 0x0000555555fbd5e3 in GameEventManager::Process() () civctp2#23 0x0000555555780f4b in CivApp::Process() () civctp2#24 0x0000555555776cec in CivMain(int, char**) () civctp2#25 0x0000555555776889 in main () # Please enter the commit message for your changes. Lines starting # with '#' will be kept; you may remove them yourself if you want to. # An empty message aborts the commit. # # Date: Sat Dec 28 19:51:22 2019 +0100 # # On branch master4testing # Your branch is ahead of 'origin/master4testing' by 1 commit. # (use "git push" to publish your local commits) # # Changes to be committed: # modified: ctp2_code/gs/gameobj/TradeRoute.cpp #

…tes (sender civ == receiver civ)", causes "No such object": This reverts commit fe3b57c. Messagebox(GameObj.cpp Error): No such object Continue? (ctp2:385): Gtk-CRITICAL **: 18:45:55.493: IA__gtk_main_quit: assertion 'main_loops != NULL' failed (ctp2:385): Gtk-CRITICAL **: 18:45:55.495: IA__gtk_main_quit: assertion 'main_loops != NULL' failed (ctp2:385): Gtk-CRITICAL **: 18:45:55.496: IA__gtk_main_quit: assertion 'main_loops != NULL' failed (ctp2:385): Gtk-CRITICAL **: 18:45:55.498: IA__gtk_main_quit: assertion 'main_loops != NULL' failed (ctp2:385): Gtk-CRITICAL **: 18:45:55.506: IA__gtk_main_quit: assertion 'main_loops != NULL' failed Thread 1 "ctp2" received signal SIGSEGV, Segmentation fault. 0x00005555557902ba in UnitData::GetOwner() const () (gdb) bt #0 0x00005555557902ba in UnitData::GetOwner() const () civctp2#1 0x00005555560917d4 in Unit::GetOwner() const () civctp2#2 0x000055555608c8b0 in TradeRoute::RemoveAllReferences(CAUSE_KILL_TRADE_ROUTE) () civctp2#3 0x000055555608c658 in TradeRoute::KillRoute(CAUSE_KILL_TRADE_ROUTE) () civctp2#4 0x000055555578fe8e in TradeRoute::Kill(CAUSE_KILL_TRADE_ROUTE) () civctp2#5 0x000055555600931e in CityData::~CityData() () civctp2#6 0x0000555556009504 in CityData::~CityData() () civctp2#7 0x00005555560985b8 in UnitData::~UnitData() () civctp2#8 0x000055555609869c in UnitData::~UnitData() () civctp2#9 0x0000555556043a05 in GameObj_Delete(GameObj**, unsigned int) () civctp2#10 0x0000555556052891 in ObjPool::Del(ID const&) () civctp2#11 0x00005555560912ee in Unit::RemoveAllReferences(CAUSE_REMOVE_ARMY, int) () civctp2#12 0x0000555556090ae2 in Unit::KillUnit(CAUSE_REMOVE_ARMY, int) () civctp2#13 0x00005555558bcfd4 in Unit::Kill(CAUSE_REMOVE_ARMY, int) () civctp2#14 0x00005555560179fc in CityData::CityToPark(int) () civctp2#15 0x00005555560a0dd2 in UnitData::CityToPark(int) () civctp2#16 0x000055555609446f in Unit::CityToPark(int) () civctp2#17 0x00005555560c6171 in CreateParkEvent::GEVHookCallback(GAME_EVENT, GameEventArgList*) () civctp2#18 0x0000555555fc0500 in GameEventHook::Activate(GameEventArgList*, int, int&) const () civctp2#19 0x0000555555fbd9c4 in GameEventManager::ActivateHook(GAME_EVENT, GameEventArgList*, int, int&) () civctp2#20 0x0000555555fbff27 in GameEvent::Process() () civctp2#21 0x0000555555fbd6b4 in GameEventManager::ProcessHead() () civctp2#22 0x0000555555fbd5e3 in GameEventManager::Process() () civctp2#23 0x0000555555780f4b in CivApp::Process() () civctp2#24 0x0000555555776cec in CivMain(int, char**) () civctp2#25 0x0000555555776889 in main ()

…ct": This reverts commit 81ae687. Thread 1 "ctp2" hit Catchpoint 1 (signal SIGSEGV), 0x0000555555790236 in UnitData::GetOwner (this=0x0) at ../ctp2_code/gs/gameobj/UnitData.h:296 296 PLAYER_INDEX GetOwner () const { return m_owner; }; #0 0x0000555555790236 in UnitData::GetOwner (this=0x0) at ../ctp2_code/gs/gameobj/UnitData.h:296 civctp2#1 0x000055555609176a in Unit::GetOwner (this=0x7fffffffe254) at Unit.cpp:397 civctp2#2 0x000055555608c847 in TradeRoute::RemoveAllReferences (this=0x7fffffffe2b4, cause=CAUSE_KILL_TRADE_ROUTE_CITY_DIED) at TradeRoute.cpp:70 civctp2#3 0x000055555608c5c8 in TradeRoute::KillRoute (this=0x55555f993d5c, cause=CAUSE_KILL_TRADE_ROUTE_CITY_DIED) at TradeRoute.cpp:35 civctp2#4 0x000055555578fe0a in TradeRoute::Kill (this=0x55555f993d5c, cause=CAUSE_KILL_TRADE_ROUTE_CITY_DIED) at ../ctp2_code/gs/gameobj/TradeRoute.h:51 civctp2#5 0x000055555600928e in CityData::~CityData (this=0x55555f9935ac, __in_chrg=<optimized out>) at CityData.cpp:582 civctp2#6 0x0000555556009474 in CityData::~CityData (this=0x55555f9935ac, __in_chrg=<optimized out>) at CityData.cpp:605 civctp2#7 0x000055555609854e in UnitData::~UnitData (this=0x55555f99327c, __in_chrg=<optimized out>) at UnitData.cpp:384 civctp2#8 0x0000555556098632 in UnitData::~UnitData (this=0x55555f99327c, __in_chrg=<optimized out>) at UnitData.cpp:389 civctp2#9 0x0000555556043975 in GameObj_Delete (p=0x55555f74099c, id=268435500) at GameObj.cpp:190 civctp2#10 0x0000555556052801 in ObjPool::Del (this=0x55555f74082c, id=...) at ObjPool.cpp:106 civctp2#11 0x0000555556091284 in Unit::RemoveAllReferences (this=0x7fffffffe474, cause=CAUSE_REMOVE_ARMY_PARKRANGER, killedBy=1) at Unit.cpp:293 civctp2#12 0x0000555556090a78 in Unit::KillUnit (this=0x55555f9936b0, cause=CAUSE_REMOVE_ARMY_PARKRANGER, killedBy=1) at Unit.cpp:126 civctp2#13 0x00005555558bcf50 in Unit::Kill (this=0x55555f9936b0, cause=CAUSE_REMOVE_ARMY_PARKRANGER, killedBy=1) at ../ctp2_code/gs/gameobj/Unit.h:108 civctp2#14 0x000055555601796c in CityData::CityToPark (this=0x55555f9935ac, agressor=1) at CityData.cpp:5981 civctp2#15 0x00005555560a0d68 in UnitData::CityToPark (this=0x55555f99327c, agressor=1) at UnitData.cpp:3191 civctp2#16 0x0000555556094405 in Unit::CityToPark (this=0x7fffffffe5a0, agressor=1) at Unit.cpp:1522 civctp2#17 0x00005555560c6107 in CreateParkEvent::GEVHookCallback (this=0x55555674d980 <s_CreateParkEvent>, gameEventType=GEV_CreatePark, args=0x555582a0543c) at CityEvent.cpp:662 civctp2#18 0x0000555555fc0470 in GameEventHook::Activate (this=0x55555ef016cc, args=0x555582a0543c, startIndex=0, resumeIndex=@0x555582a062bc: 1) at GameEventHook.cpp:254 civctp2#19 0x0000555555fbd934 in GameEventManager::ActivateHook (this=0x55555eee50ac, type=GEV_CreatePark, args=0x555582a0543c, startIndex=-1, resumeIndex=@0x555582a062bc: 1) at GameEventManager.cpp:511 civctp2#20 0x0000555555fbfe97 in GameEvent::Process (this=0x555582a062ac) at GameEvent.cpp:112 civctp2#21 0x0000555555fbd624 in GameEventManager::ProcessHead (this=0x55555eee50ac) at GameEventManager.cpp:440 civctp2#22 0x0000555555fbd553 in GameEventManager::Process (this=0x55555eee50ac) at GameEventManager.cpp:415 civctp2#23 0x0000555555780ec7 in CivApp::Process (this=0x555556caec9c) at ctp/civapp.cpp:2563 civctp2#24 0x0000555555776c68 in CivMain (iCmdShow=2, pSzCmdLine=0x7fffffffecb8) at ctp/civ3_main.cpp:1694 civctp2#25 0x0000555555776805 in main (argc=2, argv=0x7fffffffecb8) at ctp/civ3_main.cpp:1440

Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Assertion (start < m_code + m_codeSize) Failed in File:SlicSegment.cpp, Line:649 Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Thread 1 "ctp2" hit Catchpoint 3 (signal SIGILL), SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 21 tag = va_arg(vl, SLIC_TAG); #0 SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 civctp2#1 0x00005555566159c9 in SlicEngine::AddModFuncs (this=0x55555e2e4fac) at SlicEngine.cpp:3069 civctp2#2 0x0000555556604f29 in SlicEngine::PostSerialize (this=0x55555e2e4fac) at SlicEngine.cpp:457 civctp2#3 0x00005555566a4f0d in gameinit_Initialize (mWidth=-1, mHeight=-1, archive=...) at gameinit.cpp:1683 civctp2#4 0x0000555555b82af5 in CivApp::InitializeGame (this=0x5555570b4bdc, archive=...) at ctp/civapp.cpp:1717 civctp2#5 0x00005555563cd57c in GameFile::Restore (this=0x7fffffffe9e7, filepath=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:848 civctp2#6 0x00005555563cb4ca in GameFile::RestoreGame (name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:186 civctp2#7 0x0000555555b856b6 in CivApp::LoadSavedGame (this=0x5555570b4bdc, name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at ctp/civapp.cpp:2651 civctp2#8 0x0000555555b862de in LoadSaveGameAction::Execute (this=0x55555e916bec, control=0x0, action=0, data=0) at ctp/civapp.cpp:2931 civctp2#9 0x0000555555c4b232 in aui_UI::HandleActions (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1862 civctp2#10 0x0000555555c4b188 in aui_UI::Process (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1847 civctp2#11 0x0000555555b84e02 in CivApp::ProcessUI (this=0x5555570b4bdc, target_milliseconds=30, used_milliseconds=@0x7fffffffeb1c: 0) at ctp/civapp.cpp:2395 civctp2#12 0x0000555555b852a8 in CivApp::Process (this=0x5555570b4bdc) at ctp/civapp.cpp:2548 civctp2#13 0x0000555555b7b2cc in CivMain (iCmdShow=2, pSzCmdLine=0x7fffffffecc8) at ctp/civ3_main.cpp:1694 civctp2#14 0x0000555555b7ae69 in main (argc=2, argv=0x7fffffffecc8) at ctp/civ3_main.cpp:1440 # Please enter the commit message for your changes. Lines starting # with '#' will be kept; you may remove them yourself if you want to. # An empty message aborts the commit. # # Date: Wed May 20 11:54:39 2020 +0200 # # interactive rebase in progress; onto 88ba108 # Last command done (1 command done): # edit 4548e58f gdb caught SIGILL (illegal instruction): # Next command to do (1 remaining command): # pick b6491837 no backtrace on SIGINT (too many) # You are currently splitting a commit while rebasing branch 'dbgAlex' on '88ba1081'. # # Changes to be committed: # modified: debug/gdb.cmds #

Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Assertion (start < m_code + m_codeSize) Failed in File:SlicSegment.cpp, Line:649 Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Thread 1 "ctp2" hit Catchpoint 3 (signal SIGILL), SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 21 tag = va_arg(vl, SLIC_TAG); #0 SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 civctp2#1 0x00005555566159c9 in SlicEngine::AddModFuncs (this=0x55555e2e4fac) at SlicEngine.cpp:3069 civctp2#2 0x0000555556604f29 in SlicEngine::PostSerialize (this=0x55555e2e4fac) at SlicEngine.cpp:457 civctp2#3 0x00005555566a4f0d in gameinit_Initialize (mWidth=-1, mHeight=-1, archive=...) at gameinit.cpp:1683 civctp2#4 0x0000555555b82af5 in CivApp::InitializeGame (this=0x5555570b4bdc, archive=...) at ctp/civapp.cpp:1717 civctp2#5 0x00005555563cd57c in GameFile::Restore (this=0x7fffffffe9e7, filepath=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:848 civctp2#6 0x00005555563cb4ca in GameFile::RestoreGame (name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:186 civctp2#7 0x0000555555b856b6 in CivApp::LoadSavedGame (this=0x5555570b4bdc, name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at ctp/civapp.cpp:2651 civctp2#8 0x0000555555b862de in LoadSaveGameAction::Execute (this=0x55555e916bec, control=0x0, action=0, data=0) at ctp/civapp.cpp:2931 civctp2#9 0x0000555555c4b232 in aui_UI::HandleActions (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1862 civctp2#10 0x0000555555c4b188 in aui_UI::Process (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1847 civctp2#11 0x0000555555b84e02 in CivApp::ProcessUI (this=0x5555570b4bdc, target_milliseconds=30, used_milliseconds=@0x7fffffffeb1c: 0) at ctp/civapp.cpp:2395 civctp2#12 0x0000555555b852a8 in CivApp::Process (this=0x5555570b4bdc) at ctp/civapp.cpp:2548 civctp2#13 0x0000555555b7b2cc in CivMain (iCmdShow=2, pSzCmdLine=0x7fffffffecc8) at ctp/civ3_main.cpp:1694 civctp2#14 0x0000555555b7ae69 in main (argc=2, argv=0x7fffffffecc8) at ctp/civ3_main.cpp:1440

ptitSeb added 30 commits October 7, 2018 15:26

cifm (i.e. Case Insensitive File Mess) will be needed

01c66cb

added anet to autogen.sh

4c68068

Some small changes to Maekfiles

65ba6b3

Some changes to anet lib so it build on 64bits

5f81a95

Forgot that new m4 macro

baf1a79

Now it compile on 64Bits platforms

6f916ae

Added a lengthy .gitignore

706c565

Added freetype 1.3.1 the contrib libs

b6c6580

Hacked some automated build of libttf.a

2247174

Initialize that static template class member, so it actualy exist (an…

0d3a548

…d not fail to link)

Now it create a screen (need to look at that code later)

c17b785

No asm fast blitter for now, even on x86

c90ac48

So this ftdump test compile now

8bccd3d

Path should be linux friendly now

806e556

Just in case...

9714e9c

64bits compatibility

b478a14

It's better like that (and StringDB does fillup)

3299e65

Missing file in freetype-1.3.1 (due to some hack...)

fb5a71d

Hacked anet so libbsd.a is not mandatory (not used anymore, as test a…

ba0f1c3

…re disabled now)

Some logs if font loading fail

683fc7d

Some default fonts

bf11f35

No DirectX Blitter with SDL

3bfff3a

In case Multithread X11 is needed

5e5f52b

Better used stdint then short and long

004322e

ax_cxx_compile_stdcxx_11 macro for real

b25b9ca

also, need ax_cxx_compile_stdcxx macro

fd4f61d

Avoid stat(NULL..)

b97a5ef

TIF load error reporting

5b8edb1

Fixed some mistakes with short

14b25d6

Better .gitignore

295bcc0

ptitSeb added 9 commits October 7, 2018 15:26

Fixed a typo in Travis script

071f853

Better README

724bd32

Fix a typo in README

d83cdb8

Added ogg CD Audio tracks

a430c2a

Improved ogg tracks handling

caa2002

Small hack to have display list with value.

c5917b8

Dont list screen mode with height smaller then 600

6098192

Fixed README in the copy linux executable, a typo in a path

97d6973

Merge branch 'master' into ptitSeb

d6fa982

civctp2 closed this Oct 15, 2018

MartinGuehmann mentioned this pull request Feb 1, 2019

irregular segfaults during game play #30

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge ptitSeb branch #7

Merge ptitSeb branch #7

ptitSeb commented Oct 15, 2018

DEVoytas commented Oct 15, 2018

ptitSeb commented Oct 15, 2018

DEVoytas commented Oct 15, 2018 •

edited

Loading

ptitSeb commented Oct 15, 2018

civctp2 commented Oct 15, 2018

Merge ptitSeb branch #7

Merge ptitSeb branch #7

Conversation

ptitSeb commented Oct 15, 2018

DEVoytas commented Oct 15, 2018

ptitSeb commented Oct 15, 2018

DEVoytas commented Oct 15, 2018 • edited Loading

ptitSeb commented Oct 15, 2018

civctp2 commented Oct 15, 2018

DEVoytas commented Oct 15, 2018 •

edited

Loading