This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/video/quartz/SDL_QuartzGL.m b/src/video/quartz/SDL_QuartzGL.m | |
index 22f292c..a842488 100644 | |
--- a/src/video/quartz/SDL_QuartzGL.m | |
+++ b/src/video/quartz/SDL_QuartzGL.m | |
@@ -44,6 +44,7 @@ | |
#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1070) | |
#define NSOpenGLPFAOpenGLProfile ((NSOpenGLPixelFormatAttribute) 99) | |
#define NSOpenGLProfileVersion3_2Core ((NSOpenGLPixelFormatAttribute) 12800) | |
+#define NSOpenGLProfileVersion4_1Core ((NSOpenGLPixelFormatAttribute) 16640) | |
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
:100644 100644 7506e0c 0000000 M src/video/quartz/SDL_QuartzVideo.h | |
diff --git a/src/video/quartz/SDL_QuartzVideo.h b/src/video/quartz/SDL_QuartzVideo.h | |
index 7506e0c..425896f 100644 | |
--- a/src/video/quartz/SDL_QuartzVideo.h | |
+++ b/src/video/quartz/SDL_QuartzVideo.h | |
@@ -91,7 +91,9 @@ typedef struct SDL_PrivateVideoData { | |
CGDirectDisplayID display; /* 0 == main display (only support single display) */ | |
const void *mode; /* current mode of the display */ | |
const void *save_mode; /* original mode of the display */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
public void dodajMornara(Mornar m) | |
{ | |
int najveciKvalitet = 0; | |
int najveciKvalitetIndeks = 0; | |
for (int i = 0; i < this.mornari.length; i++) { | |
if (this.mornari[i] != null && this.mornari[i].getKvalitet() > najveciKvalitet) { | |
// Ovo je trenutno mornar sa najvecim kvalitetom, zapamti kvalitet i koje je mesto u nizu. | |
najveciKvalitet = this.mornari[i].getKvalitet(); | |
najveciKvalitetIndeks = i; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
### Keybase proof | |
I hereby claim: | |
* I am dimitrijer on github. | |
* I am dimitrijer (https://keybase.io/dimitrijer) on keybase. | |
* I have a public key ASDhqliU-EVIE-EKzXsF6rQNJLBxcj3DjHSHrQ9K0Ow75Ao | |
To claim this, I am signing this object: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# | |
# Automatically generated file; DO NOT EDIT. | |
# Linux/arm 4.14.0-rc2 Kernel Configuration | |
# | |
CONFIG_ARM=y | |
CONFIG_ARM_HAS_SG_CHAIN=y | |
CONFIG_MIGHT_HAVE_PCI=y | |
CONFIG_SYS_SUPPORTS_APM_EMULATION=y | |
CONFIG_HAVE_PROC_CPU=y | |
CONFIG_STACKTRACE_SUPPORT=y |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[13:44:08] : [Step 1/3] 26.01.2018 13:44:08,586 [main] INFO [alpine/socat:latest] - Container alpine/socat:latest is starting: 79f3142106894faef7cdf924a262b7b1938eeb886141449bcfae672ec5006d60 | |
[13:44:08] : [Step 1/3] 26.01.2018 13:44:08,613 [pool-2-thread-1] DEBUG [alpine/socat:latest] - Running "exec" command: /bin/sh -c cat /proc/net/tcp | awk '{print $2}' | grep -i :2384 && echo TESTCONTAINERS_SUCCESS | |
[13:44:08] : [Step 1/3] 26.01.2018 13:44:08,693 [pool-2-thread-1] DEBUG [alpine/socat:latest] - Running "exec" command: /bin/sh -c cat /proc/net/tcp | awk '{print $2}' | grep -i :885 && echo TESTCONTAINERS_SUCCESS | |
[13:44:08] : [Step 1/3] 26.01.2018 13:44:08,776 [pool-2-thread-1] DEBUG [alpine/socat:latest] - Running "exec" command: /bin/sh -c nc -vz -w 1 localhost 2181 && echo TESTCONTAINERS_SUCCESS | |
[13:44:08] : [Step 1/3] 26.01.2018 13:44:08,845 [main] INFO [alpine/socat:latest] - Container alpine/socat:latest started | |
[13:44:08] : [Step 1/3] 26.01.2018 13:44:08,845 [main] DEBUG:PROFILER |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[15:15:12] : [Step 1/3] ------------------------------------------------------- | |
[15:15:12] : [Step 1/3] T E S T S | |
[15:15:12] : [Step 1/3] ------------------------------------------------------- | |
[15:15:14] : [Step 1/3] 24.01.2018 15:15:14,572 [main] INFO org.testcontainers.dockerclient.UnixSocketClientProviderStrategy - Accessing docker with local Unix socket | |
[15:15:14] : [Step 1/3] 24.01.2018 15:15:14,582 [main] INFO org.testcontainers.dockerclient.DockerClientProviderStrategy - Found Docker environment with local Unix socket (unix:///var/run/docker.sock) | |
[15:15:14] : [Step 1/3] 24.01.2018 15:15:14,587 [main] INFO org.testcontainers.DockerClientFactory - Docker host IP address is localhost | |
[15:15:14] : [Step 1/3] 24.01.2018 15:15:14,757 [main] INFO org.testcontainers.DockerClientFactory - Connected to docker: | |
[15:15:14] : [Step 1/3] Server Version: 17.12.0-ce | |
[15:15:14] : [Step 1/3] API Version: 1.35 | |
[15:15:14] : [Step 1/3] Operating System: CentOS Linux 7 (Core) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
------------------------------------------------------- | |
T E S T S | |
------------------------------------------------------- | |
24.01.2018 14:10:30,525 [main] INFO org.testcontainers.dockerclient.UnixSocketClientProviderStrategy - Accessing docker with local Unix socket | |
24.01.2018 14:10:30,537 [main] INFO org.testcontainers.dockerclient.DockerClientProviderStrategy - Found Docker environment with local Unix socket (unix:///var/run/docker.sock) | |
24.01.2018 14:10:30,543 [main] INFO org.testcontainers.DockerClientFactory - Docker host IP address is localhost | |
24.01.2018 14:10:30,732 [main] INFO org.testcontainers.DockerClientFactory - Connected to docker: | |
Server Version: 17.12.0-ce | |
API Version: 1.35 | |
Operating System: Docker for Mac |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[14:13:08] : [Step 1/3] ------------------------------------------------------- | |
[14:13:08] : [Step 1/3] T E S T S | |
[14:13:08] : [Step 1/3] ------------------------------------------------------- | |
[14:13:11] : [Step 1/3] 24.01.2018 14:13:11,516 [main] INFO org.testcontainers.dockerclient.UnixSocketClientProviderStrategy - Accessing docker with local Unix socket | |
[14:13:11] : [Step 1/3] 24.01.2018 14:13:11,526 [main] INFO org.testcontainers.dockerclient.DockerClientProviderStrategy - Found Docker environment with local Unix socket (unix:///var/run/docker.sock) | |
[14:13:11] : [Step 1/3] 24.01.2018 14:13:11,530 [main] INFO org.testcontainers.DockerClientFactory - Docker host IP address is localhost | |
[14:13:11] : [Step 1/3] 24.01.2018 14:13:11,715 [main] INFO org.testcontainers.DockerClientFactory - Connected to docker: | |
[14:13:11] : [Step 1/3] Server Version: 17.12.0-ce | |
[14:13:11] : [Step 1/3] API Version: 1.35 | |
[14:13:11] : [Step 1/3] Operating System: CentOS Linux 7 (Core) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[12:27:33] : [Step 1/3] [INFO] | |
[12:27:33] : [Step 1/3] [INFO] ------------------------------------------------------------------------ | |
[12:27:33] : [Step 1/3] [INFO] Building Bolec auction house backbone server application 8.5-SNAPSHOT | |
[12:27:33] : [Step 1/3] [INFO] ------------------------------------------------------------------------ | |
[12:27:33] : [Step 1/3] [Maven Watcher] project started: eu.nordeus.bolec:auctionhouse:jar:8.5-SNAPSHOT | |
[12:27:33] : [Step 1/3] eu.nordeus.bolec:auctionhouse (10s) | |
[12:27:33]i: [eu.nordeus.bolec:auctionhouse] ##teamcity[importData tc:tags='tc:internal' type='surefire' path='/opt/teamcity-agent/app/work/c868cd44dee83dae/target/surefire-reports/TEST-*.xml' whenNoDataPublished='nothing' logAsInternal='true'] | |
[12:27:33] : [Step 1/3] Importing data from '/opt/teamcity-agent/app/work/c868cd44dee83dae/target/surefire-reports/TEST-*.xml' (not existing file) with 'surefire' processor | |
[12:27:33]i: [eu.n |
NewerOlder